From ba4970afb5b60f022126b7fb3ee3c44cb9ceac8c Mon Sep 17 00:00:00 2001 From: Bob Beck Date: Tue, 9 Dec 2025 09:01:16 -0700 Subject: [PATCH] Add static_ASN1_SEQUENCE_END to the list of statment macros This one is pretty special, we should ponder simplifying some of the clever preprocessor stuff here, but for now.. Reviewed-by: Matt Caswell Reviewed-by: Richard Levitte Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/29359) --- .clang-format | 1 + providers/implementations/encode_decode/decode_der2key.c | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.clang-format b/.clang-format index 26ee4323a02..18b16e0de00 100644 --- a/.clang-format +++ b/.clang-format @@ -243,6 +243,7 @@ StatementMacros: - "ASN1_SEQUENCE_END_enc" - "ASN1_SEQUENCE_END_name" - "ASN1_SEQUENCE_END_ref" + - "static_ASN1_SEQUENCE_END" # This isn't quite right, but it causes clang-format to do a slightly better # job formatting this macro. - "ASN1_EX_TEMPLATE_TYPE" diff --git a/providers/implementations/encode_decode/decode_der2key.c b/providers/implementations/encode_decode/decode_der2key.c index 8d89e64fe5b..b75d73b0fdf 100644 --- a/providers/implementations/encode_decode/decode_der2key.c +++ b/providers/implementations/encode_decode/decode_der2key.c @@ -60,11 +60,13 @@ ASN1_SEQUENCE(BARE_ALGOR) = { ASN1_SIMPLE(BARE_ALGOR, oid, ASN1_OBJECT), } static_ASN1_SEQUENCE_END(BARE_ALGOR) - ASN1_SEQUENCE(BARE_PUBKEY) - = { ASN1_EMBED(BARE_PUBKEY, algor, BARE_ALGOR), ASN1_SIMPLE(BARE_PUBKEY, pubkey, ASN1_BIT_STRING) } static_ASN1_SEQUENCE_END(BARE_PUBKEY) +ASN1_SEQUENCE(BARE_PUBKEY) = { + ASN1_EMBED(BARE_PUBKEY, algor, BARE_ALGOR), + ASN1_SIMPLE(BARE_PUBKEY, pubkey, ASN1_BIT_STRING) +} static_ASN1_SEQUENCE_END(BARE_PUBKEY) #endif /* OPENSSL_NO_SLH_DSA */ - struct der2key_ctx_st; /* Forward declaration */ +struct der2key_ctx_st; /* Forward declaration */ typedef int check_key_fn(void *, struct der2key_ctx_st *ctx); typedef void adjust_key_fn(void *, struct der2key_ctx_st *ctx); typedef void free_key_fn(void *); -- 2.47.3