diff options
author | Ingela Anderton Andin <[email protected]> | 2010-09-17 17:06:46 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2010-09-21 12:10:25 +0200 |
commit | 044f622ac3759001b0fa100e7dc5ab378caa4c72 (patch) | |
tree | b2a871bb6d281855e4193fae6c90a46b25218a19 /lib/public_key/test | |
parent | c1eb8a0b776634422cd9fe3cf6083d25d5b568d0 (diff) | |
download | otp-044f622ac3759001b0fa100e7dc5ab378caa4c72.tar.gz otp-044f622ac3759001b0fa100e7dc5ab378caa4c72.tar.bz2 otp-044f622ac3759001b0fa100e7dc5ab378caa4c72.zip |
Handling of DSA key parameters
DSS-Params may be null in a certificate as it can inherit the
parameters.
Also ignore CA-certs that do not follow ASN-1 spec in RFC 5280.
Diffstat (limited to 'lib/public_key/test')
-rw-r--r-- | lib/public_key/test/erl_make_certs.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/public_key/test/erl_make_certs.erl b/lib/public_key/test/erl_make_certs.erl index e31e5552d3..8b01ca3ad4 100644 --- a/lib/public_key/test/erl_make_certs.erl +++ b/lib/public_key/test/erl_make_certs.erl @@ -66,7 +66,7 @@ make_cert(Opts) -> %% @end %%-------------------------------------------------------------------- write_pem(Dir, FileName, {Cert, Key = {_,_,not_encrypted}}) when is_binary(Cert) -> - ok = der_to_pem(filename:join(Dir, FileName ++ ".pem"), + ok = der_to_pem(filename:join(Dir, FileName ++ ".pem"), [{'Certificate', Cert, not_encrypted}]), ok = der_to_pem(filename:join(Dir, FileName ++ "_key.pem"), [Key]). @@ -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) |