aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/erl_make_certs.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-08-05 09:45:07 +0200
committerIngela Anderton Andin <[email protected]>2014-08-11 10:26:49 +0200
commitcc4dbea1229e8903f3cca1589d7f87000cdb775a (patch)
tree54a6d0767df9591debc27a433fa88998e9a62e19 /lib/ssl/test/erl_make_certs.erl
parent112ffb94dacc75ef4cebfbfa137ea8ce52b9631e (diff)
downloadotp-cc4dbea1229e8903f3cca1589d7f87000cdb775a.tar.gz
otp-cc4dbea1229e8903f3cca1589d7f87000cdb775a.tar.bz2
otp-cc4dbea1229e8903f3cca1589d7f87000cdb775a.zip
ssl: Test ECDSA and improve test suite maintainability
Use generated certs instead of hard coded
Diffstat (limited to 'lib/ssl/test/erl_make_certs.erl')
-rw-r--r--lib/ssl/test/erl_make_certs.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/test/erl_make_certs.erl b/lib/ssl/test/erl_make_certs.erl
index 22dc951ac1..daf4466f11 100644
--- a/lib/ssl/test/erl_make_certs.erl
+++ b/lib/ssl/test/erl_make_certs.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2014. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -325,14 +325,14 @@ sign_algorithm(#'RSAPrivateKey'{}, Opts) ->
{Type, 'NULL'};
sign_algorithm(#'DSAPrivateKey'{p=P, q=Q, g=G}, _Opts) ->
{?'id-dsa-with-sha1', {params,#'Dss-Parms'{p=P, q=Q, g=G}}};
-sign_algorithm(#'ECPrivateKey'{}, Opts) ->
+sign_algorithm(#'ECPrivateKey'{parameters = Parms}, Opts) ->
Type = case proplists:get_value(digest, Opts, sha1) of
sha1 -> ?'ecdsa-with-SHA1';
sha512 -> ?'ecdsa-with-SHA512';
sha384 -> ?'ecdsa-with-SHA384';
sha256 -> ?'ecdsa-with-SHA256'
end,
- {Type, 'NULL'}.
+ {Type, Parms}.
make_key(rsa, _Opts) ->
%% (OBS: for testing only)