From 68df4ac0d299dd20a21837e87a00a1c0c8b3e75d Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Fri, 26 Aug 2022 02:56:56 -0400 Subject: [PATCH] Update to new 1.6.4 release --- .gitignore | 1 + crypto-Handle-EVP-changes-in-OpenSSL-3.patch | 35 -------------------- mod_auth_gssapi.spec | 4 +-- sources | 2 +- 4 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 crypto-Handle-EVP-changes-in-OpenSSL-3.patch diff --git a/.gitignore b/.gitignore index 4717a2b..fa22197 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /mod_auth_gssapi-1.6.1.tar.gz /mod_auth_gssapi-1.6.2.tar.gz /mod_auth_gssapi-1.6.3.tar.gz +/mod_auth_gssapi-1.6.4.tar.gz diff --git a/crypto-Handle-EVP-changes-in-OpenSSL-3.patch b/crypto-Handle-EVP-changes-in-OpenSSL-3.patch deleted file mode 100644 index 385575e..0000000 --- a/crypto-Handle-EVP-changes-in-OpenSSL-3.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 915a3d7fca3beefadd751562abe2d481354a2a9c Mon Sep 17 00:00:00 2001 -From: Robbie Harwood -Date: Tue, 24 Aug 2021 15:04:13 -0400 -Subject: [PATCH] crypto: Handle EVP changes in OpenSSL 3 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -OpenSSL 3 changes the padding behavior of EVP_DecryptFinal_ex(), which -causes our decryption to fail. It is the opnion of the OpenSSL -developers that mod_auth_gssapi's use of this function was incorrect. - -Patch suggested by Tomáš Mráz. - -Related: https://github.com/openssl/openssl/issues/16351 - -Signed-off-by: Robbie Harwood -(cherry picked from commit 06d1f7d36d2455747e6e8231d28e6524ea1181f1) ---- - src/crypto.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/crypto.c b/src/crypto.c -index 3f372a0..b3f7fd9 100644 ---- a/src/crypto.c -+++ b/src/crypto.c -@@ -262,7 +262,7 @@ apr_status_t UNSEAL_BUFFER(apr_pool_t *p, struct seal_key *skey, - - totlen += outlen; - outlen = plain->length - totlen; -- ret = EVP_DecryptFinal_ex(ctx, plain->value, &outlen); -+ ret = EVP_DecryptFinal_ex(ctx, plain->value + totlen, &outlen); - if (ret == 0) goto done; - - totlen += outlen; diff --git a/mod_auth_gssapi.spec b/mod_auth_gssapi.spec index d569b51..fd83226 100644 --- a/mod_auth_gssapi.spec +++ b/mod_auth_gssapi.spec @@ -1,5 +1,5 @@ Name: mod_auth_gssapi -Version: 1.6.3 +Version: 1.6.4 Release: %autorelease Summary: A GSSAPI Authentication module for Apache @@ -7,8 +7,6 @@ License: MIT URL: https://github.com/gssapi/mod_auth_gssapi Source0: https://github.com/gssapi/%{name}/releases/download/v%{version}/%name-%{version}.tar.gz -Patch0: crypto-Handle-EVP-changes-in-OpenSSL-3.patch - BuildRequires: httpd-devel, krb5-devel, openssl-devel BuildRequires: autoconf, automake, libtool, bison, flex, make BuildRequires: git diff --git a/sources b/sources index 78e772c..9721c0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mod_auth_gssapi-1.6.3.tar.gz) = 37ac1931c5be962e025bcc71eba377947b5b79bc270c384c0a03b2fb1ecfdefcad5f07b4d1f9dc3c7e2dfefa7f6ee4167cf6df6c1b8c0f24267afae55bfe29d5 +SHA512 (mod_auth_gssapi-1.6.4.tar.gz) = 9e608319daf8303112615781cec6ad897586b0c03c264e70f3bfd44083902d0cdbfe19ff063559f4b3680b81d77e8f9d01cd340ca672ca20057dde510712485d