diff options
author | Hans Nilsson <[email protected]> | 2018-09-17 10:14:44 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2018-09-17 10:14:44 +0200 |
commit | 9649db932e919647d581c1d1e9e9d60766e0cf4d (patch) | |
tree | 13dc95a80a3c7f84ed0e975afc8b6cc3f8f4d549 /erts/emulator/beam/erl_nif.h | |
parent | 0348488330332df56d9a9279a1e3555f9ba876af (diff) | |
parent | 4b48d5b1d21d741b6802a7187129e4b78b87a052 (diff) | |
download | otp-9649db932e919647d581c1d1e9e9d60766e0cf4d.tar.gz otp-9649db932e919647d581c1d1e9e9d60766e0cf4d.tar.bz2 otp-9649db932e919647d581c1d1e9e9d60766e0cf4d.zip |
Merge branch 'maint'
* maint:
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 'erts/emulator/beam/erl_nif.h')
0 files changed, 0 insertions, 0 deletions