diff options
author | Erlang/OTP <[email protected]> | 2018-05-07 12:49:45 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2018-05-07 12:49:45 +0200 |
commit | cc0747c32f23b51cd55a8a3b33517eaa7a2b3f9d (patch) | |
tree | 9f204c948a5745fa8b7e87e5a4235b67c4d5d2d5 /erts | |
parent | a6a52a3ef5047d7f425b6797e70fec77cfad41e3 (diff) | |
parent | cb1a8a13adcf53ff08a9ea7023b24c760885f7d4 (diff) | |
download | otp-cc0747c32f23b51cd55a8a3b33517eaa7a2b3f9d.tar.gz otp-cc0747c32f23b51cd55a8a3b33517eaa7a2b3f9d.tar.bz2 otp-cc0747c32f23b51cd55a8a3b33517eaa7a2b3f9d.zip |
Merge branch 'hans/crypto/OPENSSL_NO_EC/OTP-15073' into maint-20
* hans/crypto/OPENSSL_NO_EC/OTP-15073:
crypto: Disable test_engine if engine is disabled
crypto: disable engine if OPENSSL_NO_EC* is set If that flag is set, and openssl/engine.h is included, there will be an erro further down in files included by engine.h
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions