diff options
| author | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2023-04-20 18:50:57 +0300 |
|---|---|---|
| committer | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2023-04-21 09:17:22 +0300 |
| commit | 9b1ee0574ed96800429aa9488b6dcb11a5407542 (patch) | |
| tree | 33cfa7fee2369b9fbaa2f2e6ef2242695d2c05cb | |
| parent | b75a58df84a5137954cb678adf8c202b39ee1def (diff) | |
| download | libgcrypt-9b1ee0574ed96800429aa9488b6dcb11a5407542.tar.gz | |
Revert "cipher: Fix edge case for SET_ALLOW_WEAK_KEY."
* cipher/cipher.c (cipher_setkey): Do not reset RC.
--
This reverts commit b75a58df84a5137954cb678adf8c202b39ee1def.
GnuPG-bug-id: 6451
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | cipher/cipher.c | 1 |
2 files changed, 0 insertions, 5 deletions
@@ -1,10 +1,6 @@ Noteworthy changes in version 1.10.3 (unreleased) [C24/A4/R_] ------------------------------------------------- - * Bug fixes: - - - Handle GCRYCTL_SET_ALLOW_WEAK_KEY correctly for CBC mode. [T6451] - Noteworthy changes in version 1.10.2 (2023-04-06) [C24/A4/R2] ------------------------------------------------- diff --git a/cipher/cipher.c b/cipher/cipher.c index 19611a10..d1443a62 100644 --- a/cipher/cipher.c +++ b/cipher/cipher.c @@ -771,7 +771,6 @@ cipher_setkey (gcry_cipher_hd_t c, byte *key, size_t keylen) c->spec->contextsize); c->marks.key = 1; - rc = 0; /* Clear in case of allow_weak_key. */ switch (c->mode) { case GCRY_CIPHER_MODE_CMAC: |