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-20 18:52:20 +0300 |
| commit | 7146b69b490595d654228bae8c3fb5d1525e3b60 (patch) | |
| tree | ad5be9da3d9a9a1d595d6ffdf0a3fe4cb836cf28 | |
| parent | 30840c2c45d718e0fd93cfd40771fbefa50e31f5 (diff) | |
| download | libgcrypt-7146b69b490595d654228bae8c3fb5d1525e3b60.tar.gz | |
Revert "cipher: Fix edge case for SET_ALLOW_WEAK_KEY."
* cipher/cipher.c (cipher_setkey): Do not reset RC.
--
This reverts commit 30840c2c45d718e0fd93cfd40771fbefa50e31f5.
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.11.0 (unreleased) [C25/A5/R0] ------------------------------------------------- - * Bug fixes: - - - Handle GCRYCTL_SET_ALLOW_WEAK_KEY correctly for CBC mode. [T6451] - * Other features: - The control code GCRYCTL_ENABLE_M_GUARD is deprecated and not diff --git a/cipher/cipher.c b/cipher/cipher.c index 72bd9b29..f2558371 100644 --- a/cipher/cipher.c +++ b/cipher/cipher.c @@ -785,7 +785,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: |