diff options
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl/CVE-2024-2511.patch | 120 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch | 179 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl/bti.patch | 58 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl_3.2.2.bb (renamed from meta/recipes-connectivity/openssl/openssl_3.2.1.bb) | 5 |
4 files changed, 1 insertions, 361 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2024-2511.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2024-2511.patch deleted file mode 100644 index 8772f716d5..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/CVE-2024-2511.patch +++ /dev/null | |||
| @@ -1,120 +0,0 @@ | |||
| 1 | From e9d7083e241670332e0443da0f0d4ffb52829f08 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Matt Caswell <matt@openssl.org> | ||
| 3 | Date: Tue, 5 Mar 2024 15:43:53 +0000 | ||
| 4 | Subject: [PATCH] Fix unconstrained session cache growth in TLSv1.3 | ||
| 5 | |||
| 6 | In TLSv1.3 we create a new session object for each ticket that we send. | ||
| 7 | We do this by duplicating the original session. If SSL_OP_NO_TICKET is in | ||
| 8 | use then the new session will be added to the session cache. However, if | ||
| 9 | early data is not in use (and therefore anti-replay protection is being | ||
| 10 | used), then multiple threads could be resuming from the same session | ||
| 11 | simultaneously. If this happens and a problem occurs on one of the threads, | ||
| 12 | then the original session object could be marked as not_resumable. When we | ||
| 13 | duplicate the session object this not_resumable status gets copied into the | ||
| 14 | new session object. The new session object is then added to the session | ||
| 15 | cache even though it is not_resumable. | ||
| 16 | |||
| 17 | Subsequently, another bug means that the session_id_length is set to 0 for | ||
| 18 | sessions that are marked as not_resumable - even though that session is | ||
| 19 | still in the cache. Once this happens the session can never be removed from | ||
| 20 | the cache. When that object gets to be the session cache tail object the | ||
| 21 | cache never shrinks again and grows indefinitely. | ||
| 22 | |||
| 23 | CVE-2024-2511 | ||
| 24 | |||
| 25 | Reviewed-by: Neil Horman <nhorman@openssl.org> | ||
| 26 | Reviewed-by: Tomas Mraz <tomas@openssl.org> | ||
| 27 | (Merged from https://github.com/openssl/openssl/pull/24043) | ||
| 28 | |||
| 29 | CVE: CVE-2024-2511 | ||
| 30 | Upstream-Status: Backport [https://github.com/openssl/openssl/commit/e9d7083e241670332e0443da0f0d4ffb52829f08] | ||
| 31 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
| 32 | --- | ||
| 33 | ssl/ssl_lib.c | 5 +++-- | ||
| 34 | ssl/ssl_sess.c | 28 ++++++++++++++++++++++------ | ||
| 35 | ssl/statem/statem_srvr.c | 5 ++--- | ||
| 36 | 3 files changed, 27 insertions(+), 11 deletions(-) | ||
| 37 | |||
| 38 | diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c | ||
| 39 | index 4afb43bc86e54..c51529ddab5bb 100644 | ||
| 40 | --- a/ssl/ssl_lib.c | ||
| 41 | +++ b/ssl/ssl_lib.c | ||
| 42 | @@ -4457,9 +4457,10 @@ void ssl_update_cache(SSL_CONNECTION *s, int mode) | ||
| 43 | |||
| 44 | /* | ||
| 45 | * If the session_id_length is 0, we are not supposed to cache it, and it | ||
| 46 | - * would be rather hard to do anyway :-) | ||
| 47 | + * would be rather hard to do anyway :-). Also if the session has already | ||
| 48 | + * been marked as not_resumable we should not cache it for later reuse. | ||
| 49 | */ | ||
| 50 | - if (s->session->session_id_length == 0) | ||
| 51 | + if (s->session->session_id_length == 0 || s->session->not_resumable) | ||
| 52 | return; | ||
| 53 | |||
| 54 | /* | ||
| 55 | diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c | ||
| 56 | index 3dcc4d81e5bc6..1fa6d17c46863 100644 | ||
| 57 | --- a/ssl/ssl_sess.c | ||
| 58 | +++ b/ssl/ssl_sess.c | ||
| 59 | @@ -127,16 +127,11 @@ SSL_SESSION *SSL_SESSION_new(void) | ||
| 60 | return ss; | ||
| 61 | } | ||
| 62 | |||
| 63 | -SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src) | ||
| 64 | -{ | ||
| 65 | - return ssl_session_dup(src, 1); | ||
| 66 | -} | ||
| 67 | - | ||
| 68 | /* | ||
| 69 | * Create a new SSL_SESSION and duplicate the contents of |src| into it. If | ||
| 70 | * ticket == 0 then no ticket information is duplicated, otherwise it is. | ||
| 71 | */ | ||
| 72 | -SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) | ||
| 73 | +static SSL_SESSION *ssl_session_dup_intern(const SSL_SESSION *src, int ticket) | ||
| 74 | { | ||
| 75 | SSL_SESSION *dest; | ||
| 76 | |||
| 77 | @@ -265,6 +260,27 @@ SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) | ||
| 78 | return NULL; | ||
| 79 | } | ||
| 80 | |||
| 81 | +SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src) | ||
| 82 | +{ | ||
| 83 | + return ssl_session_dup_intern(src, 1); | ||
| 84 | +} | ||
| 85 | + | ||
| 86 | +/* | ||
| 87 | + * Used internally when duplicating a session which might be already shared. | ||
| 88 | + * We will have resumed the original session. Subsequently we might have marked | ||
| 89 | + * it as non-resumable (e.g. in another thread) - but this copy should be ok to | ||
| 90 | + * resume from. | ||
| 91 | + */ | ||
| 92 | +SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) | ||
| 93 | +{ | ||
| 94 | + SSL_SESSION *sess = ssl_session_dup_intern(src, ticket); | ||
| 95 | + | ||
| 96 | + if (sess != NULL) | ||
| 97 | + sess->not_resumable = 0; | ||
| 98 | + | ||
| 99 | + return sess; | ||
| 100 | +} | ||
| 101 | + | ||
| 102 | const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s, unsigned int *len) | ||
| 103 | { | ||
| 104 | if (len) | ||
| 105 | diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c | ||
| 106 | index 853af8c0aa9f9..d5f0ab091dacc 100644 | ||
| 107 | --- a/ssl/statem/statem_srvr.c | ||
| 108 | +++ b/ssl/statem/statem_srvr.c | ||
| 109 | @@ -2445,9 +2445,8 @@ CON_FUNC_RETURN tls_construct_server_hello(SSL_CONNECTION *s, WPACKET *pkt) | ||
| 110 | * so the following won't overwrite an ID that we're supposed | ||
| 111 | * to send back. | ||
| 112 | */ | ||
| 113 | - if (s->session->not_resumable || | ||
| 114 | - (!(SSL_CONNECTION_GET_CTX(s)->session_cache_mode & SSL_SESS_CACHE_SERVER) | ||
| 115 | - && !s->hit)) | ||
| 116 | + if (!(SSL_CONNECTION_GET_CTX(s)->session_cache_mode & SSL_SESS_CACHE_SERVER) | ||
| 117 | + && !s->hit) | ||
| 118 | s->session->session_id_length = 0; | ||
| 119 | |||
| 120 | if (usetls13) { | ||
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch deleted file mode 100644 index 50fb969c03..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch +++ /dev/null | |||
| @@ -1,179 +0,0 @@ | |||
| 1 | From da343d0605c826ef197aceedc67e8e04f065f740 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Tomas Mraz <tomas@openssl.org> | ||
| 3 | Date: Wed, 8 May 2024 15:23:45 +0200 | ||
| 4 | Subject: [PATCH] Check DSA parameters for excessive sizes before validating | ||
| 5 | |||
| 6 | This avoids overly long computation of various validation | ||
| 7 | checks. | ||
| 8 | |||
| 9 | Fixes CVE-2024-4603 | ||
| 10 | |||
| 11 | Reviewed-by: Paul Dale <ppzgs1@gmail.com> | ||
| 12 | Reviewed-by: Matt Caswell <matt@openssl.org> | ||
| 13 | Reviewed-by: Neil Horman <nhorman@openssl.org> | ||
| 14 | Reviewed-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 | |||
| 21 | CVE: CVE-2024-4603 | ||
| 22 | Upstream-Status: Backport [https://github.com/openssl/openssl/commit/da343d0605c826ef197aceedc67e8e04f065f740] | ||
| 23 | Signed-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 | |||
| 29 | diff --git a/crypto/dsa/dsa_check.c b/crypto/dsa/dsa_check.c | ||
| 30 | index 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; | ||
| 114 | diff --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 | ||
| 115 | new file mode 100644 | ||
| 116 | index 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----- | ||
| 121 | +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 | ||
| 175 | +vKuje86bePD6kD/LH3wmkA== | ||
| 176 | +-----END DSA PARAMETERS----- | ||
| 177 | -- | ||
| 178 | 2.30.2 | ||
| 179 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl/bti.patch b/meta/recipes-connectivity/openssl/openssl/bti.patch deleted file mode 100644 index 748576c30c..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/bti.patch +++ /dev/null | |||
| @@ -1,58 +0,0 @@ | |||
| 1 | From ba8a599395f8b770c76316b5f5b0f3838567014f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Tom Cosgrove <tom.cosgrove@arm.com> | ||
| 3 | Date: Tue, 26 Mar 2024 13:18:00 +0000 | ||
| 4 | Subject: [PATCH] aarch64: fix BTI in bsaes assembly code | ||
| 5 | |||
| 6 | In Arm systems where BTI is enabled but the Crypto extensions are not (more | ||
| 7 | likely in FVPs than in real hardware), the bit-sliced assembler code will | ||
| 8 | be used. However, this wasn't annotated with BTI instructions when BTI was | ||
| 9 | enabled, so the moment libssl jumps into this code it (correctly) aborts. | ||
| 10 | |||
| 11 | Solve this by adding the missing BTI landing pads. | ||
| 12 | |||
| 13 | Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/23982] | ||
| 14 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
| 15 | --- | ||
| 16 | crypto/aes/asm/bsaes-armv8.pl | 5 ++++- | ||
| 17 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/crypto/aes/asm/bsaes-armv8.pl b/crypto/aes/asm/bsaes-armv8.pl | ||
| 20 | index b3c97e439f..c3c5ff3e05 100644 | ||
| 21 | --- a/crypto/aes/asm/bsaes-armv8.pl | ||
| 22 | +++ b/crypto/aes/asm/bsaes-armv8.pl | ||
| 23 | @@ -1018,6 +1018,7 @@ _bsaes_key_convert: | ||
| 24 | // Initialisation vector overwritten with last quadword of ciphertext | ||
| 25 | // No output registers, usual AAPCS64 register preservation | ||
| 26 | ossl_bsaes_cbc_encrypt: | ||
| 27 | + AARCH64_VALID_CALL_TARGET | ||
| 28 | cmp x2, #128 | ||
| 29 | bhs .Lcbc_do_bsaes | ||
| 30 | b AES_cbc_encrypt | ||
| 31 | @@ -1270,7 +1271,7 @@ ossl_bsaes_cbc_encrypt: | ||
| 32 | // Output text filled in | ||
| 33 | // No output registers, usual AAPCS64 register preservation | ||
| 34 | ossl_bsaes_ctr32_encrypt_blocks: | ||
| 35 | - | ||
| 36 | + AARCH64_VALID_CALL_TARGET | ||
| 37 | cmp x2, #8 // use plain AES for | ||
| 38 | blo .Lctr_enc_short // small sizes | ||
| 39 | |||
| 40 | @@ -1476,6 +1477,7 @@ ossl_bsaes_ctr32_encrypt_blocks: | ||
| 41 | // Output ciphertext filled in | ||
| 42 | // No output registers, usual AAPCS64 register preservation | ||
| 43 | ossl_bsaes_xts_encrypt: | ||
| 44 | + AARCH64_VALID_CALL_TARGET | ||
| 45 | // Stack layout: | ||
| 46 | // sp -> | ||
| 47 | // nrounds*128-96 bytes: key schedule | ||
| 48 | @@ -1921,6 +1923,7 @@ ossl_bsaes_xts_encrypt: | ||
| 49 | // Output plaintext filled in | ||
| 50 | // No output registers, usual AAPCS64 register preservation | ||
| 51 | ossl_bsaes_xts_decrypt: | ||
| 52 | + AARCH64_VALID_CALL_TARGET | ||
| 53 | // Stack layout: | ||
| 54 | // sp -> | ||
| 55 | // nrounds*128-96 bytes: key schedule | ||
| 56 | -- | ||
| 57 | 2.34.1 | ||
| 58 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl_3.2.1.bb b/meta/recipes-connectivity/openssl/openssl_3.2.2.bb index 9bdf7e1ec6..1c92707144 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.2.1.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.2.2.bb | |||
| @@ -12,16 +12,13 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | |||
| 12 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ | 12 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ |
| 13 | file://0001-Configure-do-not-tweak-mips-cflags.patch \ | 13 | file://0001-Configure-do-not-tweak-mips-cflags.patch \ |
| 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 \ | ||
| 16 | file://CVE-2024-2511.patch \ | ||
| 17 | file://CVE-2024-4603.patch \ | ||
| 18 | " | 15 | " |
| 19 | 16 | ||
| 20 | SRC_URI:append:class-nativesdk = " \ | 17 | SRC_URI:append:class-nativesdk = " \ |
| 21 | file://environment.d-openssl.sh \ | 18 | file://environment.d-openssl.sh \ |
| 22 | " | 19 | " |
| 23 | 20 | ||
| 24 | SRC_URI[sha256sum] = "83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39" | 21 | SRC_URI[sha256sum] = "197149c18d9e9f292c43f0400acaba12e5f52cacfe050f3d199277ea738ec2e7" |
| 25 | 22 | ||
| 26 | inherit lib_package multilib_header multilib_script ptest perlnative manpages | 23 | inherit lib_package multilib_header multilib_script ptest perlnative manpages |
| 27 | MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" | 24 | MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" |
