Commit Diff

Commit:
7690716e4fa8ac3ae9b513f4adba685f9e2c0e1f
From:
Rosen Penev <rosenp@gmail.com>
Via:
Alexander Barton <alex@barton.de>
Date:
Message:
Fix compilation without deprecated OpenSSL APIs (#252)
Actions:
Patch | Tree
commit - c97fb2e93e9c7d66b1ce70fa681a762d1f430521
commit + 7690716e4fa8ac3ae9b513f4adba685f9e2c0e1f
blob - c23737979a21e7043d1eed7ed488524b83742112
blob + af715af8c7c1b773680b63f14890663962467623
--- src/ngircd/conf-ssl.h
+++ src/ngircd/conf-ssl.h
@@ -13,7 +13,11 @@
 #ifdef HAVE_LIBSSL
 #define SSL_SUPPORT
 #include <openssl/ssl.h>
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define OpenSSL_version SSLeay_version
+#define OPENSSL_VERSION SSLEAY_VERSION
 #endif
+#endif
 #ifdef HAVE_LIBGNUTLS
 #define SSL_SUPPORT
 #include <gnutls/gnutls.h>
blob - 705c29d5baf855d2954b884a42feaf480b5cec1c
blob + ba47e513603b69aba08f2b7cf25f6c20a1ad4555
--- src/ngircd/conn-ssl.c
+++ src/ngircd/conn-ssl.c
@@ -42,6 +42,7 @@ extern struct SSLOptions Conf_SSLOptions;
 #ifdef HAVE_LIBSSL
 #include <openssl/err.h>
 #include <openssl/rand.h>
+#include <openssl/dh.h>
 
 static SSL_CTX * ssl_ctx;
 static DH *dh_params;
@@ -326,7 +327,7 @@ ConnSSL_InitLibrary( void )
 			   Verify_openssl);
 	SSL_CTX_free(ssl_ctx);
 	ssl_ctx = newctx;
-	Log(LOG_INFO, "%s initialized.", SSLeay_version(SSLEAY_VERSION));
+	Log(LOG_INFO, "%s initialized.", OpenSSL_version(OPENSSL_VERSION));
 	return true;
 out:
 	SSL_CTX_free(newctx);