mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-18 03:46:03 +00:00
Code Issues Releases Activity

www/libwww: Fix build with OpenSSL 1.1.x

Browse Source 
PR:		228943
Submitted by:	Nathan <ndowens@yahoo.com> (based on)
Reported by:	brnrd
Obtained from:	NetBSD pkgsrc
This commit is contained in:
Danilo G. Baio 2018-10-13 19:37:00 +00:00
parent cdc0f1d2c3
commit a3a9287337
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=482007
2 changed files with 62 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
www/libwww/files/patch-Library_src_SSL_HTSSL.c
View File

@ -1,19 +1,55 @@
--- Library/src/SSL/HTSSL.c.orig 2018-07-04 23:30:19 UTC
--- Library/src/SSL/HTSSL.c.orig 2017-06-24 05:51:38 UTC
+++ Library/src/SSL/HTSSL.c
@@ -214,12 +214,16 @@ PUBLIC BOOL HTSSL_init (void)
@@ -98,6 +98,7 @@ PRIVATE void apps_ssl_info_callback (SSL * s, int wher
PRIVATE int verify_callback (int ok, X509_STORE_CTX * ctx)
{
char buf[256];
+ int ctx_error;
X509 * err_cert = X509_STORE_CTX_get_current_cert(ctx);
int err = X509_STORE_CTX_get_error(ctx);
int depth = X509_STORE_CTX_get_error_depth(ctx);
@@ -115,24 +116,28 @@ PRIVATE int verify_callback (int ok, X509_STORE_CTX *
verify_error=X509_V_ERR_CERT_CHAIN_TOO_LONG;
}
}
- switch (ctx->error) {
+ switch (ctx_error = X509_STORE_CTX_get_error(ctx)) {
case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
+ X509_NAME_oneline(X509_get_issuer_name(X509_STORE_CTX_get0_cert(ctx)), buf, 256);
+#else
X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256);
+#endif
HTTRACE(PROT_TRACE, "issuer= %s\n" _ buf);
break;
case X509_V_ERR_CERT_NOT_YET_VALID:
case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
HTTRACE(PROT_TRACE, "notBefore=");
-// ASN1_TIME_print(bio_err,X509_get_notBefore(ctx->current_cert));
+// ASN1_TIME_print(bio_err,X509_get_notBefore(X509_STORE_CTX_get0_cert(ctx)));
HTTRACE(PROT_TRACE, "\n");
break;
case X509_V_ERR_CERT_HAS_EXPIRED:
case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
HTTRACE(PROT_TRACE, "notAfter=");
-// ASN1_TIME_print(bio_err,X509_get_notAfter(ctx->current_cert));
+// ASN1_TIME_print(bio_err,X509_get_notAfter(X509_STORE_CTX_get0_cert(ctx)));
HTTRACE(PROT_TRACE, "\n");
break;
}
@@ -214,12 +219,6 @@ PUBLIC BOOL HTSSL_init (void)
/* select the protocol method */
switch (ssl_prot_method) {
+#ifndef OPENSSL_NO_SSL2
case HTSSL_V2:
meth = SSLv2_client_method();
break;
+#endif
+#ifndef OPENSSL_NO_SSL3_METHOD
case HTSSL_V3:
meth = SSLv3_client_method();
break;
+#endif
- case HTSSL_V2:
- meth = SSLv2_client_method();
- break;
- case HTSSL_V3:
- meth = SSLv3_client_method();
- break;
case HTSSL_V23:
meth = SSLv23_client_method();
break;

16
www/libwww/files/patch-configure
View File

@ -1,6 +1,15 @@
--- configure.orig 2018-07-04 23:24:12 UTC
--- configure.orig 2017-06-24 06:11:34 UTC
+++ configure
@@ -16416,8 +16416,11 @@ $as_echo "no" >&6; }
@@ -15439,7 +15439,7 @@ if test "x$ac_cv_func_remove" = xyes; then :
fi
- if test "$ac_cv_func_remove" == yes ; then
+ if test "$ac_cv_func_remove" = yes ; then
$as_echo "#define unlink remove" >>confdefs.h
@@ -16416,10 +16416,14 @@ $as_echo "no" >&6; }
if test "x$withval" = "xyes"; then
withval=$ssllib
SSLINC=$sslinc
@ -12,4 +21,7 @@
- LIBS="$LIBS $withval"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+#include <openssl/ssl.h>
int
main ()