diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-03-20 16:39:04 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-03-20 16:39:04 +0100 |
| commit | b82e76c2e34003a474b3a2f62de7c5c91cffa224 (patch) | |
| tree | ccf051eb9bd4609732656b9af2b8a583c0605e84 /lib | |
| parent | c0cfe854b955079f36715d1b73d78a1c32fc639d (diff) | |
| download | otp-b82e76c2e34003a474b3a2f62de7c5c91cffa224.tar.gz otp-b82e76c2e34003a474b3a2f62de7c5c91cffa224.tar.bz2 otp-b82e76c2e34003a474b3a2f62de7c5c91cffa224.zip | |
Removed function that should not be backmerged
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index a155013875..2d46453285 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2011. All Rights Reserved. +%% Copyright Ericsson AB 2008-2012. 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 @@ -674,17 +674,6 @@ cipher_result(Socket, Result) -> session_info_result(Socket) -> ssl:session_info(Socket). -public_key(#'PrivateKeyInfo'{privateKeyAlgorithm = - #'PrivateKeyInfo_privateKeyAlgorithm'{algorithm = ?rsaEncryption}, - privateKey = Key}) -> - public_key:der_decode('RSAPrivateKey', iolist_to_binary(Key)); - -public_key(#'PrivateKeyInfo'{privateKeyAlgorithm = - #'PrivateKeyInfo_privateKeyAlgorithm'{algorithm = ?'id-dsa'}, - privateKey = Key}) -> - public_key:der_decode('DSAPrivateKey', iolist_to_binary(Key)); -public_key(Key) -> - Key. receive_rizzo_duong_beast() -> receive |