-
Notifications
You must be signed in to change notification settings - Fork 554
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
KeysInUse: re-introduce package back to 2.0. (#3531)
- Loading branch information
Showing
11 changed files
with
194 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "Signatures": { | ||
| "KeysInUse-OpenSSL-0.3.1.tar.gz": "aff345b0d3b699fd4d0e8eeda67bdf4bdec04d1f2d409bf1bf6098a263ecab64" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| Summary: The KeysInUse Engine for OpenSSL allows the logging of private key usage through OpenSSL | ||
| Name: KeysInUse-OpenSSL | ||
| Version: 0.3.1 | ||
| Release: 1%{?dist} | ||
| License: MIT | ||
| Vendor: Microsoft Corporation | ||
| Distribution: Mariner | ||
| Group: System/Libraries | ||
| URL: https://github.com/microsoft/KeysInUse-OpenSSL | ||
| #Source0: https://github.com/microsoft/KeysInUse-OpenSSL/archive/v%{version}.tar.gz | ||
| Source0: %{name}-%{version}.tar.gz | ||
| BuildRequires: cmake | ||
| BuildRequires: gcc | ||
| BuildRequires: golang >= 1.16.6 | ||
| BuildRequires: make | ||
| BuildRequires: openssl-devel | ||
| Requires: openssl < 1.1.2 | ||
| Requires: openssl >= 1.1.1 | ||
|
|
||
| %description | ||
| The KeysInUse Engine for OpenSSL allows the logging of private key usage through OpenSSL | ||
|
|
||
| %prep | ||
| %setup -q | ||
|
|
||
| %build | ||
| export GO111MODULE=off | ||
|
|
||
| cmake -DCMAKE_TOOLCHAIN_FILE=./cmake-toolchains/linux-amd64-glibc.cmake -H./ -B./build | ||
| cmake --build ./build --target keysinuse | ||
|
|
||
| cd ./packaging/util | ||
| make $(realpath ../../bin/keysinuseutil) | ||
|
|
||
| %define keysinuse_dir %{buildroot}/%{_libdir}/keysinuse/ | ||
|
|
||
| %install | ||
| mkdir -p %{keysinuse_dir} | ||
| mkdir -p %{buildroot}%{_bindir}/ | ||
|
|
||
| install -m 0644 ./bin/keysinuse.so %{keysinuse_dir} | ||
| install -m 0744 ./bin/keysinuseutil %{buildroot}%{_bindir}/ | ||
|
|
||
| %files | ||
| %license LICENSE | ||
| %{_libdir}/keysinuse/keysinuse.so | ||
| %{_bindir}/keysinuseutil | ||
|
|
||
| %pre | ||
| if [ -x %{_bindir}/keysinuseutil ]; then | ||
| echo "Disabling version $2 of keysinuse engine for OpenSSL" | ||
| %{_bindir}/keysinuseutil uninstall || echo "Failed to deconfigure old version" | ||
| fi | ||
|
|
||
| %post | ||
| if [ ! -e %{_var}/log/keysinuse ]; then | ||
| mkdir %{_var}/log/keysinuse | ||
| fi | ||
| chown root:root %{_var}/log/keysinuse | ||
| chmod 1733 %{_var}/log/keysinuse | ||
|
|
||
| ln -s %{_lib}/keysinuse/keysinuse.so $(%{_bindir}/openssl version -e | awk '{gsub(/"/, "", $2); print $2}')/keysinuse.so | ||
|
|
||
| if [ -x %{_bindir}/keysinuseutil ]; then | ||
| echo "Enabling keysinuse engine for OpenSSL" | ||
| %{_bindir}/keysinuseutil install || echo "Configuring engine failed" | ||
| fi | ||
|
|
||
| %preun | ||
| if [ -x %{_bindir}/keysinuseutil ]; then | ||
| echo "Disabling keysinuse engine for OpenSSL" | ||
| %{_bindir}/keysinuseutil uninstall || echo "Deconfiguring keysinuse engine failed" | ||
| fi | ||
| with | ||
| engine_link=$(%{_bindir}/openssl version -e | awk '{gsub(/"/, "", $2); print $2}')/keysinuse.so | ||
| if [ -e $engine_link ]; then | ||
| rm $engine_link | ||
| fi | ||
|
|
||
| %changelog | ||
| * Fri Jun 17 2022 Maxwell Moyer-McKee <[email protected]> - 0.3.1-1 | ||
| - Original version for CBL-Mariner | ||
| - Verified license |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ | |
| Summary: Utilities from the general purpose cryptography library with TLS implementation | ||
| Name: openssl | ||
| Version: 1.1.1k | ||
| Release: 19%{?dist} | ||
| Release: 20%{?dist} | ||
| License: OpenSSL | ||
| Vendor: Microsoft Corporation | ||
| Distribution: Mariner | ||
|
|
@@ -42,7 +42,7 @@ Patch18: openssl-1.1.1-fips-curves.patch | |
| Patch19: openssl-1.1.1-sp80056arev3.patch | ||
| Patch20: openssl-1.1.1-jitterentropy.patch | ||
| Patch21: openssl-1.1.1-drbg-seed.patch | ||
| Patch22: openssl-1.1.1-fips-SymCrypt.patch | ||
| Patch22: openssl-1.1.1-load-default-engines.patch | ||
| Patch23: CVE-2021-3711.patch | ||
| Patch24: CVE-2021-3712.patch | ||
| Patch25: CVE-2022-0778.patch | ||
|
|
@@ -339,6 +339,9 @@ rm -f %{buildroot}%{_sysconfdir}/pki/tls/ct_log_list.cnf.dist | |
| %postun libs -p /sbin/ldconfig | ||
|
|
||
| %changelog | ||
| * Mon Aug 15 2022 Pawel Winogrodzki <[email protected]> - 1.1.1k-20 | ||
| - Bumping "Release" to sync spec versions across branches. | ||
|
|
||
| * Wed Jul 13 2022 Maxwell Moyer-McKee <[email protected]> - 1.1.1k-19 | ||
| - Removed portion of load-default-engines test causing unit test failure | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters