From nobody Wed Jun 26 23:51:58 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 4W8dlg0zVSz5QV5k; Wed, 26 Jun 2024 23:51:59 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8dlf56JTz4d5F; Wed, 26 Jun 2024 23:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719445918; 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=wTvfRFWvcN562bCVPurPQc4K5bWq1ufLpmkdKusnpDU=; b=KxQ5iWk5IXsuCJmwJ1/4ATTvOlp+6TYarg3HJDkUYzum5osXFE37xD1Tju3Cyoa3fKLh1b sdocCrLYd+yiFoHgCJCUnwlRY9P69fPBVlH/UQZQvJ2Bc8EYP5cawBlRrV6uOvVcG3grSb nKd5dRjyr4mIgznsH/rmh7otb9Hbsvz0J1DB8MW9iqbdRVFjYbLHVIEed08P9FsCdAG5v9 UT94psRZB0pFZjM6YBwYuOg7uoMhbziqToY0xvtP6EVJVatLkPpw2Bjv0L9j7n8kPNeLRX 3Hk5k8y7YfanEWgcN/7T2Dh5MnlPsQfqm/9kxqyqVUrVhfzGTIhs9v5K+FcFvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719445918; a=rsa-sha256; cv=none; b=Ic5iMfQqQaknV5mdSBfw450A6p915BKhNTnUH7k/ADSrQk1I3VHXfdBPzQH/xdWMMPd1UR traP4N4XbAGDVSQ4dFh024M2rBaWQzWOQSGFFtkaReBozI1wAqidh/dtGhM5b6mbpgh4XL 4TW1wrPOnheq2rF4J++GW/8crUG6uPB1ZuAlK3qXyhQvnPao3B5IOA7paClgBx0gUGJaNm 72tRe7y0zTomHSJNazuLiriLnkwEawrlPlGompZCd6UKKSPLC4RzuK0kDgICNmSPLrdW1U 8gnJRl0eXilGkw99HK2s5oRgy7fDfyYe5WH+Y+1peP+jxE2wXwwtWOAtvzfkEg== 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=1719445918; 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=wTvfRFWvcN562bCVPurPQc4K5bWq1ufLpmkdKusnpDU=; b=fLKZayzNeJdtz6hawu1TDNpJh4khIoGfx3s13d3q5SR7iaIJz2kYBjBU9U3n4jToLqiuDv nGgKXWUl+izfnKnB4Loo9g0ZUvuxiCRGCHpXO1cvkuvqZuch7X3phq8M7OJNtCx7uf355E Bsv31ko6UR9ej7lzcCq/bw+XDCdUjfRD2Z5S2bH7/y48/6d3raOLutRiG3ZW7Y4XQngVJk xwLfnoOGzaDZZAfTYt7yZEkn5csz5d24GuvYVzm1wqzGSpTm+Ff0akCigriLCnseOG0Fx7 0LP/l5bbBgb3tTccZIKil7ScEfH6ehwY9zhdKgau5bOI+QDIoHjxsp3Jz8lKKQ== 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 4W8dlf4NhSz150T; Wed, 26 Jun 2024 23:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45QNpwep094382; Wed, 26 Jun 2024 23:51:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45QNpwot094379; Wed, 26 Jun 2024 23:51:58 GMT (envelope-from git) Date: Wed, 26 Jun 2024 23:51:58 GMT Message-Id: <202406262351.45QNpwot094379@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: 303596eac3f5 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 303596eac3f5a7fed63f1084028d811919d37eaf Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=303596eac3f5a7fed63f1084028d811919d37eaf commit 303596eac3f5a7fed63f1084028d811919d37eaf Author: Enji Cooper AuthorDate: 2024-06-26 23:41:47 +0000 Commit: Enji Cooper CommitDate: 2024-06-26 23:51:25 +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 --- 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