diff options
author | Ingela Anderton Andin <ingela@erlang.org> | 2013-06-05 09:35:24 +0200 |
---|---|---|
committer | Ingela Anderton Andin <ingela@erlang.org> | 2013-06-05 09:35:24 +0200 |
commit | f509fb7cef82413b19db0734a314c216b30a415c (patch) | |
tree | 10cb58fe6a74ae33fab345f2042e5924119b2038 /lib/ssl/test/ssl_handshake_SUITE.erl | |
parent | d73dc3d3c6d85f0d2bb332458d5f52c576e27715 (diff) | |
parent | e7f8debed1ecd2b506b28d7aa068d409948130d2 (diff) | |
download | otp-f509fb7cef82413b19db0734a314c216b30a415c.tar.gz otp-f509fb7cef82413b19db0734a314c216b30a415c.tar.bz2 otp-f509fb7cef82413b19db0734a314c216b30a415c.zip |
Merge branch 'ia/ssl/prep-dtls' into maint
* ia/ssl/prep-dtls:
ssl: Structural perarparation to support DTLS
ssl: Rename ssl_certificate_db to ssl_pkix_db for clarity
Diffstat (limited to 'lib/ssl/test/ssl_handshake_SUITE.erl')
-rw-r--r-- | lib/ssl/test/ssl_handshake_SUITE.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_handshake_SUITE.erl b/lib/ssl/test/ssl_handshake_SUITE.erl index aff0e0fbbc..a40f07fd07 100644 --- a/lib/ssl/test/ssl_handshake_SUITE.erl +++ b/lib/ssl/test/ssl_handshake_SUITE.erl @@ -25,7 +25,7 @@ -include_lib("common_test/include/ct.hrl"). -include("ssl_internal.hrl"). --include("ssl_handshake.hrl"). +-include("tls_handshake.hrl"). %%-------------------------------------------------------------------- %% Common Test interface functions ----------------------------------- @@ -55,20 +55,20 @@ decode_hello_handshake(_Config) -> 16#70, 16#64, 16#79, 16#2f, 16#32>>, Version = {3, 0}, - {Records, _Buffer} = ssl_handshake:get_tls_handshake(Version, HelloPacket, <<>>), + {Records, _Buffer} = tls_handshake:get_tls_handshake(Version, HelloPacket, <<>>), {Hello, _Data} = hd(Records), #renegotiation_info{renegotiated_connection = <<0>>} = Hello#server_hello.renegotiation_info. decode_single_hello_extension_correctly(_Config) -> Renegotiation = <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(1), 0>>, - Extensions = ssl_handshake:dec_hello_extensions(Renegotiation, []), + Extensions = tls_handshake:dec_hello_extensions(Renegotiation, []), [{renegotiation_info,#renegotiation_info{renegotiated_connection = <<0>>}}] = Extensions. decode_unknown_hello_extension_correctly(_Config) -> FourByteUnknown = <<16#CA,16#FE, ?UINT16(4), 3, 0, 1, 2>>, Renegotiation = <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(1), 0>>, - Extensions = ssl_handshake:dec_hello_extensions(<<FourByteUnknown/binary, Renegotiation/binary>>, []), + Extensions = tls_handshake:dec_hello_extensions(<<FourByteUnknown/binary, Renegotiation/binary>>, []), [{renegotiation_info,#renegotiation_info{renegotiated_connection = <<0>>}}] = Extensions. |