From nobody Sun Sep 08 04:36:12 2024 X-Original-To: dev-commits-src-main@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 4X1cbx0wcGz5Vr0C; Sun, 08 Sep 2024 04:36:13 +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 4X1cbw5DT2z44H1; Sun, 8 Sep 2024 04:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725770172; 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=sdkSQf5Sav8RGS7176qX99vNy9oVFSxYkq274vmqv+I=; b=hcu3oR6TuWnW6EpyiQjY+6EWyz84S66JuT3sMgw7iUkxHadQaq1fBJ/XWIUe5xL+wydhgt mIk2xUE8BK+WWRqXeZF8gQZKxsOsZa+eAlqJCUakqyGbkE+5cDP3rk3Aol29Vr/xjqeoUY 6lbqRO0hjJOiW9V+oGujRoxLrUGWMLgqZD02h5Riekyzi4hLBvL+/y7vvIzkMt4krBMNzQ iYeWYeGSqePCFprZUpi9UG5kzpPKLsDgrfuXJAF+eMFBs7FZMVuxLjdYnw3u/CgUPgp1Je tVk+k2SeQpUrKJFGLf18TgY9ifMNqPq5G6iPRzq5TZ2tBtdE4AEGFAIGbA6Orw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725770172; a=rsa-sha256; cv=none; b=PRcNHu6CkFrgZj0w2AC6y2cICForaHeV7865yoh85k2wjMq1KdB3rSGzsQUNnZGKc+16XD w6ZeWuEvytcJZVvGmB64sMbaYrazvF2EeaOTP97pcCQ3U9hOjRLSIUEY5IhnfC4T0bT6Ee 9saltWU3mGNGbJLC1HqnvgKXTqWlGb4tGC7Qs0QZI75ezYDKdSqoM8ejhDRcB8/5yZf78c ttH0PZT7xekz+ZSXt6HHvPCkzUiibIA5OGwLTEoy1YkeMzQPHncoiIA7kM5oaxpLVRh+zr 8Ya2N0BA+VlulK+68bAKXTCiRWunyQxCZCE310AJL3NergMR+/IbECJxQ1w8sw== 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=1725770172; 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=sdkSQf5Sav8RGS7176qX99vNy9oVFSxYkq274vmqv+I=; b=aoZooQptU+oZcINt8BSfpftvZirc0F0vaCGJI6C1+sBNBubbZ9bum5dkyeYyXzeVn9ieSl /ecg9UXdFSbiDt/rw/iQpcjdTnxYDXM3LNtr2GDirnEQsvQ7Ei/RNra53jkN1Crt7QwJzs nHvehLOf3mDxIno5cvf7OlVnKblZTUxjZR65dG0u9T/cWbRRY8ATVGgboz6RdOB8U+YSJQ TtwlPmuge/+THmZ/UfoyDq7eKjIlNUWzXznNbNd3PIdERd4jdQ9BIHzbYVElFN0E0ZQyEC 7hCLD77zQ4INyyI+IPQUcq/Ucro+RRFeF6nCOLtdwzhowY84DNNy8Lkgj+meRQ== 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 4X1cbw4XsSz14g1; Sun, 8 Sep 2024 04:36:12 +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 4884aCEl087013; Sun, 8 Sep 2024 04:36:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4884aCF7087010; Sun, 8 Sep 2024 04:36:12 GMT (envelope-from git) Date: Sun, 8 Sep 2024 04:36:12 GMT Message-Id: <202409080436.4884aCF7087010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: cc717b574d7f - main - Update config/build info for OpenSSL 3.0.15 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: cc717b574d7faa2e0b2de1a985076286cef74187 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=cc717b574d7faa2e0b2de1a985076286cef74187 commit cc717b574d7faa2e0b2de1a985076286cef74187 Author: Enji Cooper AuthorDate: 2024-09-08 04:34:18 +0000 Commit: Enji Cooper CommitDate: 2024-09-08 04:34:18 +0000 Update config/build info for OpenSSL 3.0.15 This is a companion commit to the OpenSSL 3.0.15 update. `opensslv.h` was regenerated via the following process: ``` cd crypto/openssl ./config git reset --hard gmake include/openssl/opensslv.h ``` `Makefile.inc` has been updated to match. MFC after: 1 week MFC with: a7148ab39c03abd4d1a84997c70bf96f15dd2a09 Differential Revision: https://reviews.freebsd.org/D46603 --- 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 537144b32e97..dd0aece423cd 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 14 +# define OPENSSL_VERSION_PATCH 15 /* * 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.14" -# define OPENSSL_FULL_VERSION_STR "3.0.14" +# define OPENSSL_VERSION_STR "3.0.15" +# define OPENSSL_FULL_VERSION_STR "3.0.15" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "4 Jun 2024" +# define OPENSSL_RELEASE_DATE "3 Sep 2024" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.14 4 Jun 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15 3 Sep 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 16a2c15bc962..e7072213d509 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -1,8 +1,8 @@ .include # OpenSSL version used for manual page generation -OPENSSL_VER= 3.0.14 -OPENSSL_DATE= 2024-06-04 +OPENSSL_VER= 3.0.15 +OPENSSL_DATE= 2024-09-03 LCRYPTO_SRC= ${SRCTOP}/crypto/openssl LCRYPTO_DOC= ${LCRYPTO_SRC}/doc