aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/test
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2011-10-24 15:01:28 +0200
committerIngela Anderton Andin <[email protected]>2011-11-01 17:04:20 +0100
commit68e803093b8bf43b39f3090a1b717b850a5e8f4b (patch)
treeae7d93bb4c017578c3a7637ae13b405c09d02e41 /lib/public_key/test
parent1564b5853f286c97a7c9e1d6715d3c6f10bea50f (diff)
downloadotp-68e803093b8bf43b39f3090a1b717b850a5e8f4b.tar.gz
otp-68e803093b8bf43b39f3090a1b717b850a5e8f4b.tar.bz2
otp-68e803093b8bf43b39f3090a1b717b850a5e8f4b.zip
Clean up of public_key code adding specs and documentation
Diffstat (limited to 'lib/public_key/test')
-rw-r--r--lib/public_key/test/pbe_SUITE.erl2
-rw-r--r--lib/public_key/test/public_key_SUITE.erl29
2 files changed, 5 insertions, 26 deletions
diff --git a/lib/public_key/test/pbe_SUITE.erl b/lib/public_key/test/pbe_SUITE.erl
index 8dc9a01529..380a67db7b 100644
--- a/lib/public_key/test/pbe_SUITE.erl
+++ b/lib/public_key/test/pbe_SUITE.erl
@@ -226,7 +226,7 @@ pbdkdf2(Config) when is_list(Config) ->
"sa\0lt", 4096, 16, fun crypto:sha_mac/3, 20).
encrypted_private_key_info(doc) ->
- ["Tests reading a EncryptedPrivateKeyInfo file different ciphers"];
+ ["Tests reading a EncryptedPrivateKeyInfo file encrypted with different ciphers"];
encrypted_private_key_info(Config) when is_list(Config) ->
Datadir = ?config(data_dir, Config),
{ok, PemDes} = file:read_file(filename:join(Datadir, "des_cbc_enc_key.pem")),
diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl
index ddca0c9248..a91dcfa029 100644
--- a/lib/public_key/test/public_key_SUITE.erl
+++ b/lib/public_key/test/public_key_SUITE.erl
@@ -215,19 +215,19 @@ encrypted_pem(Config) when is_list(Config) ->
Salt0 = crypto:rand_bytes(8),
Entry0 = public_key:pem_entry_encode('RSAPrivateKey', RSAKey,
- {{"DES-EDE3-CBC", {md5, Salt0}}, "1234abcd"}),
+ {{"DES-EDE3-CBC", Salt0}, "1234abcd"}),
RSAKey = public_key:pem_entry_decode(Entry0,"1234abcd"),
Des3KeyFile = filename:join(Datadir, "des3_client_key.pem"),
erl_make_certs:der_to_pem(Des3KeyFile, [Entry0]),
- [{'RSAPrivateKey', _, {"DES-EDE3-CBC", {md5, Salt0}}}] =
+ [{'RSAPrivateKey', _, {"DES-EDE3-CBC", Salt0}}] =
erl_make_certs:pem_to_der(Des3KeyFile),
Salt1 = crypto:rand_bytes(8),
Entry1 = public_key:pem_entry_encode('RSAPrivateKey', RSAKey,
- {{"DES-CBC", {md5, Salt1}}, "4567efgh"}),
+ {{"DES-CBC", Salt1}, "4567efgh"}),
DesKeyFile = filename:join(Datadir, "des_client_key.pem"),
erl_make_certs:der_to_pem(DesKeyFile, [Entry1]),
- [{'RSAPrivateKey', _, {"DES-CBC", {md5, Salt1}}} =Entry2] =
+ [{'RSAPrivateKey', _, {"DES-CBC", Salt1}} =Entry2] =
erl_make_certs:pem_to_der(DesKeyFile),
true = check_entry_type(public_key:pem_entry_decode(Entry2, "4567efgh"),
'RSAPrivateKey').
@@ -699,27 +699,6 @@ pkix_path_validation(Config) when is_list(Config) ->
VerifyFunAndState1}]),
ok.
-%%--------------------------------------------------------------------
-%% deprecated(doc) ->
-%% ["Check deprecated functions."];
-%% deprecated(suite) ->
-%% [];
-%% deprecated(Config) when is_list(Config) ->
-%% Datadir = ?config(data_dir, Config),
-%% {ok, [DsaKey = {'DSAPrivateKey', _DsaKey, _}]} =
-%% public_key:pem_to_der(filename:join(Datadir, "dsa.pem")),
-%% {ok, [RsaKey = {'RSAPrivateKey', _RsaKey,_}]} =
-%% public_key:pem_to_der(filename:join(Datadir, "client_key.pem")),
-%% {ok, [ProtectedRsaKey = {'RSAPrivateKey', _ProtectedRsaKey,_}]} =
-%% public_key:pem_to_der(filename:join(Datadir, "rsa.pem")),
-
-%% {ok, #'DSAPrivateKey'{}} = public_key:decode_private_key(DsaKey),
-%% {ok, #'RSAPrivateKey'{}} = public_key:decode_private_key(RsaKey),
-%% {ok, #'RSAPrivateKey'{}} = public_key:decode_private_key(ProtectedRsaKey, "abcd1234"),
-%% ok.
-
-%%--------------------------------------------------------------------
-
check_entry_type(#'DSAPrivateKey'{}, 'DSAPrivateKey') ->
true;
check_entry_type(#'RSAPrivateKey'{}, 'RSAPrivateKey') ->