diff options
| author | Ingela Anderton Andin <ingela@erlang.org> | 2018-11-08 10:52:38 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <ingela@erlang.org> | 2018-11-08 10:52:38 +0100 |
| commit | 505b01e6b57c695dea0e8e02b97f9f3f5b909be6 (patch) | |
| tree | 98e75dfa2c93ecf353ffac1e537f0fd690a2b066 | |
| parent | c8c0ccd33be3ee6128b599f9d03e891e05496106 (diff) | |
| parent | 279ca6bc6a456658e63ae87dbb7ce5f90933432e (diff) | |
| download | erlang-505b01e6b57c695dea0e8e02b97f9f3f5b909be6.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lib/public_key/asn1/OTP-PKIX.asn1 | 17 |
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 } |