aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-11-08 10:52:05 +0100
committerIngela Anderton Andin <[email protected]>2018-11-08 10:52:05 +0100
commit279ca6bc6a456658e63ae87dbb7ce5f90933432e (patch)
tree353c30f1f78bd9641046c281eaa3845dc019255a
parentadffe592c98149ac3b7333cf6e46970a13a57350 (diff)
parent293cd08824a81054df2ac37f15acc27695eddd50 (diff)
downloadotp-279ca6bc6a456658e63ae87dbb7ce5f90933432e.tar.gz
otp-279ca6bc6a456658e63ae87dbb7ce5f90933432e.tar.bz2
otp-279ca6bc6a456658e63ae87dbb7ce5f90933432e.zip
Merge branch 'ingela/public-key/more-sha2' into maint
* ingela/public-key/more-sha2: public_key: Add additional ASN-1 definitions for DSA SHA2 support
-rw-r--r--lib/public_key/asn1/OTP-PKIX.asn117
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/public_key/asn1/OTP-PKIX.asn1 b/lib/public_key/asn1/OTP-PKIX.asn1
index 10a83555af..9bcd99fba3 100644
--- a/lib/public_key/asn1/OTP-PKIX.asn1
+++ b/lib/public_key/asn1/OTP-PKIX.asn1
@@ -326,8 +326,13 @@ PublicKeyAlgorithm ::= SEQUENCE {
OPTIONAL }
SupportedSignatureAlgorithms SIGNATURE-ALGORITHM-CLASS ::= {
- dsa-with-sha1 | dsaWithSHA1 | md2-with-rsa-encryption |
- md5-with-rsa-encryption | sha1-with-rsa-encryption | sha-1with-rsa-encryption |
+ dsa-with-sha1 | dsaWithSHA1 |
+ dsa-with-sha224 |
+ dsa-with-sha256 |
+ md2-with-rsa-encryption |
+ md5-with-rsa-encryption |
+ sha1-with-rsa-encryption |
+ sha-1with-rsa-encryption |
sha224-with-rsa-encryption |
sha256-with-rsa-encryption |
sha384-with-rsa-encryption |
@@ -368,6 +373,14 @@ SupportedPublicKeyAlgorithms PUBLIC-KEY-ALGORITHM-CLASS ::= {
ID id-dsaWithSHA1
TYPE DSAParams }
+ dsa-with-sha224 SIGNATURE-ALGORITHM-CLASS ::= {
+ ID id-dsa-with-sha224
+ TYPE DSAParams }
+
+ dsa-with-sha256 SIGNATURE-ALGORITHM-CLASS ::= {
+ ID id-dsa-with-sha256
+ TYPE DSAParams }
+
id-dsa-with-sha224 OBJECT IDENTIFIER ::= {
joint-iso-ccitt(2) country(16) us(840) organization(1) gov(101)
csor(3) algorithms(4) id-dsa-with-sha2(3) 1 }