From owner-svn-ports-head@freebsd.org Tue Dec 24 21:30:57 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9F8571C96F3; Tue, 24 Dec 2019 21:30:57 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47j8Xd3qvvz4Ddh; Tue, 24 Dec 2019 21:30:57 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7EEC5648F; Tue, 24 Dec 2019 21:30:57 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBOLUvav014979; Tue, 24 Dec 2019 21:30:57 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBOLUvjL014977; Tue, 24 Dec 2019 21:30:57 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201912242130.xBOLUvjL014977@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Tue, 24 Dec 2019 21:30:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520819 - in head/mail/sendmail: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dinoex X-SVN-Commit-Paths: in head/mail/sendmail: . files X-SVN-Commit-Revision: 520819 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Dec 2019 21:30:57 -0000 Author: dinoex Date: Tue Dec 24 21:30:56 2019 New Revision: 520819 URL: https://svnweb.freebsd.org/changeset/ports/520819 Log: - fix RSA_generate_key PR: 242862 Submitted by: Dan Lukes Modified: head/mail/sendmail/Makefile head/mail/sendmail/files/patch-tls.c Modified: head/mail/sendmail/Makefile ============================================================================== --- head/mail/sendmail/Makefile Tue Dec 24 20:44:55 2019 (r520818) +++ head/mail/sendmail/Makefile Tue Dec 24 21:30:56 2019 (r520819) @@ -2,7 +2,7 @@ PORTNAME= sendmail PORTVERSION= 8.15.2 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ DISTNAME= ${PORTNAME}.${PORTVERSION} Modified: head/mail/sendmail/files/patch-tls.c ============================================================================== --- head/mail/sendmail/files/patch-tls.c Tue Dec 24 20:44:55 2019 (r520818) +++ head/mail/sendmail/files/patch-tls.c Tue Dec 24 21:30:56 2019 (r520819) @@ -1,6 +1,6 @@ --- sendmail/tls.c.orig 2015-06-20 01:37:28 UTC +++ sendmail/tls.c -@@ -16,6 +16,9 @@ SM_RCSID("@(#)$Id: tls.c,v 8.127 2013-11 +@@ -16,6 +16,9 @@ SM_RCSID("@(#)$Id: tls.c,v 8.127 2013-11-27 02:51:11 g # include # include # include @@ -10,7 +10,7 @@ # ifndef HASURANDOMDEV # include # endif /* ! HASURANDOMDEV */ -@@ -44,6 +47,23 @@ static bool tls_safe_f __P((char *, long +@@ -44,6 +47,23 @@ static bool tls_safe_f __P((char *, long, bool)); static int tls_verify_log __P((int, X509_STORE_CTX *, const char *)); # if !NO_DH @@ -76,7 +76,7 @@ } return(dh); } -@@ -708,6 +733,30 @@ load_certkey(ssl, srv, certfile, keyfile +@@ -708,6 +733,29 @@ load_certkey(ssl, srv, certfile, keyfile) static char server_session_id_context[] = "sendmail8"; @@ -97,7 +97,6 @@ + RSA_free(rsa); + rsa = NULL; + } -+ return NULL; + } + BN_free(bn_rsa_r4); + return rsa; @@ -107,7 +106,7 @@ /* 0.9.8a and b have a problem with SSL_OP_TLS_BLOCK_PADDING_BUG */ #if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) # define SM_SSL_OP_TLS_BLOCK_PADDING_BUG 1 -@@ -926,7 +975,7 @@ inittls(ctx, req, options, srv, certfile +@@ -926,7 +974,7 @@ inittls(ctx, req, options, srv, certfile, keyfile, cac { /* get a pointer to the current certificate validation store */ store = SSL_CTX_get_cert_store(*ctx); /* does not fail */ @@ -116,7 +115,7 @@ if (crl_file != NULL) { if (BIO_read_filename(crl_file, CRLFile) >= 0) -@@ -1003,8 +1052,7 @@ inittls(ctx, req, options, srv, certfile +@@ -1003,8 +1051,7 @@ inittls(ctx, req, options, srv, certfile, keyfile, cac if (bitset(TLS_I_RSA_TMP, req) # if SM_CONF_SHM && ShmId != SM_SHM_NO_ID && @@ -126,7 +125,7 @@ # else /* SM_CONF_SHM */ && 0 /* no shared memory: no need to generate key now */ # endif /* SM_CONF_SHM */ -@@ -1209,9 +1257,10 @@ inittls(ctx, req, options, srv, certfile +@@ -1209,9 +1256,10 @@ inittls(ctx, req, options, srv, certfile, keyfile, cac if (tTd(96, 2)) sm_dprintf("inittls: Generating %d bit DH parameters\n", bits); @@ -139,7 +138,7 @@ dh = DSA_dup_DH(dsa); DSA_free(dsa); } -@@ -1744,7 +1793,7 @@ tmp_rsa_key(s, export, keylength) +@@ -1744,7 +1792,7 @@ tmp_rsa_key(s, export, keylength) if (rsa_tmp != NULL) RSA_free(rsa_tmp); @@ -148,7 +147,7 @@ if (rsa_tmp == NULL) { if (LogLevel > 0) -@@ -1971,9 +2020,9 @@ x509_verify_cb(ok, ctx) +@@ -1971,9 +2019,9 @@ x509_verify_cb(ok, ctx) { if (LogLevel > 13) tls_verify_log(ok, ctx, "x509");