diff options
author | Ingela Anderton Andin <[email protected]> | 2010-09-21 15:23:47 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2010-09-21 15:23:47 +0200 |
commit | 5ab628acc221618a2917d27f1e1fffe56e59dbb6 (patch) | |
tree | 5f45fcb76a44b8ddc95acdb4f1c3e3a575b7eb0c /lib/public_key/asn1/OTP-PKIX.asn1 | |
parent | 8382d11acc43a8cad3fc999aff8c72de3a150228 (diff) | |
parent | 044f622ac3759001b0fa100e7dc5ab378caa4c72 (diff) | |
download | otp-5ab628acc221618a2917d27f1e1fffe56e59dbb6.tar.gz otp-5ab628acc221618a2917d27f1e1fffe56e59dbb6.tar.bz2 otp-5ab628acc221618a2917d27f1e1fffe56e59dbb6.zip |
Merge branch 'ia/ssl-asn1-spec-dss-params/OTP-7884' into dev
* ia/ssl-asn1-spec-dss-params/OTP-7884:
Handling of DSA key parameters
Diffstat (limited to 'lib/public_key/asn1/OTP-PKIX.asn1')
-rw-r--r-- | lib/public_key/asn1/OTP-PKIX.asn1 | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/public_key/asn1/OTP-PKIX.asn1 b/lib/public_key/asn1/OTP-PKIX.asn1 index c0cf440496..ad704191a9 100644 --- a/lib/public_key/asn1/OTP-PKIX.asn1 +++ b/lib/public_key/asn1/OTP-PKIX.asn1 @@ -302,18 +302,25 @@ SupportedPublicKeyAlgorithms PUBLIC-KEY-ALGORITHM-CLASS ::= { -- DSA Keys and Signatures + + DSAParams ::= CHOICE + { + params Dss-Parms, + null NULL + } + -- SubjectPublicKeyInfo: dsa PUBLIC-KEY-ALGORITHM-CLASS ::= { ID id-dsa - TYPE Dss-Parms -- XXX Must be OPTIONAL + TYPE DSAParams -- XXX Must be OPTIONAL PUBLIC-KEY-TYPE DSAPublicKey } -- Certificate.signatureAlgorithm dsa-with-sha1 SIGNATURE-ALGORITHM-CLASS ::= { - ID id-dsa-with-sha1 - TYPE Dss-Parms } + ID id-dsa-with-sha1 + TYPE DSAParams } -- -- RSA Keys and Signatures |