Received: by mail.netbsd.org (Postfix, from userid 605) id 96C8284DD3; Wed, 8 Apr 2020 16:22:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1DC6884D7E for ; Wed, 8 Apr 2020 16:22:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id hBKHcp_qZyqG for ; Wed, 8 Apr 2020 16:22:00 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9C23484D32 for ; Wed, 8 Apr 2020 16:22:00 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8E65DFB27; Wed, 8 Apr 2020 16:22:00 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1586362920206440" MIME-Version: 1.0 Date: Wed, 8 Apr 2020 16:22:00 +0000 From: "Olaf Seibert" Subject: CVS commit: pkgsrc/comms/kermit/patches To: pkgsrc-changes@NetBSD.org Reply-To: rhialto@netbsd.org X-Mailer: log_accum Message-Id: <20200408162200.8E65DFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1586362920206440 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1586362920206440 Content-Disposition: inline Content-Length: 1631 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 + ); + } --_----------=_1586362920206440--