From 4e93e94379cf1c06a27be281317fba73c1749a60 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 10 Jan 2016 13:53:45 +0100 Subject: [PATCH] BB: freeradius2: fix disabling of OpenSSL version check The previously added patch for removing the check accidentally disabled the library init as well. Signed-off-by: Jo-Philipp Wich --- .../patches/010-disable-openssl-check.patch | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/net/freeradius2/patches/010-disable-openssl-check.patch b/net/freeradius2/patches/010-disable-openssl-check.patch index d0da5f403e..bb9932ead9 100644 --- a/net/freeradius2/patches/010-disable-openssl-check.patch +++ b/net/freeradius2/patches/010-disable-openssl-check.patch @@ -38,14 +38,25 @@ LDFLAGS="$old_LDFLAGS" --- a/src/main/version.c +++ b/src/main/version.c -@@ -43,6 +43,7 @@ static long ssl_built = OPENSSL_VERSION_ +@@ -43,8 +43,6 @@ static long ssl_built = OPENSSL_VERSION_ */ int ssl_check_version(int allow_vulnerable) { -+#if 0 - long ssl_linked; - +- long ssl_linked; +- /* + * Initialize the library before calling any library + * functions. +@@ -52,6 +50,9 @@ int ssl_check_version(int allow_vulnerab + SSL_library_init(); + SSL_load_error_strings(); + ++#if 0 ++ long ssl_linked; ++ + ssl_linked = SSLeay(); + + if (ssl_linked != ssl_built) { @@ -74,6 +75,7 @@ int ssl_check_version(int allow_vulnerab return -1; }