Attachment #519692 for bug #647832

View | Details | Raw Unified | Return to bug 647832
Collapse All | Expand All




			CTRACE((tfp,
				"HTNews: Unable to complete SSL handshake for '%s', SSL_connect=%d, SSL error stack dump follows\n",
				url, status));
#if OPENSSL_VERSION_NUMBER < 0x10100000L
			SSL_load_error_strings();
#endif
			while ((SSLerror = ERR_get_error()) != 0) {
			    CTRACE((tfp, "HTNews: SSL: %s\n",
				    ERR_error_string(SSLerror, NULL)));

	CTRACE((tfp,
		"HTNews: Unable to complete SSL handshake for '%s', SSL_connect=%d, SSL error stack dump follows\n",
		url, status));
#if OPENSSL_VERSION_NUMBER < 0x10100000L
	SSL_load_error_strings();
#endif
	while ((SSLerror = ERR_get_error()) != 0) {
	    CTRACE((tfp, "HTNews: SSL: %s\n", ERR_error_string(SSLerror, NULL)));
	}

Lines 48-53 Link Here

(-)a/WWW/Library/Implementation/HTTP.c (+10 lines)
48	#ifdef USE_SSL	48	#ifdef USE_SSL
49	#ifdef USE_OPENSSL_INCL	49	#ifdef USE_OPENSSL_INCL
50	#include <openssl/x509v3.h>	50	#include <openssl/x509v3.h>
		51	#if OPENSSL_VERSION_NUMBER >= 0x10100000L
		52	#define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER
		53	#define ASN1_STRING_data ASN1_STRING_get0_data
		54	#endif
51	#endif	55	#endif
52	#ifdef USE_GNUTLS_INCL	56	#ifdef USE_GNUTLS_INCL
53	#include <gnutls/x509.h>	57	#include <gnutls/x509.h>
Lines 173-180 SSL *HTGetSSLHandle(void) Link Here
173	X509_set_default_verify_paths(ssl_ctx->cert);	177	X509_set_default_verify_paths(ssl_ctx->cert);
174	}	178	}
175	#else	179	#else
		180	#if OPENSSL_VERSION_NUMBER < 0x10100000L
176	SSLeay_add_ssl_algorithms();	181	SSLeay_add_ssl_algorithms();
177	if ((ssl_ctx = SSL_CTX_new(SSLv23_client_method())) != NULL) {	182	if ((ssl_ctx = SSL_CTX_new(SSLv23_client_method())) != NULL) {
		183	#else
		184	if ((ssl_ctx = SSL_CTX_new(TLS_client_method())) != NULL) {
		185	#endif
178	#ifdef SSL_OP_NO_SSLv2	186	#ifdef SSL_OP_NO_SSLv2
179	SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL \| SSL_OP_NO_SSLv2);	187	SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL \| SSL_OP_NO_SSLv2);
180	#else	188	#else
Lines 961-967 static int HTLoadHTTP(const char *arg, Link Here
961	CTRACE((tfp,	969	CTRACE((tfp,
962	"HTTP: Unable to complete SSL handshake for '%s', SSL_connect=%d, SSL error stack dump follows\n",	970	"HTTP: Unable to complete SSL handshake for '%s', SSL_connect=%d, SSL error stack dump follows\n",
963	url, status));	971	url, status));
		972	#if OPENSSL_VERSION_NUMBER < 0x10100000L
964	SSL_load_error_strings();	973	SSL_load_error_strings();
		974	#endif
965	while ((SSLerror = ERR_get_error()) != 0) {	975	while ((SSLerror = ERR_get_error()) != 0) {
966	CTRACE((tfp, "HTTP: SSL: %s\n", ERR_error_string(SSLerror, NULL)));	976	CTRACE((tfp, "HTTP: SSL: %s\n", ERR_error_string(SSLerror, NULL)));
967	}	977	}

Return to bug 647832

Lines 2657-2663 static int HTLoadNews(const char *arg, Link Here

(-)a/WWW/Library/Implementation/HTNews.c (+4 lines)
2657	CTRACE((tfp,	2657	CTRACE((tfp,
2658	"HTNews: Unable to complete SSL handshake for '%s', SSL_connect=%d, SSL error stack dump follows\n",	2658	"HTNews: Unable to complete SSL handshake for '%s', SSL_connect=%d, SSL error stack dump follows\n",
2659	url, status));	2659	url, status));
		2660	#if OPENSSL_VERSION_NUMBER < 0x10100000L
2660	SSL_load_error_strings();	2661	SSL_load_error_strings();
		2662	#endif
2661	while ((SSLerror = ERR_get_error()) != 0) {	2663	while ((SSLerror = ERR_get_error()) != 0) {
2662	CTRACE((tfp, "HTNews: SSL: %s\n",	2664	CTRACE((tfp, "HTNews: SSL: %s\n",
2663	ERR_error_string(SSLerror, NULL)));	2665	ERR_error_string(SSLerror, NULL)));
Lines 3072-3078 int HTNewsProxyConnect(int sock, Link Here
3072	CTRACE((tfp,	3074	CTRACE((tfp,
3073	"HTNews: Unable to complete SSL handshake for '%s', SSL_connect=%d, SSL error stack dump follows\n",	3075	"HTNews: Unable to complete SSL handshake for '%s', SSL_connect=%d, SSL error stack dump follows\n",
3074	url, status));	3076	url, status));
		3077	#if OPENSSL_VERSION_NUMBER < 0x10100000L
3075	SSL_load_error_strings();	3078	SSL_load_error_strings();
		3079	#endif
3076	while ((SSLerror = ERR_get_error()) != 0) {	3080	while ((SSLerror = ERR_get_error()) != 0) {
3077	CTRACE((tfp, "HTNews: SSL: %s\n", ERR_error_string(SSLerror, NULL)));	3081	CTRACE((tfp, "HTNews: SSL: %s\n", ERR_error_string(SSLerror, NULL)));
3078	}	3082	}