diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-04-26 18:08:48 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-05-08 10:39:21 +0200 |
| commit | 7c901c92f5936ca2f212300d2f13f899b7a222e0 (patch) | |
| tree | b1781efdb7994147653cc2f0dcc5e7e80eab1bb0 /lib/public_key/test | |
| parent | 50a75c536b50ac2513a846256ba7798e911c1302 (diff) | |
| download | otp-7c901c92f5936ca2f212300d2f13f899b7a222e0.tar.gz otp-7c901c92f5936ca2f212300d2f13f899b7a222e0.tar.bz2 otp-7c901c92f5936ca2f212300d2f13f899b7a222e0.zip | |
crypto: Deprecate functions, update doc and specs
Diffstat (limited to 'lib/public_key/test')
| -rw-r--r-- | lib/public_key/test/pkits_SUITE.erl | 11 | ||||
| -rw-r--r-- | lib/public_key/test/public_key_SUITE.erl | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lib/public_key/test/pkits_SUITE.erl b/lib/public_key/test/pkits_SUITE.erl index d901adaadd..8cdf0aaae3 100644 --- a/lib/public_key/test/pkits_SUITE.erl +++ b/lib/public_key/test/pkits_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2012. All Rights Reserved. +%% Copyright Ericsson AB 2008-2013. 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 @@ -758,11 +758,10 @@ warning(Format, Args, File0, Line) -> io:format("~s(~p): Warning "++Format, [File,Line|Args]). crypto_support_check(Config) -> - try crypto:sha256(<<"Test">>) of - _ -> - Config - catch error:notsup -> - crypto:stop(), + case proplists:get_bool(sha256, crypto:algorithms()) of + true -> + Config; + false -> {skip, "To old version of openssl"} end. diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl index 0de80edeac..5a64140c67 100644 --- a/lib/public_key/test/public_key_SUITE.erl +++ b/lib/public_key/test/public_key_SUITE.erl @@ -551,7 +551,7 @@ dsa_sign_verify(Config) when is_list(Config) -> false = public_key:verify(Msg, sha, <<1:8, DSASign/binary>>, {DSAPublicKey, DSAParams}), - Digest = crypto:sha(Msg), + Digest = crypto:hash(sha,Msg), DigestSign = public_key:sign(Digest, none, DSAPrivateKey), true = public_key:verify(Digest, none, DigestSign, {DSAPublicKey, DSAParams}), <<_:8, RestDigest/binary>> = Digest, |