summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch179
-rw-r--r--meta/recipes-connectivity/openssl/openssl_3.2.1.bb1
2 files changed, 180 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch
new file mode 100644
index 0000000000..50fb969c03
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch
@@ -0,0 +1,179 @@
1From da343d0605c826ef197aceedc67e8e04f065f740 Mon Sep 17 00:00:00 2001
2From: Tomas Mraz <tomas@openssl.org>
3Date: Wed, 8 May 2024 15:23:45 +0200
4Subject: [PATCH] Check DSA parameters for excessive sizes before validating
5
6This avoids overly long computation of various validation
7checks.
8
9Fixes CVE-2024-4603
10
11Reviewed-by: Paul Dale <ppzgs1@gmail.com>
12Reviewed-by: Matt Caswell <matt@openssl.org>
13Reviewed-by: Neil Horman <nhorman@openssl.org>
14Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
15(Merged from https://github.com/openssl/openssl/pull/24346)
16
17(cherry picked from commit 85ccbab216da245cf9a6503dd327072f21950d9b)
18
19<dropped CHANGES.md modifications as it would need backport of all previous changes>
20
21CVE: CVE-2024-4603
22Upstream-Status: Backport [https://github.com/openssl/openssl/commit/da343d0605c826ef197aceedc67e8e04f065f740]
23Signed-off-by: Peter Marko <peter.marko@siemens.com>
24---
25 crypto/dsa/dsa_check.c | 44 ++++++++++++--
26 .../invalid/p10240_q256_too_big.pem | 57 +++++++++++++++++++
27 2 files changed, 97 insertions(+), 4 deletions(-)
28
29diff --git a/crypto/dsa/dsa_check.c b/crypto/dsa/dsa_check.c
30index fb0e9129a2..122449a7bf 100644
31--- a/crypto/dsa/dsa_check.c
32+++ b/crypto/dsa/dsa_check.c
33@@ -19,8 +19,34 @@
34 #include "dsa_local.h"
35 #include "crypto/dsa.h"
36
37+static int dsa_precheck_params(const DSA *dsa, int *ret)
38+{
39+ if (dsa->params.p == NULL || dsa->params.q == NULL) {
40+ ERR_raise(ERR_LIB_DSA, DSA_R_BAD_FFC_PARAMETERS);
41+ *ret = FFC_CHECK_INVALID_PQ;
42+ return 0;
43+ }
44+
45+ if (BN_num_bits(dsa->params.p) > OPENSSL_DSA_MAX_MODULUS_BITS) {
46+ ERR_raise(ERR_LIB_DSA, DSA_R_MODULUS_TOO_LARGE);
47+ *ret = FFC_CHECK_INVALID_PQ;
48+ return 0;
49+ }
50+
51+ if (BN_num_bits(dsa->params.q) >= BN_num_bits(dsa->params.p)) {
52+ ERR_raise(ERR_LIB_DSA, DSA_R_BAD_Q_VALUE);
53+ *ret = FFC_CHECK_INVALID_PQ;
54+ return 0;
55+ }
56+
57+ return 1;
58+}
59+
60 int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
61 {
62+ if (!dsa_precheck_params(dsa, ret))
63+ return 0;
64+
65 if (checktype == OSSL_KEYMGMT_VALIDATE_QUICK_CHECK)
66 return ossl_ffc_params_simple_validate(dsa->libctx, &dsa->params,
67 FFC_PARAM_TYPE_DSA, ret);
68@@ -39,6 +65,9 @@ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
69 */
70 int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret)
71 {
72+ if (!dsa_precheck_params(dsa, ret))
73+ return 0;
74+
75 return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret)
76 && *ret == 0;
77 }
78@@ -50,6 +79,9 @@ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret)
79 */
80 int ossl_dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key, int *ret)
81 {
82+ if (!dsa_precheck_params(dsa, ret))
83+ return 0;
84+
85 return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret)
86 && *ret == 0;
87 }
88@@ -58,8 +90,10 @@ int ossl_dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret)
89 {
90 *ret = 0;
91
92- return (dsa->params.q != NULL
93- && ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret));
94+ if (!dsa_precheck_params(dsa, ret))
95+ return 0;
96+
97+ return ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret);
98 }
99
100 /*
101@@ -72,8 +106,10 @@ int ossl_dsa_check_pairwise(const DSA *dsa)
102 BN_CTX *ctx = NULL;
103 BIGNUM *pub_key = NULL;
104
105- if (dsa->params.p == NULL
106- || dsa->params.g == NULL
107+ if (!dsa_precheck_params(dsa, &ret))
108+ return 0;
109+
110+ if (dsa->params.g == NULL
111 || dsa->priv_key == NULL
112 || dsa->pub_key == NULL)
113 return 0;
114diff --git a/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem b/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
115new file mode 100644
116index 0000000000..e85e2953b7
117--- /dev/null
118+++ b/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
119@@ -0,0 +1,57 @@
120+-----BEGIN DSA PARAMETERS-----
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
175+vKuje86bePD6kD/LH3wmkA==
176+-----END DSA PARAMETERS-----
177--
1782.30.2
179
diff --git a/meta/recipes-connectivity/openssl/openssl_3.2.1.bb b/meta/recipes-connectivity/openssl/openssl_3.2.1.bb
index d37b68abbb..9bdf7e1ec6 100644
--- a/meta/recipes-connectivity/openssl/openssl_3.2.1.bb
+++ b/meta/recipes-connectivity/openssl/openssl_3.2.1.bb
@@ -14,6 +14,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
14 file://0001-Added-handshake-history-reporting-when-test-fails.patch \ 14 file://0001-Added-handshake-history-reporting-when-test-fails.patch \
15 file://bti.patch \ 15 file://bti.patch \
16 file://CVE-2024-2511.patch \ 16 file://CVE-2024-2511.patch \
17 file://CVE-2024-4603.patch \
17 " 18 "
18 19
19SRC_URI:append:class-nativesdk = " \ 20SRC_URI:append:class-nativesdk = " \