mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-19 19:50:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

DES_set_key(): return values as DES_set_key_checked() but always set

Browse Source 
This avoids using accidentally uninitialized key schedule in
applications that use DES_set_key() not expecting it to check the key
which is the default on OpenSSL <= 1.1.1

Fixes #16859

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16944)
This commit is contained in:
Tomas Mraz 2021-11-01 08:39:21 +01:00 committed by Pauli
parent af5e63e1e3
commit 6450ea27ff
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/des/set_key.c
View File

@ -279,9 +279,17 @@ static const DES_LONG des_skb[8][64] = {
}
};
/* Return values as DES_set_key_checked() but always set the key */
int DES_set_key(const_DES_cblock *key, DES_key_schedule *schedule)
{
return DES_set_key_checked(key, schedule);
int ret = 0;
if (!DES_check_key_parity(key))
ret = -1;
if (DES_is_weak_key(key))
ret = -2;
DES_set_key_unchecked(key, schedule);
return ret;
}
/*-