Skip to content

Commit

Permalink
openssl: Update upgrade instructions.
Browse files Browse the repository at this point in the history
Update download locations.
Remove references to FREEBSD-Xlist.
Remove reference to the fips module that has been removed.
  • Loading branch information
tetlowgm committed Sep 7, 2024
1 parent a700bef commit 4086a06
Showing 1 changed file with 6 additions and 14 deletions.
20 changes: 6 additions & 14 deletions crypto/openssl/FREEBSD-upgrade
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@
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:

$ gpg --verify ../openssl-X.Y.Z.tar.gz.asc ../openssl-X.Y.Z.tar.gz

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:

Expand Down Expand Up @@ -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.

0 comments on commit 4086a06

Please sign in to comment.