diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-04-12 16:33:46 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-04-12 16:33:46 +0200 |
| commit | 4eeaec9bb5dcf94139d3907f2489a44674753153 (patch) | |
| tree | 9e1760f44b614f15e61f8ef4c93ef81ec6aa84e0 | |
| parent | 19e9249d960a5b15b4e222efdcb96efbe122853e (diff) | |
| parent | 6b20e866bab480a8dd23b869ff07d7aed631f1d7 (diff) | |
| download | otp-4eeaec9bb5dcf94139d3907f2489a44674753153.tar.gz otp-4eeaec9bb5dcf94139d3907f2489a44674753153.tar.bz2 otp-4eeaec9bb5dcf94139d3907f2489a44674753153.zip | |
Merge branch 'ingela/openssl-version'
* ingela/openssl-version:
crypto: Update documentation to reflect new version policy
erts: Update configure check for OpenSSL
| -rw-r--r-- | erts/configure.in | 4 | ||||
| -rw-r--r-- | lib/crypto/doc/src/crypto.xml | 2 | ||||
| -rw-r--r-- | lib/crypto/doc/src/crypto_app.xml | 9 |
3 files changed, 9 insertions, 6 deletions
diff --git a/erts/configure.in b/erts/configure.in index eb3d975edc..b488ba9171 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -4223,7 +4223,7 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in fi - AC_MSG_CHECKING(for OpenSSL >= 0.9.7 in standard locations) + AC_MSG_CHECKING(for OpenSSL >= 0.9.8c in standard locations) for rdir in $extra_dir $std_win_ssl_locations $std_ssl_locations; do dir="$erl_xcomp_sysroot$rdir" if test -f "$erl_xcomp_isysroot$rdir/include/openssl/opensslv.h"; then @@ -4299,7 +4299,7 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in CPPFLAGS=$SSL_INCLUDE AC_EGREP_CPP(^yes$,[ #include <openssl/opensslv.h> -#if OPENSSL_VERSION_NUMBER >= 0x0090700fL +#if OPENSSL_VERSION_NUMBER >= 0x0090803fL yes #endif ],[ diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml index 552d95d7dc..2718ee9055 100644 --- a/lib/crypto/doc/src/crypto.xml +++ b/lib/crypto/doc/src/crypto.xml @@ -521,7 +521,7 @@ scheme. <c>VerStr</c> contains a text variant of the version.</p> <pre> > <input>info_lib().</input> -[{<<"OpenSSL">>,9469983,<<"OpenSSL 0.9.8a 11 Oct 2005">>}] +[{<<"OpenSSL">>,269484095,<<"OpenSSL 1.1.0c 10 Nov 2016"">>}] </pre> <note><p> From OTP R16 the <em>numeric version</em> represents the version of the OpenSSL diff --git a/lib/crypto/doc/src/crypto_app.xml b/lib/crypto/doc/src/crypto_app.xml index a958bdfcb7..6950dfeec3 100644 --- a/lib/crypto/doc/src/crypto_app.xml +++ b/lib/crypto/doc/src/crypto_app.xml @@ -42,9 +42,12 @@ <title>DEPENDENCIES</title> <p>The current crypto implementation uses nifs to interface - OpenSSLs crypto library and requires <em>OpenSSL</em> package - version 0.9.8 or higher. FIPS mode support requires at least - version 1.0.1 and a FIPS capable OpenSSL installation.</p> + OpenSSLs crypto library and may work with limited functionality + with as old versions as <em>OpenSSL</em> 0.9.8c. + FIPS mode support requires at least + version 1.0.1 and a FIPS capable OpenSSL installation. We recommend using a + version that is officially supported by the OpenSSL project. API compatible backends like + LibreSSL should also work.</p> <p>Source releases of OpenSSL can be downloaded from the <url href="http://www.openssl.org">OpenSSL</url> project home page, or mirror sites listed there. |