diff options
| author | Patrick Griffis <tingping@tingping.se> | 2016-12-13 17:29:26 -0500 |
|---|---|---|
| committer | Patrick Griffis <tingping@tingping.se> | 2016-12-13 17:37:15 -0500 |
| commit | aa7080f8fe63939d7ff4a0d0b1ec60f0c3eb31be (patch) | |
| tree | e1d3061fa71f501798068ca4444131009144d17e | |
| parent | d583ca7d922e5ac6ff466df2e4411b1303a3a2a3 (diff) | |
Fix building fishlim against libressl also
Also part of #1898
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | plugins/fishlim/dh1080.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 1f442c58..10a15504 100644 --- a/configure.ac +++ b/configure.ac @@ -375,7 +375,7 @@ AS_IF([test "$openssl" != no], [ COMMON_LIBS="$COMMON_LIBS $OPENSSL_LIBS" COMMON_CFLAGS="$COMMON_CFLAGS $OPENSSL_CFLAGS" dnl Test for various functions that are not available in LibreSSL - AC_CHECK_FUNCS([SSL_CTX_get_ssl_method X509_get_signature_nid]) + AC_CHECK_FUNCS([SSL_CTX_get_ssl_method X509_get_signature_nid DH_set0_pqg DH_get0_key DH_set0_key]) ], [ unset openssl_path ac_cv_lib_ssl_SSL_new ac_cv_header_openssl_ssl_h AS_IF([test "$openssl" != yes], [ diff --git a/plugins/fishlim/dh1080.c b/plugins/fishlim/dh1080.c index ff6e5794..36117581 100644 --- a/plugins/fishlim/dh1080.c +++ b/plugins/fishlim/dh1080.c @@ -74,7 +74,7 @@ dh1080_init (void) BN_set_word (g, 2); -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#ifndef HAVE_DH_SET0_PQG g_dh->p = p; g_dh->g = g; #else @@ -162,7 +162,7 @@ dh1080_generate_key (char **priv_key, char **pub_key) return 0; } -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#ifndef HAVE_DH_GET0_KEY dh_pub_key = dh->pub_key; dh_priv_key = dh->priv_key; #else @@ -213,7 +213,7 @@ dh1080_compute_key (const char *priv_key, const char *pub_key, char **secret_key priv_key_data = dh1080_decode_b64 (priv_key, &priv_key_len); priv_key_num = BN_bin2bn(priv_key_data, priv_key_len, NULL); -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#ifndef HAVE_DH_SET0_KEY dh->priv_key = priv_key_num; #else DH_set0_key (dh, NULL, priv_key_num); |