summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorerbsland-dev <github@erbsland.dev>2024-06-20 20:44:00 +0200
committerNeil Horman <nhorman@openssl.org>2024-06-23 10:09:07 -0400
commit89c9c3b857b5d68d835c3c3d371dc74a26f568fd (patch)
treeb1e58c8a719df0abac3f7a75deacace047d07350
parentb23cd39f0a4e3cfe142694402a5246a498a3574f (diff)
Extend `mask` of `ssl_method_st` to 64-bitHEADmaster
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)
-rw-r--r--ssl/ssl_local.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index 0d979ae723..daab329133 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);