]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
s3_lib.c: Handle weak x keys as illegal_parameter alert
authorNorbert Pocs <norbertp@openssl.org>
Sun, 11 May 2025 15:36:05 +0000 (17:36 +0200)
committerTomas Mraz <tomas@openssl.org>
Thu, 15 May 2025 08:49:35 +0000 (10:49 +0200)
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27597)

(cherry picked from commit 5da4ea10be8cf8ca66dff95c9997966f21c82029)

ssl/s3_lib.c

index bcfe57b46f083ba80d7c417803f7a1a1870f9164..bac8f342085fb726f03d462de805d7f64eae5136 100644 (file)
@@ -4820,7 +4820,10 @@ int ssl_derive(SSL *s, EVP_PKEY *privkey, EVP_PKEY *pubkey, int gensecret)
     }
 
     if (EVP_PKEY_derive(pctx, pms, &pmslen) <= 0) {
-        SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
+        /*
+         * the public key was probably a weak key
+         */
+        SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_BAD_KEY_SHARE);
         goto err;
     }