Attachment #498824 for bug #592510

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

Lines 319-330 Link Here

(-)w3m-0.5.3-git20161120-orig/url.c (-1 / +5 lines)
319	#endif /* defined(USE_SSL_VERIFY) */	319	#endif /* defined(USE_SSL_VERIFY) */
320	if (ssl_ctx == NULL) {	320	if (ssl_ctx == NULL) {
321	int option;	321	int option;
322	#if SSLEAY_VERSION_NUMBER < 0x0800	322	#if OPENSSL_VERSION_NUMBER < 0x0800
323	ssl_ctx = SSL_CTX_new();	323	ssl_ctx = SSL_CTX_new();
324	X509_set_default_verify_paths(ssl_ctx->cert);	324	X509_set_default_verify_paths(ssl_ctx->cert);
325	#else /* SSLEAY_VERSION_NUMBER >= 0x0800 */	325	#else /* SSLEAY_VERSION_NUMBER >= 0x0800 */
		326	#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
326	SSLeay_add_ssl_algorithms();	327	SSLeay_add_ssl_algorithms();
327	SSL_load_error_strings();	328	SSL_load_error_strings();
		329	#else
		330	OPENSSL_init_ssl(0, NULL);
		331	#endif
328	if (!(ssl_ctx = SSL_CTX_new(SSLv23_client_method())))	332	if (!(ssl_ctx = SSL_CTX_new(SSLv23_client_method())))
329	goto eend;	333	goto eend;
330	SSL_CTX_set_cipher_list(ssl_ctx, "DEFAULT:!LOW:!RC4:!EXP");	334	SSL_CTX_set_cipher_list(ssl_ctx, "DEFAULT:!LOW:!RC4:!EXP");

Lines 421-427 Link Here

(-)w3m-0.5.3-git20161120-orig/istream.c (+4 lines)
421	for (i = 0; i < n; i++) {	421	for (i = 0; i < n; i++) {
422	gn = sk_GENERAL_NAME_value(alt, i);	422	gn = sk_GENERAL_NAME_value(alt, i);
423	if (gn->type == GEN_DNS) {	423	if (gn->type == GEN_DNS) {
		424	#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
424	char *sn = ASN1_STRING_data(gn->d.ia5);	425	char *sn = ASN1_STRING_data(gn->d.ia5);
		426	#else
		427	char *sn = ASN1_STRING_get0_data(gn->d.ia5);
		428	#endif
425	int sl = ASN1_STRING_length(gn->d.ia5);	429	int sl = ASN1_STRING_length(gn->d.ia5);
426		430
427	if (!seen_dnsname)	431	if (!seen_dnsname)

Return to bug 592510