CVS commit: pkgsrc/comms/kermit/patches

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Wed Apr  8 16:22:00 UTC 2020

Added Files:
        pkgsrc/comms/kermit/patches: patch-ckcftp.c

Log Message:
comms/kermit: this patch should be added too.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/comms/kermit/patches/patch-ckcftp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: pkgsrc/comms/kermit/patches/patch-ckcftp.c
diff -u /dev/null pkgsrc/comms/kermit/patches/patch-ckcftp.c:1.1
--- /dev/null   Wed Apr  8 16:22:00 2020
+++ pkgsrc/comms/kermit/patches/patch-ckcftp.c  Wed Apr  8 16:22:00 2020
@@ -0,0 +1,31 @@
+$NetBSD: patch-ckcftp.c,v 1.1 2020/04/08 16:22:00 rhialto Exp $
+
+Use SSLv23_client_method() because it is version-flexible.
+The difference that Kermit makes between SSL and TLS is gone.
+
+--- ckcftp.c.orig      2011-07-14 18:17:30.000000000 +0200
++++ ckcftp.c   2020-04-06 17:01:35.943676852 +0200
+@@ -10196,19 +10196,19 @@
+ #define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS 0L
+ #endif
+     if (auth_type && !strcmp(auth_type,"TLS")) {
+-        ssl_ftp_ctx=SSL_CTX_new(SSLv3_client_method());
++        ssl_ftp_ctx=SSL_CTX_new(SSLv23_client_method());
+         if (!ssl_ftp_ctx)
+           return(0);
+         SSL_CTX_set_options(ssl_ftp_ctx,
+                             SSL_OP_SINGLE_DH_USE|SSL_OP_EPHEMERAL_RSA
+                             );
+     } else {
+-        ssl_ftp_ctx = SSL_CTX_new(ftp_bug_use_ssl_v2 ? SSLv23_client_method() : 
+-                                  SSLv3_client_method());
++        ssl_ftp_ctx = SSL_CTX_new(SSLv23_client_method());
+         if (!ssl_ftp_ctx)
+           return(0);
+         SSL_CTX_set_options(ssl_ftp_ctx,
+-                            (ftp_bug_use_ssl_v2 ? 0 : SSL_OP_NO_SSLv2)|
++                            
++                            (ftp_bug_use_ssl_v2 ? 0 : SSL_OP_NO_SSLv2/*|SSL_OP_NO_SSLv3*/)|
+                             SSL_OP_SINGLE_DH_USE|SSL_OP_EPHEMERAL_RSA
+                             );
+     }