This allows one to build sockat with no SSLv3 support in libssl.  There
already are #ifdef guards for those function but they aren't enough.

ok?

Index: patches/patch-sslcls_c
===================================================================
RCS file: /cvs/ports/net/socat/patches/patch-sslcls_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-sslcls_c
--- patches/patch-sslcls_c      13 Apr 2015 14:43:28 -0000      1.3
+++ patches/patch-sslcls_c      19 Jul 2015 01:43:21 -0000
@@ -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) {
+--- sslcls.c.orig      Sat Jan 24 03:15:22 2015
++++ sslcls.c   Sat Jul 18 19:15:57 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_client_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/1
  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 */
  


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to