Attachment 314307 Details for Bug 347511 – incomplete port of library to nss_compat_ossl

[patch] incomplete port of library to nss_compat_ossl

libwvstreams-4.4.1-nss.patch (text/plain), 16.09 KB, created by Kamil Dudka on 2008-08-14 11:20:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kamil Dudka

Created: 2008-08-14 11:20:45 UTC

Size: 16.09 KB

patch

obsolete

>diff -ruNp wvstreams-4.4.1.orig/config.mk.in wvstreams-4.4.1/config.mk.in
>--- wvstreams-4.4.1.orig/config.mk.in	2007-08-17 07:15:31.000000000 +0200
>+++ wvstreams-4.4.1/config.mk.in	2008-08-14 11:38:21.000000000 +0200
>@@ -64,6 +64,7 @@ with_readline=@with_readline@
> with_qt=@with_qt@
> with_xplc=@with_xplc@
> with_zlib=@with_zlib@
>+SSL_LIBS=@SSL_LIBS@
> 
> build_xplc=@build_xplc@
> 
>diff -ruNp wvstreams-4.4.1.orig/configure.ac wvstreams-4.4.1/configure.ac
>--- wvstreams-4.4.1.orig/configure.ac	2007-08-30 04:47:54.000000000 +0200
>+++ wvstreams-4.4.1/configure.ac	2008-08-14 11:38:47.000000000 +0200
>@@ -92,6 +92,8 @@ AC_ARG_ENABLE(testgui,
>               AC_HELP_STRING([--disable-testgui],
>                              [GUI for unit tests]))
> 
>+# TODO: Disable by default?
>+AC_ARG_WITH(nss_compat, AC_HELP_STRING([--with-nss_compat], [NSS compatibility SSL libraries/include files]))
> AC_ARG_WITH(openssl, AC_HELP_STRING([--with-openssl], [OpenSSL >= 0.9.7 (required)]))
> AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam], [PAM]))
> AC_ARG_WITH(tcl, AC_HELP_STRING([--with-tcl], [Tcl]))
>@@ -391,6 +393,26 @@ fi
> # BSD sockets, if you're on Solaris
> AC_CHECK_LIB(socket, bind)
> 
>+# nss_compat_ossl
>+if test "$with_nss_compat" != "no"; then
>+    if test "$with_nss_compat" = "yes"; then
>+	if pkg-config nss; then
>+            WV_APPEND(CPPFLAGS, [`pkg-config --cflags nss`])
>+	    WV_APPEND(LDFLAGS, [`pkg-config --libs nss`])
>+	else
>+	    with_nss_compat=no
>+	fi
>+    else
>+	WV_APPEND(CPPFLAGS, [-I$with_nss_compat/include])
>+	WV_APPEND(LDFLAGS, [-L$with_nss_compat])
>+    fi
>+    AC_CHECK_HEADERS(nss_compat_ossl/nss_compat_ossl.h,, [with_nss_compat=no], [#define NSS_COMPAT_OSSL_H])
>+    AC_CHECK_LIB(nss_compat_ossl, X509_free)
>+    AC_DEFINE(HAVE_NSS_COMPAT, 1, [Using nss_compat_ossl instead of OpenSSL])
>+    SSL_LIBS="-lnss_compat_ossl"
>+    with_openssl=no
>+fi
>+
> # openssl
> if test "$with_openssl" != "no"; then
>     if test "$with_openssl" != ""; then
>@@ -401,6 +423,7 @@ if test "$with_openssl" != "no"; then
>                      [#define OPENSSL_NO_KRB5])
>     AC_CHECK_LIB(crypto, X509_free)
>     AC_CHECK_LIB(ssl, SSL_has_matching_session_id,, [with_openssl=no])
>+    SSL_LIBS="-lssl -lcrypto"
> fi
> 
> # readline
>@@ -541,9 +564,14 @@ fi
> if test "$VALGRIND" = ""; then
>     AC_MSG_WARN([Valgrind is missing.])
> fi
>-if test "$with_openssl" = "no"; then
>-    AC_MSG_WARN([OpenSSL is missing.])
>-    missing_required="$missing_required OpenSSL>=0.9.7"
>+if test "$with_nss_compat" != "no"; then
>+    # TODO: Mark this as non-warning when the port become stable
>+    AC_MSG_WARN([Using nss_compat_ossl library instead of OpenSSL.])
>+else
>+    if test "$with_nss_compat" = "no" -a "$with_openssl" = "no"; then
>+	AC_MSG_WARN([OpenSSL is missing.])
>+	missing_required="$missing_required OpenSSL>=0.9.7"
>+    fi
> fi
> if test "$with_readline" = "no"; then
>     AC_MSG_WARN([readline is missing.])
>@@ -591,7 +619,9 @@ AC_SUBST(enable_warnings)
> AC_SUBST(enable_testgui)
> 
> AC_SUBST(with_gtk)
>+AC_SUBST(with_nss_compat)
> AC_SUBST(with_openssl)
>+AC_SUBST(SSL_LIBS)
> AC_SUBST(with_pam)
> AC_SUBST(with_readline)
> AC_SUBST(with_qt)
>diff -ruNp wvstreams-4.4.1.orig/crypto/tests/vars.mk wvstreams-4.4.1/crypto/tests/vars.mk
>--- wvstreams-4.4.1.orig/crypto/tests/vars.mk	2007-07-19 23:22:43.000000000 +0200
>+++ wvstreams-4.4.1/crypto/tests/vars.mk	2008-08-14 11:38:21.000000000 +0200
>@@ -1,10 +1,10 @@
> 
> TESTS+=$(patsubst %.cc,%,$(wildcard crypto/tests/*.cc))
> 
>-crypto/tests/certtest: LDFLAGS+=-lssl
>-crypto/tests/cryptotest: LDFLAGS+=-lssl
>-crypto/tests/md5test: LDFLAGS+=-lssl
>-crypto/tests/reqtest: LDFLAGS+=-lssl
>-crypto/tests/ssltest: LDFLAGS+=-lssl
>-crypto/tests/sslsrvtest: LDFLAGS+=-lssl
>+crypto/tests/certtest: LDFLAGS+=$(SSL_LIBS)
>+crypto/tests/cryptotest: LDFLAGS+=$(SSL_LIBS)
>+crypto/tests/md5test: LDFLAGS+=$(SSL_LIBS)
>+crypto/tests/reqtest: LDFLAGS+=$(SSL_LIBS)
>+crypto/tests/ssltest: LDFLAGS+=$(SSL_LIBS)
>+crypto/tests/sslsrvtest: LDFLAGS+=$(SSL_LIBS)
> 
>diff -ruNp wvstreams-4.4.1.orig/crypto/wvblowfish.cc wvstreams-4.4.1/crypto/wvblowfish.cc
>--- wvstreams-4.4.1.orig/crypto/wvblowfish.cc	2007-07-19 23:22:43.000000000 +0200
>+++ wvstreams-4.4.1/crypto/wvblowfish.cc	2008-08-14 11:38:21.000000000 +0200
>@@ -6,8 +6,12 @@
>  */
> #include "wvblowfish.h"
> #include <assert.h>
>-#include <openssl/rand.h>
>-#include <openssl/blowfish.h>
>+#ifdef HAVE_NSS_COMPAT
>+#	include <nss_compat_ossl/nss_compat_ossl.h>
>+#else
>+#	include <openssl/rand.h>
>+#	include <openssl/blowfish.h>
>+#endif
> 
> /***** WvBlowfishEncoder ****/
> 
>diff -ruNp wvstreams-4.4.1.orig/crypto/wvcrl.cc wvstreams-4.4.1/crypto/wvcrl.cc
>--- wvstreams-4.4.1.orig/crypto/wvcrl.cc	2007-08-17 07:15:30.000000000 +0200
>+++ wvstreams-4.4.1/crypto/wvcrl.cc	2008-08-14 11:38:21.000000000 +0200
>@@ -5,8 +5,12 @@
>  * X.509v3 CRL management classes.
>  */
> 
>-#include <openssl/x509v3.h>
>-#include <openssl/pem.h>
>+#ifdef HAVE_NSS_COMPAT
>+#	include <nss_compat_ossl/nss_compat_ossl.h>
>+#else
>+#	include <openssl/x509v3.h>
>+#	include <openssl/pem.h>
>+#endif
> 
> #include "wvcrl.h"
> #include "wvx509mgr.h"
>diff -ruNp wvstreams-4.4.1.orig/crypto/wvdiffiehellman.cc wvstreams-4.4.1/crypto/wvdiffiehellman.cc
>--- wvstreams-4.4.1.orig/crypto/wvdiffiehellman.cc	2007-07-19 23:22:43.000000000 +0200
>+++ wvstreams-4.4.1/crypto/wvdiffiehellman.cc	2008-08-14 11:38:21.000000000 +0200
>@@ -27,7 +27,11 @@ char *alloca ();
> # endif
> #endif
> 
>-#include <openssl/bn.h>
>+#ifdef HAVE_NSS_COMPAT
>+#	include <nss_compat_ossl/nss_compat_ossl.h>
>+#else
>+#	include <openssl/bn.h>
>+#endif
> #include <stdlib.h>
> 
> #include "wvdiffiehellman.h"
>diff -ruNp wvstreams-4.4.1.orig/crypto/wvdigest.cc wvstreams-4.4.1/crypto/wvdigest.cc
>--- wvstreams-4.4.1.orig/crypto/wvdigest.cc	2007-08-17 07:15:30.000000000 +0200
>+++ wvstreams-4.4.1/crypto/wvdigest.cc	2008-08-14 11:38:21.000000000 +0200
>@@ -6,8 +6,12 @@
>  */
> #include "wvdigest.h"
> #include "wvserialize.h"
>-#include <openssl/evp.h>
>-#include <openssl/hmac.h>
>+#ifdef HAVE_NSS_COMPAT
>+#	include <nss_compat_ossl/nss_compat_ossl.h>
>+#else
>+#	include <openssl/evp.h>
>+#	include <openssl/hmac.h>
>+#endif
> #include <assert.h>
> #include <zlib.h>
> 
>diff -ruNp wvstreams-4.4.1.orig/crypto/wvdsa.cc wvstreams-4.4.1/crypto/wvdsa.cc
>--- wvstreams-4.4.1.orig/crypto/wvdsa.cc	2007-07-19 23:22:43.000000000 +0200
>+++ wvstreams-4.4.1/crypto/wvdsa.cc	2008-08-14 11:38:21.000000000 +0200
>@@ -5,8 +5,12 @@
>  * DSA cryptography abstractions.
>  */
> #include <assert.h>
>-#include <openssl/dsa.h>
>-#include <openssl/pem.h>
>+#ifdef HAVE_NSS_COMPAT
>+#	include <nss_compat_ossl/nss_compat_ossl.h>
>+#else
>+#	include <openssl/dsa.h>
>+#	include <openssl/pem.h>
>+#endif
> #include "wvsslhacks.h"
> #include "wvdsa.h"
> #include "wvhex.h"
>diff -ruNp wvstreams-4.4.1.orig/crypto/wvoakley.cc wvstreams-4.4.1/crypto/wvoakley.cc
>--- wvstreams-4.4.1.orig/crypto/wvoakley.cc	2007-07-19 23:22:43.000000000 +0200
>+++ wvstreams-4.4.1/crypto/wvoakley.cc	2008-08-14 11:38:21.000000000 +0200
>@@ -7,6 +7,10 @@
> 
> #include "wvoakley.h"
> 
>+#ifdef HAVE_NSS_COMPAT
>+#	define DH_GENERATOR_2 2
>+#endif
>+
> /* Group 1 prime */
> static unsigned char group1_key[] =
> { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2, 
>diff -ruNp wvstreams-4.4.1.orig/crypto/wvrsa.cc wvstreams-4.4.1/crypto/wvrsa.cc
>--- wvstreams-4.4.1.orig/crypto/wvrsa.cc	2007-07-20 18:39:45.000000000 +0200
>+++ wvstreams-4.4.1/crypto/wvrsa.cc	2008-08-14 11:38:21.000000000 +0200
>@@ -5,8 +5,12 @@
>  * RSA cryptography abstractions.
>  */
> #include <assert.h>
>-#include <openssl/rsa.h>
>-#include <openssl/pem.h>
>+#ifdef HAVE_NSS_COMPAT
>+#	include <nss_compat_ossl/nss_compat_ossl.h>
>+#else
>+#	include <openssl/rsa.h>
>+#	include <openssl/pem.h>
>+#endif
> #include "wvsslhacks.h"
> #include "wvrsa.h"
> #include "wvhex.h"
>diff -ruNp wvstreams-4.4.1.orig/crypto/wvsslstream.cc wvstreams-4.4.1/crypto/wvsslstream.cc
>--- wvstreams-4.4.1.orig/crypto/wvsslstream.cc	2007-08-17 07:15:30.000000000 +0200
>+++ wvstreams-4.4.1/crypto/wvsslstream.cc	2008-08-14 11:38:21.000000000 +0200
>@@ -8,8 +8,12 @@
> #include "wvcrypto.h"
> #include "wvmoniker.h"
> #include "wvlinkerhack.h"
>-#include <openssl/ssl.h>
>-#include <openssl/err.h>
>+#ifdef HAVE_NSS_COMPAT
>+#	include <nss_compat_ossl/nss_compat_ossl.h>
>+#else
>+#	include <openssl/ssl.h>
>+#	include <openssl/err.h>
>+#endif
> #include <assert.h>
> 
> #ifndef _WIN32
>@@ -94,9 +98,13 @@ WvSSLStream::WvSSLStream(IWvStream *_sla
> 	ctx = SSL_CTX_new(SSLv23_server_method());
>     	if (!ctx)
>     	{
>+#ifdef HAVE_NSS_COMPAT
>+	    // TODO
>+#else
>             ERR_print_errors_fp(stderr);
>             debug("Can't get SSL context! Error: %s\n", 
>                   ERR_reason_error_string(ERR_get_error()));
>+#endif
> 	    seterr("Can't get SSL context!");
> 	    return;
>     	}
>@@ -143,7 +151,11 @@ WvSSLStream::WvSSLStream(IWvStream *_sla
>     
>     //SSL_CTX_set_read_ahead(ctx, 1);
> 
>+#ifdef HAVE_NSS_COMPAT
>+    // TODO
>+#else
>     ERR_clear_error();
>+#endif
>     ssl = SSL_new(ctx);
>     if (!ssl)
>     {
>@@ -234,7 +246,11 @@ size_t WvSSLStream::uread(void *buf, siz
>         size_t avail = read_bouncebuf.free();
>         unsigned char *data = read_bouncebuf.alloc(avail);
>         
>+#ifdef HAVE_NSS_COMPAT
>+	// TODO
>+#else
> 	ERR_clear_error();
>+#endif
>         int result = SSL_read(ssl, data, avail);
> 	// debug("<< SSL_read result %s for %s bytes (wanted %s)\n",
> 	//      result, avail, len);
>@@ -364,7 +380,11 @@ size_t WvSSLStream::uwrite(const void *b
>         size_t used = write_bouncebuf.used();
>         const unsigned char *data = write_bouncebuf.get(used);
> 
>-        ERR_clear_error();
>+#ifdef HAVE_NSS_COMPAT
>+	// TODO
>+#else
>+	ERR_clear_error();
>+#endif
>         int result = SSL_write(ssl, data, used);
> 	// debug("<< SSL_write result %s for %s bytes\n",
> 	//      result, used);
>@@ -441,7 +461,11 @@ void WvSSLStream::close()
>     
>     if (ssl)
>     {
>-        ERR_clear_error();
>+#ifdef HAVE_NSS_COMPAT
>+	// TODO
>+#else
>+	ERR_clear_error();
>+#endif
> 	SSL_shutdown(ssl);
> 	SSL_free(ssl);
> 	ssl = NULL;
>@@ -552,7 +576,11 @@ bool WvSSLStream::post_select(SelectInfo
>         WvFDStream *fdstream = static_cast<WvFDStream*>(cloned);
>         int fd = fdstream->getfd();
>         assert(fd >= 0);
>-        ERR_clear_error();
>+#ifdef HAVE_NSS_COMPAT
>+	// TODO
>+#else
>+	ERR_clear_error();
>+#endif
> 	SSL_set_fd(ssl, fd);
> //	debug("SSL connected on fd %s.\n", fd);
> 	
>diff -ruNp wvstreams-4.4.1.orig/crypto/wvtripledes.cc wvstreams-4.4.1/crypto/wvtripledes.cc
>--- wvstreams-4.4.1.orig/crypto/wvtripledes.cc	2007-07-19 23:22:43.000000000 +0200
>+++ wvstreams-4.4.1/crypto/wvtripledes.cc	2008-08-14 11:38:21.000000000 +0200
>@@ -6,7 +6,11 @@
>  */
> #include "wvtripledes.h"
> #include <assert.h>
>-#include <openssl/rand.h>
>+#ifdef HAVE_NSS_COMPAT
>+#	include <nss_compat_ossl/nss_compat_ossl.h>
>+#else
>+#	include <openssl/rand.h>
>+#endif
> 
> /***** WvTripleDESEncoder ****/
> 
>diff -ruNp wvstreams-4.4.1.orig/crypto/wvx509.cc wvstreams-4.4.1/crypto/wvx509.cc
>--- wvstreams-4.4.1.orig/crypto/wvx509.cc	2007-08-17 07:15:30.000000000 +0200
>+++ wvstreams-4.4.1/crypto/wvx509.cc	2008-08-14 11:38:21.000000000 +0200
>@@ -12,11 +12,15 @@
> #include "wvbase64.h"
> #include "wvstrutils.h"
> 
>-#include <openssl/pem.h>
>-#include <openssl/x509v3.h>
>-#include <openssl/err.h>
>-#include <openssl/sha.h>
>-#include <openssl/ssl.h>
>+#ifdef HAVE_NSS_COMPAT
>+#	include <nss_compat_ossl/nss_compat_ossl.h>
>+#else
>+#	include <openssl/pem.h>
>+#	include <openssl/x509v3.h>
>+#	include <openssl/err.h>
>+#	include <openssl/sha.h>
>+#	include <openssl/ssl.h>
>+#endif
> 
> // enable this to add some extra debugging trace messages (this can be VERY
> // verbose)
>diff -ruNp wvstreams-4.4.1.orig/crypto/wvx509mgr.cc wvstreams-4.4.1/crypto/wvx509mgr.cc
>--- wvstreams-4.4.1.orig/crypto/wvx509mgr.cc	2007-07-19 23:26:44.000000000 +0200
>+++ wvstreams-4.4.1/crypto/wvx509mgr.cc	2008-08-14 11:38:21.000000000 +0200
>@@ -2,12 +2,16 @@
> #include "wvsslhacks.h"
> #include "wvx509mgr.h"
> 
>-#include <openssl/pem.h>
>-#include <openssl/x509v3.h>
>-#include <openssl/err.h>
>-#include <openssl/ssl.h>
>-#include <openssl/sha.h>
>-#include <openssl/pkcs12.h>
>+#ifdef HAVE_NSS_COMPAT
>+#	include <nss_compat_ossl/nss_compat_ossl.h>
>+#else
>+#	include <openssl/pem.h>
>+#	include <openssl/x509v3.h>
>+#	include <openssl/err.h>
>+#	include <openssl/ssl.h>
>+#	include <openssl/sha.h>
>+#	include <openssl/pkcs12.h>
>+#endif
> 
> 
> namespace {
>diff -ruNp wvstreams-4.4.1.orig/include/wvcrl.h wvstreams-4.4.1/include/wvcrl.h
>--- wvstreams-4.4.1.orig/include/wvcrl.h	2007-07-20 05:40:43.000000000 +0200
>+++ wvstreams-4.4.1/include/wvcrl.h	2008-08-14 11:38:21.000000000 +0200
>@@ -15,7 +15,11 @@
> struct X509_crl_st;
> typedef struct X509_crl_st X509_CRL;
> struct ssl_ctx_st;
>+#ifdef HAVE_NSS_COMPAT
>+typedef struct PRFileDesc SSL_CTX;
>+#else
> typedef struct ssl_ctx_st SSL_CTX;
>+#endif
> struct asn1_string_st;
> typedef struct asn1_string_st ASN1_INTEGER;
> 
>diff -ruNp wvstreams-4.4.1.orig/include/wvdiffiehellman.h wvstreams-4.4.1/include/wvdiffiehellman.h
>--- wvstreams-4.4.1.orig/include/wvdiffiehellman.h	2007-07-19 23:22:49.000000000 +0200
>+++ wvstreams-4.4.1/include/wvdiffiehellman.h	2008-08-14 11:38:21.000000000 +0200
>@@ -8,7 +8,12 @@
> #ifndef __WVDIFFIEHELLMAN_H
> #define __WVDIFFIEHELLMAN_H
> 
>-#include <openssl/dh.h>
>+#ifdef HAVE_NSS_COMPAT
>+#	include <nss_compat_ossl/nss_compat_ossl.h>
>+#	define BN_ULONG unsigned long
>+#else
>+#	include <openssl/dh.h>
>+#endif
> 
> #include "wvstream.h"
> #include "wvlog.h"
>@@ -18,7 +23,9 @@ class WvDiffieHellman
> public:
>     WvDiffieHellman(const unsigned char *_key, int _keylen, 
> 		    BN_ULONG _generator);
>-    ~WvDiffieHellman() { DH_free(info); }
>+    /* This inline method breaks binary compatibility
>+    ~WvDiffieHellman() { DH_free(info); }*/
>+    ~WvDiffieHellman();
> 
>     void get_created_secret(WvBuf &outbuf, size_t len);
>     int get_public_value(WvBuf &outbuf, int len);
>diff -ruNp wvstreams-4.4.1.orig/include/wvsslhacks.h wvstreams-4.4.1/include/wvsslhacks.h
>--- wvstreams-4.4.1.orig/include/wvsslhacks.h	2007-07-19 23:22:49.000000000 +0200
>+++ wvstreams-4.4.1/include/wvsslhacks.h	2008-08-14 11:38:21.000000000 +0200
>@@ -12,8 +12,12 @@
> #ifndef __WVSSLHACKS_H
> #define __WVSSLHACKS_H
> 
>-#include <openssl/rsa.h>
>-#include <openssl/x509.h>
>+#ifdef HAVE_NSS_COMPAT
>+#	include <nss_compat_ossl/nss_compat_ossl.h>
>+#else
>+#	include <openssl/rsa.h>
>+#	include <openssl/x509.h>
>+#endif
> 
> #ifdef __cplusplus
> extern "C" {
>diff -ruNp wvstreams-4.4.1.orig/include/wvsslstream.h wvstreams-4.4.1/include/wvsslstream.h
>--- wvstreams-4.4.1.orig/include/wvsslstream.h	2007-08-17 07:15:30.000000000 +0200
>+++ wvstreams-4.4.1/include/wvsslstream.h	2008-08-14 11:38:21.000000000 +0200
>@@ -16,8 +16,13 @@ struct ssl_st;
> struct ssl_ctx_st;
> struct ssl_method_st;
> 
>+#ifdef HAVE_NSS_COMPAT
>+typedef struct PRFileDesc SSL_CTX;
>+typedef struct PRFileDesc SSL;
>+#else
> typedef struct ssl_ctx_st SSL_CTX;
> typedef struct ssl_st SSL;
>+#endif
> typedef struct ssl_method_st SSL_METHOD;
> 
> class WvX509;
>diff -ruNp wvstreams-4.4.1.orig/include/wvtripledes.h wvstreams-4.4.1/include/wvtripledes.h
>--- wvstreams-4.4.1.orig/include/wvtripledes.h	2007-07-19 23:22:49.000000000 +0200
>+++ wvstreams-4.4.1/include/wvtripledes.h	2008-08-14 11:38:21.000000000 +0200
>@@ -11,7 +11,11 @@
> #include "wvencoderstream.h"
> #include "wvcrypto.h"
> 
>-#include <openssl/des.h>
>+#ifdef HAVE_NSS_COMPAT
>+#	include <nss_compat_ossl/nss_compat_ossl.h>
>+#else
>+#	include <openssl/des.h>
>+#endif
> 
> /**
>  * An encoder implementing the TripleDES encryption method.
>diff -ruNp wvstreams-4.4.1.orig/include/wvx509.h wvstreams-4.4.1/include/wvx509.h
>--- wvstreams-4.4.1.orig/include/wvx509.h	2007-07-19 23:26:51.000000000 +0200
>+++ wvstreams-4.4.1/include/wvx509.h	2008-08-14 11:38:21.000000000 +0200
>@@ -16,7 +16,11 @@
> struct x509_st;
> typedef struct x509_st X509;
> struct ssl_ctx_st;
>+#ifdef HAVE_NSS_COMPAT
>+typedef struct PRFileDesc SSL_CTX;
>+#else
> typedef struct ssl_ctx_st SSL_CTX;
>+#endif
> 
> struct X509_name_st;
> typedef struct X509_name_st X509_NAME;
>diff -ruNp wvstreams-4.4.1.orig/vars.mk wvstreams-4.4.1/vars.mk
>--- wvstreams-4.4.1.orig/vars.mk	2007-08-17 07:15:31.000000000 +0200
>+++ wvstreams-4.4.1/vars.mk	2008-08-14 11:38:21.000000000 +0200
>@@ -180,7 +180,7 @@ libwvstreams.a libwvstreams.so: $(filter
> 	$(call objects,configfile crypto ipstreams \
> 		$(ARCH_SUBDIRS) streams urlget))
> libwvstreams.so: libwvutils.so libwvbase.so
>-libwvstreams.so: LIBS+=-lssl -lcrypto 
>+libwvstreams.so: LIBS+=$(SSL_LIBS)
> 
> libuniconf.a libuniconf.so: $(filter-out $(BASEOBJS), \
> 	$(call objects,uniconf))

Actions: View | Diff

Attachments on bug 347511: 314307