russell@unturf.com
9934133dcf
Add 88 new defect entries to HIGH and MEDIUM tables:
HIGH: mysql-0001/0002, mariadb-0001, redis-0001/0002, valkey-0001/0002, openvpn-0001,
vlc-0001, prometheus-0001, otel-collector-0001, cockroachdb-0001..0004,
tidb-0001..0008, kubernetes-0001/0002, go-0001, kotlin-0002, scala-0001,
allegro5-0001, sdl2-0001, grafana-0001, clickhouse-0001, duckdb-0001,
mongodb-0001, envoy-0001, istio-0001, cilium-0001, linkerd2-0001,
linux-0001/0002/0003, tor-0002/0003, curl-0001, julia-0001, lua-0001,
perl5-0001, nats-0001, spring-0003/0004, tomcat-0001, onos-0002, odl-0002
MEDIUM: helm-0001, mariadb-0002, openssl-0001/0002, memcached-0001,
cassandra-0001..0004, flink-0001, storm-0001/0002, zookeeper-0001..0003,
pip-0001, gradle-0001, nginx-0001, haproxy-0001, caddy-0001, varnish-0001,
ffmpeg-0001, gstreamer-0001, raylib-0001, love2d-0001, php-0001/0002,
r-source-0001, cpython-0002, ruby-0001, rabbitmq-0003/0004, activemq-0001,
ovs-0001, onos-0003, odl-0002, jetty-0001
PDF: 976K
84 lines
3.3 KiB
Diff
84 lines
3.3 KiB
Diff
From b8df87a Mon Sep 17 00:00:00 2001
|
|
Subject: [CWE-407] ssl_ciph: fix O(n²) TLS1.3 cipher dedup in ciphersuite_cb
|
|
|
|
ciphersuite_cb() suppressed duplicate cipher IDs with a linear scan
|
|
over the already-added ciphersuites stack. Called once per input
|
|
token by CONF_parse_list, the total is O(n²).
|
|
|
|
Fix: use a static bitmask indexed by cipher table position.
|
|
There are exactly 5 standard TLS 1.3 ciphersuites (ssl3_get_tls13_cipher_by_std_name
|
|
returns a pointer into the tls13_ciphers array). The bitmask is a
|
|
uint8_t[8] passed in as part of a small context struct, giving O(1)
|
|
dedup.
|
|
|
|
--- a/ssl/ssl_ciph.c
|
|
+++ b/ssl/ssl_ciph.c
|
|
@@ -1225,10 +1225,21 @@ static int update_cipher_list(SSL_CTX *ctx,
|
|
return 1;
|
|
}
|
|
|
|
+/* Context passed to ciphersuite_cb via CONF_parse_list arg. */
|
|
+struct ciphersuite_cb_ctx {
|
|
+ STACK_OF(SSL_CIPHER) *ciphersuites;
|
|
+ uint8_t seen[32]; /* bitmask: bit i set iff tls13_ciphers+i already added */
|
|
+};
|
|
+
|
|
static int ciphersuite_cb(const char *elem, int len, void *arg)
|
|
{
|
|
- STACK_OF(SSL_CIPHER) *ciphersuites = (STACK_OF(SSL_CIPHER) *)arg;
|
|
+ struct ciphersuite_cb_ctx *ctx = (struct ciphersuite_cb_ctx *)arg;
|
|
+ STACK_OF(SSL_CIPHER) *ciphersuites = ctx->ciphersuites;
|
|
const SSL_CIPHER *cipher;
|
|
+ ptrdiff_t idx;
|
|
/* Arbitrary sized temp buffer for the cipher name. Should be big enough */
|
|
char name[80];
|
|
|
|
@@ -1241,12 +1252,14 @@ static int ciphersuite_cb(const char *elem, int len, void *arg)
|
|
cipher = ssl3_get_tls13_cipher_by_std_name(name);
|
|
if (cipher == NULL)
|
|
/* Ciphersuite not found but return 1 to parse rest of the list */
|
|
return 1;
|
|
|
|
- /* Suppress duplicates */
|
|
- for (int i = 0; i < sk_SSL_CIPHER_num(ciphersuites); ++i)
|
|
- if (sk_SSL_CIPHER_value(ciphersuites, i)->id == cipher->id)
|
|
- return 1;
|
|
+ /* Suppress duplicates — O(1) bitmask on cipher table index */
|
|
+ idx = cipher - tls13_ciphers; /* pointer arithmetic into static array */
|
|
+ if (idx >= 0 && idx < (ptrdiff_t)(sizeof(ctx->seen) * 8)
|
|
+ && (ctx->seen[idx / 8] & (1u << (idx % 8))))
|
|
+ return 1;
|
|
+ if (idx >= 0 && idx < (ptrdiff_t)(sizeof(ctx->seen) * 8))
|
|
+ ctx->seen[idx / 8] |= (uint8_t)(1u << (idx % 8));
|
|
|
|
if (!sk_SSL_CIPHER_push(ciphersuites, cipher)) {
|
|
ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR);
|
|
@@ -1262,11 +1275,16 @@ static __owur int set_ciphersuites(STACK_OF(SSL_CIPHER) **currciphers, const cha
|
|
{
|
|
- STACK_OF(SSL_CIPHER) *newciphers = sk_SSL_CIPHER_new_null();
|
|
+ struct ciphersuite_cb_ctx ctx;
|
|
+
|
|
+ ctx.ciphersuites = sk_SSL_CIPHER_new_null();
|
|
+ memset(ctx.seen, 0, sizeof(ctx.seen));
|
|
|
|
- if (newciphers == NULL)
|
|
+ if (ctx.ciphersuites == NULL)
|
|
return 0;
|
|
|
|
/* Parse the list. We explicitly allow an empty list */
|
|
if (*str != '\0'
|
|
- && (CONF_parse_list(str, ':', 1, ciphersuite_cb, newciphers) <= 0
|
|
- || sk_SSL_CIPHER_num(newciphers) == 0)) {
|
|
+ && (CONF_parse_list(str, ':', 1, ciphersuite_cb, &ctx) <= 0
|
|
+ || sk_SSL_CIPHER_num(ctx.ciphersuites) == 0)) {
|
|
ERR_raise(ERR_LIB_SSL, SSL_R_NO_CIPHER_MATCH);
|
|
- sk_SSL_CIPHER_free(newciphers);
|
|
+ sk_SSL_CIPHER_free(ctx.ciphersuites);
|
|
return 0;
|
|
}
|
|
- sk_SSL_CIPHER_free(*currciphers);
|
|
- *currciphers = newciphers;
|
|
+ sk_SSL_CIPHER_free(*currciphers);
|
|
+ *currciphers = ctx.ciphersuites;
|
|
return 1;
|
|
}
|