diff options
| author | Erlang/OTP <[email protected]> | 2018-11-15 12:26:08 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-11-15 12:26:08 +0100 |
| commit | ac9b007a55f78659104eb43efed5a2821a753826 (patch) | |
| tree | aae6360222c49a41396ea52db85fe85c68dce5bb /lib/public_key/asn1 | |
| parent | 876751e39f704355fdf99e765c6ede17d1bc3c1b (diff) | |
| parent | d5b6ff00b123de2d822a951a788678b0ee63d71a (diff) | |
| download | otp-ac9b007a55f78659104eb43efed5a2821a753826.tar.gz otp-ac9b007a55f78659104eb43efed5a2821a753826.tar.bz2 otp-ac9b007a55f78659104eb43efed5a2821a753826.zip | |
Merge branch 'ingela/public_key/DSA-SHA2/OTP-15367' into maint-21
* ingela/public_key/DSA-SHA2/OTP-15367:
public_key: Add additional ASN-1 definitions for DSA SHA2 support
public_key: Add DSA with SHA2 support
Diffstat (limited to 'lib/public_key/asn1')
| -rw-r--r-- | lib/public_key/asn1/OTP-PKIX.asn1 | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/lib/public_key/asn1/OTP-PKIX.asn1 b/lib/public_key/asn1/OTP-PKIX.asn1 index 37196bb9bf..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,21 @@ 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 } + + id-dsa-with-sha256 OBJECT IDENTIFIER ::= { + joint-iso-ccitt(2) country(16) us(840) organization(1) gov(101) + csor(3) algorithms(4) id-dsa-with-sha2(3) 2 } -- -- RSA Keys and Signatures -- |