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/src/pubkey_cert.erl | |
| 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/src/pubkey_cert.erl')
| -rw-r--r-- | lib/public_key/src/pubkey_cert.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl index c1819e6ddc..2335a4e4b4 100644 --- a/lib/public_key/src/pubkey_cert.erl +++ b/lib/public_key/src/pubkey_cert.erl @@ -389,10 +389,12 @@ public_key_info(PublicKeyInfo, NewPublicKeyParams = case PublicKeyParams of - 'NULL' when WorkingAlgorithm == Algorithm -> + {null, 'NULL'} when WorkingAlgorithm == Algorithm -> WorkingParams; - _ -> - PublicKeyParams + {params, Params} -> + Params; + Params -> + Params end, {Algorithm, PublicKey, NewPublicKeyParams}. |