Accepting request 1165438 from home:alarrosa:branches:network2
Forward a fix for a patch from SLE - Rebase openssh-7.7p1-fips.patch (bsc#1221928) Remove OPENSSL_HAVE_EVPGCM-ifdef, which is no longer supported by upstream OBS-URL: https://build.opensuse.org/request/show/1165438 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=258
This commit is contained in:
parent
c133b2d567
commit
2399b4e4c2
@ -39,7 +39,7 @@ Index: openssh-9.6p1/cipher.c
|
|||||||
#ifdef WITH_OPENSSL
|
#ifdef WITH_OPENSSL
|
||||||
#ifndef OPENSSL_NO_DES
|
#ifndef OPENSSL_NO_DES
|
||||||
{ "3des-cbc", 8, 24, 0, 0, CFLAG_CBC, EVP_des_ede3_cbc },
|
{ "3des-cbc", 8, 24, 0, 0, CFLAG_CBC, EVP_des_ede3_cbc },
|
||||||
@@ -110,8 +113,52 @@ static const struct sshcipher ciphers[]
|
@@ -110,8 +113,50 @@ static const struct sshcipher ciphers[]
|
||||||
{ NULL, 0, 0, 0, 0, 0, NULL }
|
{ NULL, 0, 0, 0, 0, 0, NULL }
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -53,12 +53,10 @@ Index: openssh-9.6p1/cipher.c
|
|||||||
+ { "aes128-ctr", 16, 16, 0, 0, 0, EVP_aes_128_ctr },
|
+ { "aes128-ctr", 16, 16, 0, 0, 0, EVP_aes_128_ctr },
|
||||||
+ { "aes192-ctr", 16, 24, 0, 0, 0, EVP_aes_192_ctr },
|
+ { "aes192-ctr", 16, 24, 0, 0, 0, EVP_aes_192_ctr },
|
||||||
+ { "aes256-ctr", 16, 32, 0, 0, 0, EVP_aes_256_ctr },
|
+ { "aes256-ctr", 16, 32, 0, 0, 0, EVP_aes_256_ctr },
|
||||||
+# ifdef OPENSSL_HAVE_EVPGCM
|
|
||||||
+ { "aes128-gcm@openssh.com",
|
+ { "aes128-gcm@openssh.com",
|
||||||
+ 16, 16, 12, 16, 0, EVP_aes_128_gcm },
|
+ 16, 16, 12, 16, 0, EVP_aes_128_gcm },
|
||||||
+ { "aes256-gcm@openssh.com",
|
+ { "aes256-gcm@openssh.com",
|
||||||
+ 16, 32, 12, 16, 0, EVP_aes_256_gcm },
|
+ 16, 32, 12, 16, 0, EVP_aes_256_gcm },
|
||||||
+# endif /* OPENSSL_HAVE_EVPGCM */
|
|
||||||
+#else
|
+#else
|
||||||
+ { "aes128-ctr", 16, 16, 0, 0, CFLAG_AESCTR, NULL },
|
+ { "aes128-ctr", 16, 16, 0, 0, CFLAG_AESCTR, NULL },
|
||||||
+ { "aes192-ctr", 16, 24, 0, 0, CFLAG_AESCTR, NULL },
|
+ { "aes192-ctr", 16, 24, 0, 0, CFLAG_AESCTR, NULL },
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Apr 2 13:07:43 UTC 2024 - Martin Sirringhaus <martin.sirringhaus@suse.com>
|
||||||
|
|
||||||
|
- Rebase openssh-7.7p1-fips.patch (bsc#1221928)
|
||||||
|
Remove OPENSSL_HAVE_EVPGCM-ifdef, which is no longer supported by
|
||||||
|
upstream
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Apr 2 11:23:05 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
|
Tue Apr 2 11:23:05 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user