diff options
| author | Hans Nilsson <[email protected]> | 2018-09-17 10:14:09 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-09-17 10:14:09 +0200 |
| commit | 4b48d5b1d21d741b6802a7187129e4b78b87a052 (patch) | |
| tree | 6e4427b01bcbf47b6ac1b8baa26d2254873180fd /lib/crypto/src | |
| parent | 51dcd166c58bf371da4c85250c8d76c27b4148da (diff) | |
| parent | 94d4676a7f73cb948d3baa617d1f8fcd8ee5aec2 (diff) | |
| download | otp-4b48d5b1d21d741b6802a7187129e4b78b87a052.tar.gz otp-4b48d5b1d21d741b6802a7187129e4b78b87a052.tar.bz2 otp-4b48d5b1d21d741b6802a7187129e4b78b87a052.zip | |
Merge branch 'hans/crypto/rsassa_pss/OTP-15260' into maint
* hans/crypto/rsassa_pss/OTP-15260:
crypto: Add forgotten #ifdef MAY prevent compilation errors if the symbol is configured to not be defined in an OpenSSL version where it exists by default.
crypto: Change condition for RSA_PKCS1_PSS Trubble on a couple of cross-building machines
crypto: RSA options list disclaimer in documentation for crypto:supports/0 The final appearence of the rs_opts entry is still not completly decided.
crypto: Add 'rsa_opts' to crypto:supports/0 Needed in future versions of the SSL application.
Diffstat (limited to 'lib/crypto/src')
| -rw-r--r-- | lib/crypto/src/crypto.erl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl index c64586897e..7d8f0479ee 100644 --- a/lib/crypto/src/crypto.erl +++ b/lib/crypto/src/crypto.erl @@ -319,7 +319,8 @@ stop() -> | {ciphers, Ciphers} | {public_keys, PKs} | {macs, Macs} - | {curves, Curves}, + | {curves, Curves} + | {rsa_opts, RSAopts}, Hashs :: [sha1() | sha2() | sha3() | ripemd160 | compatibility_only_hash()], Ciphers :: [stream_cipher() | block_cipher_with_iv() | block_cipher_without_iv() @@ -327,14 +328,16 @@ stop() -> ], PKs :: [rsa | dss | ecdsa | dh | ecdh | ec_gf2m], Macs :: [hmac | cmac | poly1305], - Curves :: [ec_named_curve() | edwards_curve()]. + Curves :: [ec_named_curve() | edwards_curve()], + RSAopts :: [rsa_sign_verify_opt() | rsa_opt()] . supports()-> - {Hashs, PubKeys, Ciphers, Macs, Curves} = algorithms(), + {Hashs, PubKeys, Ciphers, Macs, Curves, RsaOpts} = algorithms(), [{hashs, Hashs}, {ciphers, Ciphers}, {public_keys, PubKeys}, {macs, Macs}, - {curves, Curves} + {curves, Curves}, + {rsa_opts, RsaOpts} ]. -spec info_lib() -> [{Name,VerNum,VerStr}] when Name :: binary(), |