diff options
| author | Raimo Niskanen <[email protected]> | 2016-10-04 15:16:55 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2016-10-04 15:22:00 +0200 |
| commit | 634d26929bb5852958870a7b18f67b4b8702bfa2 (patch) | |
| tree | 96834c61a09b55a5bc36b48d4d6ae7b074fbfcf3 /lib/crypto/test/old_crypto_SUITE.erl | |
| parent | 0456461c18e17cdc42b0a3a10d8a2203ee0abfcf (diff) | |
| parent | 946253795a026ba1f438554f786d01debd5cf8a7 (diff) | |
| download | otp-634d26929bb5852958870a7b18f67b4b8702bfa2.tar.gz otp-634d26929bb5852958870a7b18f67b4b8702bfa2.tar.bz2 otp-634d26929bb5852958870a7b18f67b4b8702bfa2.zip | |
Merge branch 'RoadRunnr/crypto/no-rc4/PR-1169/OTP-13896' into maint
* RoadRunnr/crypto/no-rc4/PR-1169/OTP-13896:
disable RC4 in SSL when crypto doesn't support it
Fix compilation when OpenSSL doesn't support RC4
Conflicts:
lib/crypto/c_src/crypto.c
Diffstat (limited to 'lib/crypto/test/old_crypto_SUITE.erl')
| -rw-r--r-- | lib/crypto/test/old_crypto_SUITE.erl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/crypto/test/old_crypto_SUITE.erl b/lib/crypto/test/old_crypto_SUITE.erl index 10a3e52f29..324ed39c6d 100644 --- a/lib/crypto/test/old_crypto_SUITE.erl +++ b/lib/crypto/test/old_crypto_SUITE.erl @@ -2119,6 +2119,9 @@ rc4_test(doc) -> rc4_test(suite) -> []; rc4_test(Config) when is_list(Config) -> + if_supported(rc4, fun rc4_test_do/0). + +rc4_test_do() -> CT1 = <<"Yo baby yo">>, R1 = <<118,122,68,110,157,166,141,212,139,39>>, K = "apaapa", @@ -2134,6 +2137,9 @@ rc4_stream_test(doc) -> rc4_stream_test(suite) -> []; rc4_stream_test(Config) when is_list(Config) -> + if_supported(rc4, fun rc4_stream_test_do/0). + +rc4_stream_test_do() -> CT1 = <<"Yo ">>, CT2 = <<"baby yo">>, K = "apaapa", |