From nobody Sat Jun 29 20:29:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WBP6f1jm8z5Pjqq; Sat, 29 Jun 2024 20:29:30 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WBP6d5PY7z4GF7; Sat, 29 Jun 2024 20:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719692969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4s4liQpeD1Pwu+9i37h07UcB2fl1HZIHzHUGJBsuvmc=; b=kt7QJFMP7zFAbjrJBcmOngJmKet9O+B+wx+2FuOki/qty+gU4QLQJXT7FL1Bo5rynq153U qldrlZ0tMJ3YMg3q6BI+btmWZaHnOGAHXJBbjSIZSMF1H8sVwilvElJkff+r1rz6Jea1xt KTKmcb9YkVEAdGLP24x7FG4aX4mISWynLhQebRvwxaYWUDGSalLZXvQOFgr6Nb/eKnUc6A Th4I4ZUzG0l+9RqKT1fYT1C1Hw/JBGpjBVOjhPjIyXbxSf0HUv6ZzTlt4M6I8beKa+/0cA LBcdKogu68sQYYqjPU3UR+AZpnyR84HbLCKVe0NbKq5lHY1lW0kvoAlAXln9tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719692969; a=rsa-sha256; cv=none; b=c1GhyeMs248ZpFQ2gr7sekXocbSSwwux4WVll86UTtMD7xM7lt5LPU6IyUzpORik66H97t 7m6nI6KKEz3J+k/ZEHXXeHmIjQSVjt5LGwqUsUkMUWX7Je3Ne/3bEWdSuxX9gMeLpGL4N8 cMnd9D+Tb9e0QS5v4k2OjesYgz5CAcBmNSh7y+z3v5P1VntGBPzf04I31rtiBj9lwV5MSV 4wnDt7H9bwW8ave0fkmW0qABWF6dRWRZkKw1RORql1DMzAodCrqzXjCEA5XsWc4bklKfTD Pz05zXA+u3ZUVLONKHJmhXYuMrPvNPWWbCP2397hmDSD1sb7hfQjtNuTf3Tywg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719692969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4s4liQpeD1Pwu+9i37h07UcB2fl1HZIHzHUGJBsuvmc=; b=jtHAIW9MRIlGafiUtwjxXsvbpo0SGxZnwPFnJPaoU8cwNqFU6YajSWQUnnRokEepK+EoRE ZyFeRjqmFJfPstaiNsAOg0G97JH8J1kU+umyWwidCbsv859KzlF/8oEQEGKXOm9PigZK4a HIBboLq70y5H83i+XS898W8KIVf0akGbiyxKnX8aF9XeuyIiyuDfXF2XTorJcVFYX0iv7n gxN6nNu96W+tg0Zgvq4TMOo65TYExgWBBAfi381N0qimKcY2XA6dUC2i9EXRNBTpYiLnEH O22h0X1EPdmj3cs1Z19MQzreMs9cteYcrw0hZnWmtdTEtmqFuRtW5ToKD30iSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WBP6d3npyzsvY; Sat, 29 Jun 2024 20:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 45TKTTOt034267; Sat, 29 Jun 2024 20:29:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 45TKTTU8034264; Sat, 29 Jun 2024 20:29:29 GMT (envelope-from git) Date: Sat, 29 Jun 2024 20:29:29 GMT Message-Id: <202406292029.45TKTTU8034264@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: dd43e907c7c0 - stable/14 - Update config/build info for OpenSSL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dd43e907c7c0caec8867e42fa1fcfea4ac4c87f6 Auto-Submitted: auto-generated The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=dd43e907c7c0caec8867e42fa1fcfea4ac4c87f6 commit dd43e907c7c0caec8867e42fa1fcfea4ac4c87f6 Author: Enji Cooper AuthorDate: 2024-06-26 23:41:47 +0000 Commit: Enji Cooper CommitDate: 2024-06-29 20:29:19 +0000 Update config/build info for OpenSSL This is a companion commit to the OpenSSL 3.0.14 update. MFC after: 3 days MFC with: 44096ebd22ddd0081a357011714eff8963614b65 (cherry picked from commit 303596eac3f5a7fed63f1084028d811919d37eaf) --- crypto/openssl/include/openssl/opensslv.h | 10 +++++----- secure/lib/libcrypto/Makefile.inc | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crypto/openssl/include/openssl/opensslv.h b/crypto/openssl/include/openssl/opensslv.h index 012d77ee8bd0..537144b32e97 100644 --- a/crypto/openssl/include/openssl/opensslv.h +++ b/crypto/openssl/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 13 +# define OPENSSL_VERSION_PATCH 14 /* * Additional version information @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.13" -# define OPENSSL_FULL_VERSION_STR "3.0.13" +# define OPENSSL_VERSION_STR "3.0.14" +# define OPENSSL_FULL_VERSION_STR "3.0.14" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 Jan 2024" +# define OPENSSL_RELEASE_DATE "4 Jun 2024" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13 30 Jan 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.14 4 Jun 2024" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index de24bfb1038a..d95f08e27256 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -2,8 +2,8 @@ .include # OpenSSL version used for manual page generation -OPENSSL_VER= 3.0.13 -OPENSSL_DATE= 2024-02-02 +OPENSSL_VER= 3.0.14 +OPENSSL_DATE= 2024-06-04 LCRYPTO_SRC= ${SRCTOP}/crypto/openssl LCRYPTO_DOC= ${LCRYPTO_SRC}/doc