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/ssl/test/erl_make_certs.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/ssl/test/erl_make_certs.erl')
-rw-r--r-- | lib/ssl/test/erl_make_certs.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/test/erl_make_certs.erl b/lib/ssl/test/erl_make_certs.erl index f8aef55754..8b01ca3ad4 100644 --- a/lib/ssl/test/erl_make_certs.erl +++ b/lib/ssl/test/erl_make_certs.erl @@ -268,7 +268,7 @@ publickey(#'RSAPrivateKey'{modulus=N, publicExponent=E}) -> subjectPublicKey = Public}; publickey(#'DSAPrivateKey'{p=P, q=Q, g=G, y=Y}) -> Algo = #'PublicKeyAlgorithm'{algorithm= ?'id-dsa', - parameters=#'Dss-Parms'{p=P, q=Q, g=G}}, + parameters={params, #'Dss-Parms'{p=P, q=Q, g=G}}}, #'OTPSubjectPublicKeyInfo'{algorithm = Algo, subjectPublicKey = Y}. validity(Opts) -> @@ -290,7 +290,7 @@ sign_algorithm(#'RSAPrivateKey'{}, Opts) -> end, {Type, 'NULL'}; sign_algorithm(#'DSAPrivateKey'{p=P, q=Q, g=G}, _Opts) -> - {?'id-dsa-with-sha1', #'Dss-Parms'{p=P, q=Q, g=G}}. + {?'id-dsa-with-sha1', {params,#'Dss-Parms'{p=P, q=Q, g=G}}}. make_key(rsa, _Opts) -> %% (OBS: for testing only) |