From nobody Sat Sep 07 23:45:20 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 4X1V8K1Jckz5V4wY; Sat, 07 Sep 2024 23:45:21 +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 4X1V8K0nSLz4P5X; Sat, 7 Sep 2024 23:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725752721; 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=MYCp34HEFux4vsV5H44OrEbvDAXU813a4c1WszQXWsM=; b=jTGoU03qXX1zDDWviN432fXOBidlz/gwIkoV/0FjJIHhvhpuTF4tARbP+fWL3xkiBhrcZD 2N/GGwrPNbAFOnYN6yc+pEf1qS2goPvpjhSGnujFv/SHpL1omWAu8Y32cV8PmIuh+2GDeo EL7yJyYWdsIw44ljTbMxY37cuAegMhsu3NTgMb0IVOJPF8idgsY4whPeZvdN/6Nmxazsyo IudZC16yBOOzw7kP7wrXym1L1pRcHZzjQW61wq1kigxPQPxe0+rjpr+IEmQy/suxw4Dg0t N2C3TCIZnXZ0RZqVkFxlpViAli0Ecfs/TpTrq3hGWR6rN4dM6Jmsue7zSjYyJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725752721; a=rsa-sha256; cv=none; b=JheKyHLXg5MPx2QK/0PnOL3+2QM7/MiZP/c+u/Yp+z1ghJN38kRmKDStXS6Ktk2h0ub5wE ne7Y+07LlIf0B221f6EEK46ZSNsMc3shupgueyLFvJLKemmjcOSuiBSVCXDIdcp4Q1N1ss 2207IP4C6Cft9GTrJ7Fn3UrtgFdU3NYcSrebLq9k+MkU20W5Ss+t/XHFCeg+RPNFhjJO/s 7JMwibWMThRY9ObjeiRSuJF4ZtV/MV6V9nyytGcdEiU9WXYS31jvrSk99qQEIY85121cE+ wF30HLQiBCNt26HJURQGFhgWihthz0ks6Ds+CJlw2J/wJFcnAhMfAsGSC99gzQ== 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=1725752721; 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=MYCp34HEFux4vsV5H44OrEbvDAXU813a4c1WszQXWsM=; b=bHav+dRN7QFMyl22vWPPghts3c71bBL0wKNcXrIsJkTYlbELHihzmUBapyKz/Y7beec1k3 MdQkq4NTdGRoixZBzQ1b5NFVxIMIc7nbCb7Ynr3dr4J/Frmdc+tZpFLF0rt6tyMKuQfP7j GLIyLBl3nJpEwFlhzDI3YDwFWWOX/14A9WyxgdzDLeUOEv6p1FlM+LltcMR7v/NqfnJCHF Tj1wv03YHvvvTkeR7UsTFaqKgSYxGTlLCkKLA96NUIDoE3nUDmBjw0TZC/FeQ0zvL0ijyR VK3avh44nxn4OEbj64LeieIpOrex1ryuMWjsV2gWdRvnvlBeCKI231w1c0tzAg== 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 4X1V8K0Nmpzwnl; Sat, 7 Sep 2024 23:45:21 +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 487NjK4Z094605; Sat, 7 Sep 2024 23:45:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 487NjKt0094602; Sat, 7 Sep 2024 23:45:20 GMT (envelope-from git) Date: Sat, 7 Sep 2024 23:45:20 GMT Message-Id: <202409072345.487NjKt0094602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Tetlow Subject: git: 4086a0635d38 - main - openssl: Update upgrade instructions. 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4086a0635d38d5e6ca29684c2ea2e927f8866e32 Auto-Submitted: auto-generated The branch main has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=4086a0635d38d5e6ca29684c2ea2e927f8866e32 commit 4086a0635d38d5e6ca29684c2ea2e927f8866e32 Author: Gordon Tetlow AuthorDate: 2024-09-07 23:45:05 +0000 Commit: Gordon Tetlow CommitDate: 2024-09-07 23:45:05 +0000 openssl: Update upgrade instructions. Update download locations. Remove references to FREEBSD-Xlist. Remove reference to the fips module that has been removed. --- crypto/openssl/FREEBSD-upgrade | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/crypto/openssl/FREEBSD-upgrade b/crypto/openssl/FREEBSD-upgrade index 76943efdbde6..ebe2d85bd8f7 100644 --- a/crypto/openssl/FREEBSD-upgrade +++ b/crypto/openssl/FREEBSD-upgrade @@ -9,14 +9,14 @@ 01) Switch to the vendor branch: $ cd src/freebsd/main - $ git worktree add ../vendor/openssl-X.Y freebsd/vendor/openssl-X.Y + $ git worktree add -b vendor/openssl-X.Y ../vendor/openssl-X.Y freebsd/vendor/openssl-X.Y $ cd ../vendor/openssl-X.Y 02) Download the latest OpenSSL tarball and signature from the official website (https://www.openssl.org/source/). - $ (cd .. && fetch https://openssl.org/source/openssl-X.Y.Z.tar.gz) - $ (cd .. && fetch https://openssl.org/source/openssl-X.Y.Z.tar.gz.asc) + $ (cd .. && fetch https://github.com/openssl/openssl/releases/download/openssl-3.0.15/openssl-3.0.15.tar.gz) + $ (cd .. && fetch https://github.com/openssl/openssl/releases/download/openssl-3.0.15/openssl-3.0.15.tar.gz.asc) 03) Verify the signature: @@ -24,11 +24,11 @@ 04) Unpack the OpenSSL tarball to the parent directory: - $ tar -x -X FREEBSD-Xlist -f ../openssl-X.Y.Z.tar.gz -C .. + $ tar xf ../openssl-X.Y.Z.tar.gz -C .. 05) Copy to the vendor branch: - $ rsync --exclude FREEBSD.* --delete -av ../openssl-X.Y.Z/* . + $ rsync --exclude .git --delete -av ../openssl-X.Y.Z/ . 06) Take care of added / deleted files: @@ -112,19 +112,11 @@ 16) Build and install world, reboot, test. -17) Test the legacy and fips providers as well: (here with "test" as the password) +17) Test the legacy provider as well: (here with "test" as the password) $ echo test | openssl rc4 -provider legacy -e -a -pbkdf2 enter RC4 encryption password: Verifying - enter RC4 encryption password: U2FsdGVkX1+JvhqxLMOvlxvTi1/h - # openssl fipsinstall -out /etc/ssl/fipsmodule.cnf -module /usr/lib/ossl-modules/fips.so - INSTALL PASSED - # vi /etc/ssl/openssl.cnf - [enable the FIPS module] - # echo test | openssl aes-256-cbc -provider fips -e -a -pbkdf2 - U2FsdGVkX19lTexiYsnMX83ZLSojBOFwv7GB0Plhgmw= - 18) Commit and hope you did not miss anything. -