From owner-svn-src-head@freebsd.org Thu Feb 27 22:36:17 2020 Return-Path: Delivered-To: svn-src-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 9BE76251B07; Thu, 27 Feb 2020 22:36:17 +0000 (UTC) (envelope-from jkim@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 48T6w124d5z449l; Thu, 27 Feb 2020 22:36:17 +0000 (UTC) (envelope-from jkim@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 0E03F1FFC5; Thu, 27 Feb 2020 22:36:17 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01RMaGQf049094; Thu, 27 Feb 2020 22:36:16 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01RMaGup049093; Thu, 27 Feb 2020 22:36:16 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <202002272236.01RMaGup049093@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 27 Feb 2020 22:36:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358412 - head/contrib/sendmail/src X-SVN-Group: head X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: head/contrib/sendmail/src X-SVN-Commit-Revision: 358412 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Feb 2020 22:36:17 -0000 Author: jkim Date: Thu Feb 27 22:36:16 2020 New Revision: 358412 URL: https://svnweb.freebsd.org/changeset/base/358412 Log: Do not free p and g parameters after calling DH_set0_pqg(3). It is specifically mentioned in the manual page. Note it has no functional change in reality because DH_set0_pqg() cannot fail when both p and g are not NULL. Modified: head/contrib/sendmail/src/tls.c Modified: head/contrib/sendmail/src/tls.c ============================================================================== --- head/contrib/sendmail/src/tls.c Thu Feb 27 22:02:00 2020 (r358411) +++ head/contrib/sendmail/src/tls.c Thu Feb 27 22:36:16 2020 (r358412) @@ -83,20 +83,24 @@ static unsigned char dh512_g[] = static DH * get_dh512() { - DH *dh = NULL; + DH *dh; BIGNUM *dhp_bn, *dhg_bn; if ((dh = DH_new()) == NULL) return NULL; dhp_bn = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL); dhg_bn = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL); - if ((dhp_bn == NULL) || (dhg_bn == NULL) || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) + if ((dhp_bn == NULL) || (dhg_bn == NULL)) { - DH_free(dh); BN_free(dhp_bn); BN_free(dhg_bn); return NULL; } + if (!DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) + { + DH_free(dh); + return NULL; + } return dh; } @@ -149,11 +153,15 @@ get_dh2048() return NULL; dhp_bn = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL); dhg_bn = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL); - if ((dhp_bn == NULL) || (dhg_bn == NULL) || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) + if ((dhp_bn == NULL) || (dhg_bn == NULL)) { - DH_free(dh); BN_free(dhp_bn); BN_free(dhg_bn); + return NULL; + } + if (!DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) + { + DH_free(dh); return NULL; } return dh;