diff options
author | Ingela Anderton Andin <[email protected]> | 2011-11-28 11:25:13 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2011-11-28 11:25:13 +0100 |
commit | 2476bd42354b28a795a2b66401ca448d4f2b4ba0 (patch) | |
tree | ab413d6d0fe0c140c9ab2fa105c31776ba8d1025 /lib/ssl/test/ssl_test_lib.erl | |
parent | 2b36dd726551cf822041b065df5d753ed0dba8b1 (diff) | |
parent | fc668fb3dfbdd72d8f0d4e4af4500f070cdeb804 (diff) | |
download | otp-2476bd42354b28a795a2b66401ca448d4f2b4ba0.tar.gz otp-2476bd42354b28a795a2b66401ca448d4f2b4ba0.tar.bz2 otp-2476bd42354b28a795a2b66401ca448d4f2b4ba0.zip |
Merge branch 'ia/ssl/rizzoduong_beast_countermeasure/OTP-9757'
* ia/ssl/rizzoduong_beast_countermeasure/OTP-9757:
Implementation of 1/n-1 splitting countermeasure Rizzo/Duong-Beast
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
-rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 46a8112a41..019ea61f37 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -662,6 +662,9 @@ cipher_result(Socket, Result) -> %% to properly test "cipher state" handling ssl:send(Socket, "Hello\n"), receive + {ssl, Socket, "H"} -> + ssl:send(Socket, " world\n"), + receive_rizzo_duong_beast(); {ssl, Socket, "Hello\n"} -> ssl:send(Socket, " world\n"), receive @@ -687,3 +690,16 @@ public_key(#'PrivateKeyInfo'{privateKeyAlgorithm = public_key:der_decode('DSAPrivateKey', iolist_to_binary(Key)); public_key(Key) -> Key. + + +receive_rizzo_duong_beast() -> + receive + {ssl, _, "ello\n"} -> + receive + {ssl, _, " "} -> + receive + {ssl, _, "world\n"} -> + ok + end + end + end. |