Attachment #500770 for bug #605026

Lines 1026-1031 Link Here

(-)elinks-0.12pre6-orig/configure.in (+5 lines)
1026	if test "$cf_result" != yes; then	1026	if test "$cf_result" != yes; then
1027	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [[SSLeay_add_ssl_algorithms()]])],[cf_result=yes],[cf_result=no])	1027	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [[SSLeay_add_ssl_algorithms()]])],[cf_result=yes],[cf_result=no])
1028	fi	1028	fi
		1029	if test "$cf_result" != yes; then
		1030	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/crypto.h>]], [[OpenSSL_version_num()]])],[cf_result=yes],[cf_result=no])
		1031	fi
1029	fi	1032	fi
1030	done	1033	done
1031		1034
Lines 1040-1045 Link Here
1040		1043
1041	CFLAGS="$CFLAGS_X"	1044	CFLAGS="$CFLAGS_X"
1042	AC_SUBST(OPENSSL_CFLAGS)	1045	AC_SUBST(OPENSSL_CFLAGS)
		1046
		1047	AC_CHECK_FUNCS([SSL_set_options] [SSL_get_SSL_CTX])
1043	fi	1048	fi
1044	fi	1049	fi
1045		1050




#ifdef CONFIG_OPENSSL
#include <openssl/ssl.h>
#include <openssl/rand.h>
#include <openssl/opensslv.h>
#elif defined(CONFIG_GNUTLS)
#include <gnutls/gnutls.h>
#include <gnutls/x509.h>

	}
#endif

#if OPENSSL_VERSION_NUMBER < 0x10100000L
	SSLeay_add_ssl_algorithms();
#endif
	context = SSL_CTX_new(SSLv23_client_method());
	SSL_CTX_set_options(context, SSL_OP_ALL);
	SSL_CTX_set_default_verify_paths(context);

Return to bug 605026

Lines 7-12 Link Here

(-)elinks-0.12pre6-orig/src/network/ssl/ssl.c (+3 lines)
7	#ifdef CONFIG_OPENSSL	7	#ifdef CONFIG_OPENSSL
8	#include <openssl/ssl.h>	8	#include <openssl/ssl.h>
9	#include <openssl/rand.h>	9	#include <openssl/rand.h>
		10	#include <openssl/opensslv.h>
10	#elif defined(CONFIG_GNUTLS)	11	#elif defined(CONFIG_GNUTLS)
11	#include <gnutls/gnutls.h>	12	#include <gnutls/gnutls.h>
12	#include <gnutls/x509.h>	13	#include <gnutls/x509.h>
Lines 61-67 Link Here
61	}	62	}
62	#endif	63	#endif
63		64
		65	#if OPENSSL_VERSION_NUMBER < 0x10100000L
64	SSLeay_add_ssl_algorithms();	66	SSLeay_add_ssl_algorithms();
		67	#endif
65	context = SSL_CTX_new(SSLv23_client_method());	68	context = SSL_CTX_new(SSLv23_client_method());
66	SSL_CTX_set_options(context, SSL_OP_ALL);	69	SSL_CTX_set_options(context, SSL_OP_ALL);
67	SSL_CTX_set_default_verify_paths(context);	70	SSL_CTX_set_default_verify_paths(context);