diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2023-07-31 20:47:29 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2023-07-31 20:47:29 +0000 |
| commit | cf313db52dec29af821df18335acbe2e5cf36ba1 (patch) | |
| tree | 65165da7634d334a2725e41d58963ad4de52669b | |
| parent | 2eb21c24dc36828cd9ee84006147f7494bda7d3f (diff) | |
| download | ports-cf313db52dec29af821df18335acbe2e5cf36ba1.tar.gz ports-cf313db52dec29af821df18335acbe2e5cf36ba1.zip | |
security/openssl: Security update for CVE-2023-3817 (Low)
Security: bad6588e-2fe0-11ee-a0d1-84a93843eb75
| -rw-r--r-- | security/openssl/Makefile | 1 | ||||
| -rw-r--r-- | security/openssl/files/patch-CVE-2023-3817 | 55 |
2 files changed, 56 insertions, 0 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 958222c88b4a..d0ffd1cac2a2 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,5 +1,6 @@ PORTNAME= openssl PORTVERSION= 1.1.1u +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ diff --git a/security/openssl/files/patch-CVE-2023-3817 b/security/openssl/files/patch-CVE-2023-3817 new file mode 100644 index 000000000000..3f1d5193c73f --- /dev/null +++ b/security/openssl/files/patch-CVE-2023-3817 @@ -0,0 +1,55 @@ +From 91ddeba0f2269b017dc06c46c993a788974b1aa5 Mon Sep 17 00:00:00 2001 +From: Tomas Mraz <tomas@openssl.org> +Date: Fri, 21 Jul 2023 11:39:41 +0200 +Subject: [PATCH] DH_check(): Do not try checking q properties if it is + obviously invalid + +If |q| >= |p| then the q value is obviously wrong as q +is supposed to be a prime divisor of p-1. + +We check if p is overly large so this added test implies that +q is not large either when performing subsequent tests using that +q value. + +Otherwise if it is too large these additional checks of the q value +such as the primality test can then trigger DoS by doing overly long +computations. + +Fixes CVE-2023-3817 + +Reviewed-by: Paul Dale <pauli@openssl.org> +Reviewed-by: Matt Caswell <matt@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/21551) +--- + crypto/dh/dh_check.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/crypto/dh/dh_check.c b/crypto/dh/dh_check.c +index 2001d2e7cb19..9ae96991eb4a 100644 +--- crypto/dh/dh_check.c.orig ++++ crypto/dh/dh_check.c +@@ -97,7 +97,7 @@ int DH_check_ex(const DH *dh) + + int DH_check(const DH *dh, int *ret) + { +- int ok = 0, r; ++ int ok = 0, r, q_good = 0; + BN_CTX *ctx = NULL; + BIGNUM *t1 = NULL, *t2 = NULL; + +@@ -120,7 +120,14 @@ int DH_check(const DH *dh, int *ret) + if (t2 == NULL) + goto err; + +- if (dh->q) { ++ if (dh->q != NULL) { ++ if (BN_ucmp(dh->p, dh->q) > 0) ++ q_good = 1; ++ else ++ *ret |= DH_CHECK_INVALID_Q_VALUE; ++ } ++ ++ if (q_good) { + if (BN_cmp(dh->g, BN_value_one()) <= 0) + *ret |= DH_NOT_SUITABLE_GENERATOR; + else if (BN_cmp(dh->g, dh->p) >= 0) |