diff options
| author | Raimo Niskanen <[email protected]> | 2016-10-04 15:13:31 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2016-10-04 15:13:31 +0200 |
| commit | 0456461c18e17cdc42b0a3a10d8a2203ee0abfcf (patch) | |
| tree | 3337096765f02d097f5f5c182282010dc2ad1c87 /lib/public_key | |
| parent | f98390d5100bf340bce2ede86be02955419f2c0a (diff) | |
| parent | 6b4cf6c5759d1f1f952708ab191f563175950aa0 (diff) | |
| download | otp-0456461c18e17cdc42b0a3a10d8a2203ee0abfcf.tar.gz otp-0456461c18e17cdc42b0a3a10d8a2203ee0abfcf.tar.bz2 otp-0456461c18e17cdc42b0a3a10d8a2203ee0abfcf.zip | |
Merge branch 'legoscia/crypto/no-rc2/PR-1163/OTP-13895' into maint
* legoscia/crypto/no-rc2/PR-1163/OTP-13895:
Fix compilation when OpenSSL doesn't support RC2
Diffstat (limited to 'lib/public_key')
| -rw-r--r-- | lib/public_key/test/pbe_SUITE.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/public_key/test/pbe_SUITE.erl b/lib/public_key/test/pbe_SUITE.erl index 004eaefc27..44caf479e5 100644 --- a/lib/public_key/test/pbe_SUITE.erl +++ b/lib/public_key/test/pbe_SUITE.erl @@ -219,7 +219,12 @@ pbes2() -> pbes2(Config) when is_list(Config) -> decode_encode_key_file("pbes2_des_cbc_enc_key.pem", "password", "DES-CBC", Config), decode_encode_key_file("pbes2_des_ede3_cbc_enc_key.pem", "password", "DES-EDE3-CBC", Config), - decode_encode_key_file("pbes2_rc2_cbc_enc_key.pem", "password", "RC2-CBC", Config). + case lists:member(rc2_cbc, proplists:get_value(ciphers, crypto:supports())) of + true -> + decode_encode_key_file("pbes2_rc2_cbc_enc_key.pem", "password", "RC2-CBC", Config); + false -> + ok + end. check_key_info(#'PrivateKeyInfo'{privateKeyAlgorithm = #'PrivateKeyInfo_privateKeyAlgorithm'{algorithm = ?rsaEncryption}, |