casa / casa-mp-base / 343e9ffbff9

Commits

Joshua Root authored 343e9ffbff9 09 Sep 2019

squid2: fix build with openssl 1.1

net/squid2/files/src__ssl_support.c.diff

Modified

-1
+--- src/ssl_support.c.orig	2010-03-15 04:20:45.000000000 +1100
--
++++ src/ssl_support.c	2016-04-07 02:04:53.000000000 +1000
--
+@@ -446,10 +446,6 @@ sslCreateServerContext(const char *certf
-+
++++ src/ssl_support.c	2019-09-10 13:35:14.000000000 +1000
-+
+@@ -110,7 +110,7 @@ static int
-+
+ ssl_verify_cb(int ok, X509_STORE_CTX * ctx)
-+
+ {
-+
+     char buffer[256];
-+
+-    X509 *peer_cert = ctx->cert;
-+
++    X509 *peer_cert = X509_STORE_CTX_get0_cert(ctx);
-+
-+
+     X509_NAME_oneline(X509_get_subject_name(peer_cert), buffer,
-+
+ 	sizeof(buffer));
-+
+@@ -118,7 +118,7 @@ ssl_verify_cb(int ok, X509_STORE_CTX * c
-+
+     if (ok) {
-+
+ 	debug(83, 5) ("SSL Certificate signature OK: %s\n", buffer);
-+
+     } else {
-+
+-	switch (ctx->error) {
-+
++	switch (X509_STORE_CTX_get_error(ctx)) {
-+
+ 	case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
-+
+ 	    debug(83, 5) ("SSL Certficate error: CA not known: %s\n", buffer);
-+
+ 	    break;
-+
+@@ -136,7 +136,7 @@ ssl_verify_cb(int ok, X509_STORE_CTX * c
-+
+ 	    break;
-+
+ 	default:
-+
+ 	    debug(83, 1) ("SSL unknown certificate error %d in %s\n",
-+
+-		ctx->error, buffer);
-+
++		X509_STORE_CTX_get_error(ctx), buffer);
-+
+ 	    break;
-+
+ 	}
-+
+     }
-+
+@@ -446,19 +446,13 @@ sslCreateServerContext(const char *certf
-31
+     ERR_clear_error();
-32
+     debug(83, 1) ("Initialising SSL.\n");
-33
+     switch (version) {
-34
+-    case 2:
-35
+-	debug(83, 5) ("Using SSLv2.\n");
-36
+-	method = SSLv2_server_method();
-37
+-	break;
--
+     case 3:
--
+ 	debug(83, 5) ("Using SSLv3.\n");
--
+ 	method = SSLv3_server_method();
--
+@@ -459,6 +455,7 @@ sslCreateServerContext(const char *certf
-+
+-    case 3:
-+
+-	debug(83, 5) ("Using SSLv3.\n");
-+
+-	method = SSLv3_server_method();
-+
+-	break;
-+
+     case 4:
-+
+ 	debug(83, 5) ("Using TLSv1.\n");
-44
+ 	method = TLSv1_server_method();
-45
+ 	break;
-46
+     case 1:
-47
++    case 2:
-+
++    case 3:
-49
+     default:
-50
+ 	debug(83, 5) ("Using SSLv2/SSLv3.\n");
-51
+ 	method = SSLv23_server_method();
--
+@@ -609,10 +606,6 @@ sslCreateClientContext(const char *certf
-+
+@@ -609,19 +603,13 @@ sslCreateClientContext(const char *certf
-53
+     ERR_clear_error();
-54
+     debug(83, 1) ("Initialising SSL.\n");
-55
+     switch (version) {
-56
+-    case 2:
-57
+-	debug(83, 5) ("Using SSLv2.\n");
-58
+-	method = SSLv2_client_method();
-59
+-	break;
--
+     case 3:
--
+ 	debug(83, 5) ("Using SSLv3.\n");
--
+ 	method = SSLv3_client_method();
--
+@@ -622,6 +615,7 @@ sslCreateClientContext(const char *certf
-+
+-    case 3:
-+
+-	debug(83, 5) ("Using SSLv3.\n");
-+
+-	method = SSLv3_client_method();
-+
+-	break;
-+
+     case 4:
-+
+ 	debug(83, 5) ("Using TLSv1.\n");
-66
+ 	method = TLSv1_client_method();
-67
+ 	break;
-68
+     case 1:
-69
++    case 2:
-+
++    case 3:
-71
+     default:
-72
+ 	debug(83, 5) ("Using SSLv2/SSLv3.\n");
-73
+ 	method = SSLv23_client_method();

casa-mp-base

Commits

Jira Issues

Add shortcut