16457346 libneon fails in build 16 due to openssl mismatch s12-17.1
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Fri, 08 Mar 2013 12:37:51 -0800
changeset 1202 4c8e89060d4a
parent 1201 de71257be89e
child 1203 0484bda26a07
16457346 libneon fails in build 16 due to openssl mismatch
components/libneon/patches/002-openssl-version.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libneon/patches/002-openssl-version.patch	Fri Mar 08 12:37:51 2013 -0800
@@ -0,0 +1,30 @@
+Author: joe
+Date: Fri Jul  6 21:23:20 2012
+New Revision: 1895
+
+Modified:
+   neon/trunk/src/ne_socket.c
+
+Log:
+* src/ne_socket.c (ne_sock_connect_ssl): Drop OpenSSL version check,
+  inappropriate with OpenSSL 1.x; patch by Mike Frysinger.
+
+
+Modified: neon/trunk/src/ne_socket.c
+==============================================================================
+--- src/ne_socket.c	(original)
++++ src/ne_socket.c	Fri Jul  6 21:23:20 2012
[email protected]@ -1718,13 +1718,6 @@
+ 	return NE_SOCK_ERROR;
+     }
+ 
+-    /* If runtime library version differs from compile-time version
+-     * number in major/minor/fix level, abort soon. */
+-    if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & 0xFFFFF000) {
+-        set_error(sock, _("SSL disabled due to library version mismatch"));
+-        return NE_SOCK_ERROR;
+-    }
+-
+     sock->ssl = ssl = SSL_new(ctx->ctx);
+     if (!ssl) {
+ 	set_error(sock, _("Could not create SSL structure"));