diff options
author | Ingela Anderton Andin <[email protected]> | 2010-08-24 08:57:57 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2010-08-24 08:57:57 +0200 |
commit | 574a68e84c92a8a44ea2e5d18a1cd2025892d496 (patch) | |
tree | 7ab50c40c457d500cdc2432ca3cc974d8f0959b1 /lib/ssl/test/ssl_packet_SUITE.erl | |
parent | 7ed6bbd4e8bb88958bd45f85e3ef8af39c9f894f (diff) | |
parent | 12dfe961aeaf1a826d851361a24519e54d8ef119 (diff) | |
download | otp-574a68e84c92a8a44ea2e5d18a1cd2025892d496.tar.gz otp-574a68e84c92a8a44ea2e5d18a1cd2025892d496.tar.bz2 otp-574a68e84c92a8a44ea2e5d18a1cd2025892d496.zip |
Merge branch 'ia/public_key_api/OTP-8722' into dev
* ia/public_key_api/OTP-8722:
Revise the public_key API
Resolved, version is now 0.8.
Conflicts:
lib/public_key/vsn.mk
Diffstat (limited to 'lib/ssl/test/ssl_packet_SUITE.erl')
-rw-r--r-- | lib/ssl/test/ssl_packet_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_packet_SUITE.erl b/lib/ssl/test/ssl_packet_SUITE.erl index 1b8754afe9..fac84a85cd 100644 --- a/lib/ssl/test/ssl_packet_SUITE.erl +++ b/lib/ssl/test/ssl_packet_SUITE.erl @@ -1770,7 +1770,7 @@ packet_asn1_decode(Config) when is_list(Config) -> File = proplists:get_value(certfile, ServerOpts), %% A valid asn1 BER packet (DER is stricter BER) - {ok,[{cert, Data, _}]} = public_key:pem_to_der(File), + [{'Certificate', Data, _}] = ssl_test_lib:pem_to_der(File), Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, {from, self()}, |