diff options
| author | Péter Dimitrov <[email protected]> | 2019-01-08 16:39:38 +0100 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-01-08 16:39:38 +0100 |
| commit | 609e818e9e819f029bf6fc677240a08fd3e0ec1b (patch) | |
| tree | d8074785a814ef449aa3e9e88cc94648a62a74ac /lib/ssl/test/ssl_handshake_SUITE.erl | |
| parent | a9235a9545f352805e462a29c14d14554894effc (diff) | |
| parent | 225220030d58272e5e53290abcd93de860a1ebc8 (diff) | |
| download | otp-609e818e9e819f029bf6fc677240a08fd3e0ec1b.tar.gz otp-609e818e9e819f029bf6fc677240a08fd3e0ec1b.tar.bz2 otp-609e818e9e819f029bf6fc677240a08fd3e0ec1b.zip | |
Merge branch 'maint'
* maint:
ssl: Fix encoding/decoding of the SRP extension
Change-Id: I3b5887cf01b1a538c65d0c66da4d4ccf7793478d
Diffstat (limited to 'lib/ssl/test/ssl_handshake_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_handshake_SUITE.erl | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_handshake_SUITE.erl b/lib/ssl/test/ssl_handshake_SUITE.erl index e39313e5cd..fbdb452007 100644 --- a/lib/ssl/test/ssl_handshake_SUITE.erl +++ b/lib/ssl/test/ssl_handshake_SUITE.erl @@ -26,6 +26,7 @@ -include_lib("common_test/include/ct.hrl"). -include("ssl_alert.hrl"). +-include("ssl_handshake.hrl"). -include("ssl_internal.hrl"). -include("tls_handshake.hrl"). -include_lib("public_key/include/public_key.hrl"). @@ -42,7 +43,8 @@ all() -> [decode_hello_handshake, decode_empty_server_sni_correctly, select_proper_tls_1_2_rsa_default_hashsign, ignore_hassign_extension_pre_tls_1_2, - unorded_chain, signature_algorithms]. + unorded_chain, signature_algorithms, + encode_decode_srp]. %%-------------------------------------------------------------------- init_per_suite(Config) -> @@ -190,6 +192,31 @@ unorded_chain(Config) when is_list(Config) -> {ok, _, OrderedChain} = ssl_certificate:certificate_chain(PeerCert, ets:new(foo, []), ExtractedCerts, UnordedChain). +encode_decode_srp(_Config) -> + Exts = #hello_extensions{ + srp = #srp{username = <<"foo">>}, + sni = #sni{hostname = "bar"}, + renegotiation_info = undefined, + signature_algs = undefined, + alpn = undefined, + next_protocol_negotiation = undefined, + ec_point_formats = undefined, + elliptic_curves = undefined + }, + EncodedExts = <<0,20, % Length + 0,0, % SNI extension + 0,8, % Length + 0,6, % ServerNameLength + 0, % NameType (host_name) + 0,3, % HostNameLength + 98,97,114, % hostname = "bar" + 0,12, % SRP extension + 0,4, % Length + 3, % srp_I length + 102,111,111>>, % username = "foo" + EncodedExts = ssl_handshake:encode_hello_extensions(Exts), + Exts = ssl_handshake:decode_hello_extensions({client, EncodedExts}). + signature_algorithms(Config) -> Opts = proplists:get_value(server_opts, Config), |