diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-11-15 15:09:16 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-11-15 15:09:16 +0100 |
| commit | bf54919396bc4f9e7202be9f8055079fff69098b (patch) | |
| tree | 87b164a8c353417ee94979c39d62b90f6d946557 /lib/ssl/test/ssl_cipher_SUITE.erl | |
| parent | ba8a4e80193d3b1e20b5d43f6176ed439ad1c4ae (diff) | |
| parent | d82a38a057a34469d5820f493edd843f95a82ba0 (diff) | |
| download | otp-bf54919396bc4f9e7202be9f8055079fff69098b.tar.gz otp-bf54919396bc4f9e7202be9f8055079fff69098b.tar.bz2 otp-bf54919396bc4f9e7202be9f8055079fff69098b.zip | |
Merge branch 'ia/ssl/test-maintenance'
* ia/ssl/test-maintenance:
Removed compiler warnings
Work around bug in openss-1.0.0e
Use ERL_FLAGS in plain_verify_options test
Adjustment to work with hipe
Avoid openssl processes surviving after test case has finished
Add better error message
Skip ssl_dist_SUITE if cover run, as the test server node can not communicate with the ssl nodes with erlang distribution
Fine tuning of test suites
Diffstat (limited to 'lib/ssl/test/ssl_cipher_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_cipher_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_cipher_SUITE.erl b/lib/ssl/test/ssl_cipher_SUITE.erl index 87478e13bc..99bc21e820 100644 --- a/lib/ssl/test/ssl_cipher_SUITE.erl +++ b/lib/ssl/test/ssl_cipher_SUITE.erl @@ -134,7 +134,7 @@ aes_decipher_good(Config) when is_list(Config) -> Version = {3,3}, Content = <<183,139,16,132,10,209,67,86,168,100,61,217,145,57,36,56,72,69,76,76,79,10>>, Mac = <<71,136,212,107,223,200,70,232,127,116,148,205,232,35,158,113,237,174,15,217,192,168,35,8,6,107,107,233,25,174,90,111>>, - {Content, Mac, CipherState1} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version), + {Content, Mac, _} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version), ok. %%-------------------------------------------------------------------- @@ -155,7 +155,7 @@ aes_decipher_fail(Config) when is_list(Config) -> 198,181,81,19,98,162,213,228,74,224,253,168,156,59,195,122, 108,101,107,242,20,15,169,150,163,107,101,94,93,104,241,165>>, Version = {3,3}, - {Content, Mac, CipherState1} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version), + {Content, Mac, _} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version), 32 = byte_size(Content), 32 = byte_size(Mac), ok. |