From: erbsland-dev <github@erbsland.dev>
Date: Thu, 20 Jun 2024 18:44:00 +0000 (+0200)
Subject: Extend `mask` of `ssl_method_st` to 64-bit
X-Git-Tag: openssl-3.4.0-alpha1~458
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89c9c3b857b5d68d835c3c3d371dc74a26f568fd;p=thirdparty%2Fopenssl.git

Extend `mask` of `ssl_method_st` to 64-bit

Fixes #23260: The bit count for `SSL_OP_*` flags has exceeded 32 bits, making it impossible to handle newer flags and protocol extensions with the existing 32-bit variables. This commit extends the `mask` field in the `ssl_method_st` structure to 64-bit, aligning them with the previously extended 64-bit `options` field.

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24692)
---

diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index 0d979ae7237..daab329133c 100644
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -419,7 +419,7 @@ struct ssl_cipher_st {
 struct ssl_method_st {
     int version;
     unsigned flags;
-    unsigned long mask;
+    uint64_t mask;
     SSL *(*ssl_new) (SSL_CTX *ctx);
     void (*ssl_free) (SSL *s);
     int (*ssl_reset) (SSL *s);