Cope with upcoming SSLv3 removal.

Input from and ok sthen@, ok nigel@ (maintainer)
This commit is contained in:
jca 2015-07-20 01:12:09 +00:00
parent 25dc989e82
commit 905039baab

View File

@ -1,7 +1,33 @@
$OpenBSD: patch-sslcls_c,v 1.3 2015/04/13 14:43:28 jasper Exp $
--- sslcls.c.orig Sat Jan 24 11:15:22 2015
+++ sslcls.c Mon Apr 13 14:58:09 2015
@@ -331,14 +331,6 @@ void sycSSL_free(SSL *ssl) {
$OpenBSD: patch-sslcls_c,v 1.4 2015/07/20 01:12:09 jca Exp $
--- sslcls.c.orig Sat Jan 24 03:15:22 2015
+++ sslcls.c Sat Jul 18 20:01:59 2015
@@ -55,6 +55,7 @@ const SSL_METHOD *sycSSLv2_server_method(void) {
}
#endif
+#ifdef HAVE_SSLv3_client_method
const SSL_METHOD *sycSSLv3_client_method(void) {
const SSL_METHOD *result;
Debug("SSLv3_client_method()");
@@ -62,7 +63,9 @@ const SSL_METHOD *sycSSLv3_client_method(void) {
Debug1("SSLv3_client_method() -> %p", result);
return result;
}
+#endif
+#ifdef HAVE_SSLv3_server_method
const SSL_METHOD *sycSSLv3_server_method(void) {
const SSL_METHOD *result;
Debug("SSLv3_server_method()");
@@ -70,6 +73,7 @@ const SSL_METHOD *sycSSLv3_server_method(void) {
Debug1("SSLv3_server_method() -> %p", result);
return result;
}
+#endif
const SSL_METHOD *sycSSLv23_client_method(void) {
const SSL_METHOD *result;
@@ -331,14 +335,6 @@ void sycSSL_free(SSL *ssl) {
return;
}
@ -16,7 +42,7 @@ $OpenBSD: patch-sslcls_c,v 1.3 2015/04/13 14:43:28 jasper Exp $
DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) {
DH *result;
Debug4("PEM_read_bio_DHparams(%p, %p, %p, %p)",
@@ -375,7 +367,7 @@ int sycFIPS_mode_set(int onoff) {
@@ -375,7 +371,7 @@ int sycFIPS_mode_set(int onoff) {
}
#endif /* WITH_FIPS */