iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix building fishlim against libressl also

Browse Source 
Also part of #1898
This commit is contained in:
Patrick Griffis 2016-12-13 17:29:26 -05:00
parent d583ca7d92
commit aa7080f8fe
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -375,7 +375,7 @@ AS_IF([test "$openssl" != no], [
COMMON_LIBS="$COMMON_LIBS $OPENSSL_LIBS" COMMON_LIBS="$COMMON_LIBS $OPENSSL_LIBS"
COMMON_CFLAGS="$COMMON_CFLAGS $OPENSSL_CFLAGS" COMMON_CFLAGS="$COMMON_CFLAGS $OPENSSL_CFLAGS"
dnl Test for various functions that are not available in LibreSSL 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 unset openssl_path ac_cv_lib_ssl_SSL_new ac_cv_header_openssl_ssl_h
AS_IF([test "$openssl" != yes], [ AS_IF([test "$openssl" != yes], [

6
plugins/fishlim/dh1080.c
View File

@ -74,7 +74,7 @@ dh1080_init (void)
BN_set_word (g, 2); BN_set_word (g, 2);
#if OPENSSL_VERSION_NUMBER < 0x10100000L #ifndef HAVE_DH_SET0_PQG
g_dh->p = p; g_dh->p = p;
g_dh->g = g; g_dh->g = g;
#else #else
@ -162,7 +162,7 @@ dh1080_generate_key (char **priv_key, char **pub_key)
return 0; return 0;
} }
#if OPENSSL_VERSION_NUMBER < 0x10100000L #ifndef HAVE_DH_GET0_KEY
dh_pub_key = dh->pub_key; dh_pub_key = dh->pub_key;
dh_priv_key = dh->priv_key; dh_priv_key = dh->priv_key;
#else #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_data = dh1080_decode_b64 (priv_key, &priv_key_len);
priv_key_num = BN_bin2bn(priv_key_data, priv_key_len, NULL); 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; dh->priv_key = priv_key_num;
#else #else
DH_set0_key (dh, NULL, priv_key_num); DH_set0_key (dh, NULL, priv_key_num);