From: Tomas Mraz <tomas@openssl.org>
Date: Mon, 1 Nov 2021 07:39:21 +0000 (+0100)
Subject: DES_set_key(): return values as DES_set_key_checked() but always set
X-Git-Tag: openssl-3.2.0-alpha1~3397
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6450ea27ffdc22194f27e90796ce5538af2d81e2;p=thirdparty%2Fopenssl.git

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

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)
---

diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c
index 9510dc2c6ad..ce7fb901f0a 100644
--- a/crypto/des/set_key.c
+++ b/crypto/des/set_key.c
@@ -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;
 }
 
 /*-