diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2020-06-02 07:36:46 -0400 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2020-06-02 07:36:46 -0400 |
| commit | fc41eb3ddc9a0920c23174ef59d9a20cd6415e09 (patch) | |
| tree | 258f2c2d0491085ee0ee0fa5c986c4f07d07a0de /2920_sign-file-patch-for-libressl.patch | |
| parent | Linux patch 5.4.43 (diff) | |
| download | linux-patches-fc41eb3ddc9a0920c23174ef59d9a20cd6415e09.tar.gz linux-patches-fc41eb3ddc9a0920c23174ef59d9a20cd6415e09.tar.bz2 linux-patches-fc41eb3ddc9a0920c23174ef59d9a20cd6415e09.zip | |
sign-file: full functionality with modern LibreSSL
Bug: https://bugs.gentoo.org/717166
Signed-off-by: Mike Pagano <mpagano@gentoo.org>
Diffstat (limited to '2920_sign-file-patch-for-libressl.patch')
| -rw-r--r-- | 2920_sign-file-patch-for-libressl.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/2920_sign-file-patch-for-libressl.patch b/2920_sign-file-patch-for-libressl.patch new file mode 100644 index 00000000..e6ec017d --- /dev/null +++ b/2920_sign-file-patch-for-libressl.patch @@ -0,0 +1,16 @@ +--- a/scripts/sign-file.c 2020-05-20 18:47:21.282820662 -0400 ++++ b/scripts/sign-file.c 2020-05-20 18:48:37.991081899 -0400 +@@ -41,9 +41,10 @@ + * signing with anything other than SHA1 - so we're stuck with that if such is + * the case. + */ +-#if defined(LIBRESSL_VERSION_NUMBER) || \ +- OPENSSL_VERSION_NUMBER < 0x10000000L || \ +- defined(OPENSSL_NO_CMS) ++#if defined(OPENSSL_NO_CMS) || \ ++ ( defined(LIBRESSL_VERSION_NUMBER) \ ++ && (LIBRESSL_VERSION_NUMBER < 0x3010000fL) ) || \ ++ OPENSSL_VERSION_NUMBER < 0x10000000L + #define USE_PKCS7 + #endif + #ifndef USE_PKCS7 |