Fix GnuTLS 2.12 library still referencing OpenSSL ERR_print_errors_cb()

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/configure.ac b/configure.ac
index 4cb33b1c853cd08343bbb5372a527cf4cac52993..9feef4d390200c7c45f1237cc6d0c703126ab162 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -316,6 +316,7 @@ case "$ssl_library" in
        AC_SUBST(SSL_LIBRARY, [openssl])
        AC_SUBST(SSL_LIBS, ['$(OPENSSL_LIBS)'])
        AC_SUBST(SSL_CFLAGS, ['$(OPENSSL_CFLAGS)'])
+       AC_SUBST(SYMVER_PRINT_ERR, ["openconnect_print_err_cb;"])
        ;;
     both)
        # GnuTLS for TCP, OpenSSL for DTLS
@@ -326,6 +327,7 @@ case "$ssl_library" in
        AC_SUBST(SSL_CFLAGS, ['$(GNUTLS_CFLAGS)'])
        AC_SUBST(DTLS_SSL_LIBS, ['$(OPENSSL_LIBS)'])
        AC_SUBST(DTLS_SSL_CFLAGS, ['$(OPENSSL_CFLAGS)'])
+       AC_SUBST(SYMVER_PRINT_ERR, ["openconnect_print_err_cb;"])
        ;;
     *)
        AC_MSG_ERROR([Neither OpenSSL nor GnuTLS selected for SSL.])

diff --git a/libopenconnect.map.in b/libopenconnect.map.in
index b6dc84271d9ae015e708199f21ab73223eb77f7d..9e3a47addfafe722ca0cab181d7d0e186ae85d13 100644 (file)
--- a/libopenconnect.map.in
+++ b/libopenconnect.map.in
@@ -31,7 +31,7 @@ OPENCONNECT_2.0 {
 };
 
 OPENCONNECT_PRIVATE {
- global: @SYMVER_TIME@ @SYMVER_ASPRINTF@ @SYMVER_GETLINE@
+ global: @SYMVER_TIME@ @SYMVER_ASPRINTF@ @SYMVER_GETLINE@ @SYMVER_PRINT_ERR@
        openconnect_SSL_gets;
        openconnect_close_https;
        openconnect_open_https;

diff --git a/openconnect-internal.h b/openconnect-internal.h
index 37c64005f1ff5a0492be54953cbf6129f8e7801a..d67e601ea28ba91fc7df8e0ac8dbe3154103bb6a 100644 (file)
--- a/openconnect-internal.h
+++ b/openconnect-internal.h
@@ -337,9 +337,8 @@ int request_passphrase(struct openconnect_info *vpninfo, const char *label,
                       char **response, const char *fmt, ...);
 int  __attribute__ ((format (printf, 2, 3)))
     openconnect_SSL_printf(struct openconnect_info *vpninfo, const char *fmt, ...);
-#if defined(OPENCONNECT_OPENSSL) || defined (DTLS_OPENSSL)
-void openconnect_report_ssl_errors(struct openconnect_info *vpninfo);
-#endif
+int openconnect_print_err_cb(const char *str, size_t len, void *ptr);
+#define openconnect_report_ssl_errors(v) ERR_print_errors_cb(openconnect_print_err_cb, (v))
 
 /* ${SSL_LIBRARY}.c */
 int openconnect_SSL_gets(struct openconnect_info *vpninfo, char *buf, size_t len);

diff --git a/ssl.c b/ssl.c
index de16ec494a9ca09188e78826a478c2bc04c964c9..2303b6f8f3570fcb48657ae4a60d632d93215f32 100644 (file)
--- a/ssl.c
+++ b/ssl.c
@@ -357,17 +357,11 @@ int openconnect_passphrase_from_fsid(struct openconnect_info *vpninfo)
 #if defined(OPENCONNECT_OPENSSL) || defined (DTLS_OPENSSL)
 /* We put this here rather than in openssl.c because it might be needed
    for OpenSSL DTLS support even when GnuTLS is being used for HTTPS */
-#include <openssl/err.h>
-static int print_err(const char *str, size_t len, void *ptr)
+int openconnect_print_err_cb(const char *str, size_t len, void *ptr)
 {
        struct openconnect_info *vpninfo = ptr;
 
        vpn_progress(vpninfo, PRG_ERR, "%s", str);
        return 0;
 }
-
-void openconnect_report_ssl_errors(struct openconnect_info *vpninfo)
-{
-       ERR_print_errors_cb(print_err, vpninfo);
-}
 #endif

diff --git a/www/changelog.xml b/www/changelog.xml
index bfa99bae5b15665e72c7107824deccaf57b056a1..14adb3eb6226548e57b80a63ba248321643d045f 100644 (file)
--- a/www/changelog.xml
+++ b/www/changelog.xml
@@ -17,7 +17,7 @@
 <ul>
    <li><b>OpenConnect HEAD</b>
      <ul>
-       <li><i>No changelog entries yet</i></li>
+       <li>Fix library references to OpenSSL's <tt>ERR_print_errors_cb()</tt> when built against GnuTLS v2.12</li>
      </ul><br/>
   </li>
   <li><b><a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-3.99.tar.gz">OpenConnect v3.99</a></b>