From: Norbert Pocs <norbertp@openssl.org>
Date: Tue, 5 May 2026 10:36:23 +0000 (+0200)
Subject: a_strnid: put includes together
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=4dce5bc2eec799eaf7991423f2c464d0dffce216;p=thirdparty%2Fopenssl.git

a_strnid: put includes together

clang-tidy calculates where to place the headers to be added. The
maximum is the latest include present in the file.  Therefore the
algorithm sometimes addes the includes wrongly in the middle of the
file.

Signed-off-by: Norbert Pocs <norbertp@openssl.org>

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
MergeDate: Mon May 18 07:03:47 2026
(Merged from https://github.com/openssl/openssl/pull/31153)
---

diff --git a/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c
index 889587133c0..54117d50eef 100644
--- a/crypto/asn1/a_strnid.c
+++ b/crypto/asn1/a_strnid.c
@@ -11,6 +11,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/asn1.h>
 #include <openssl/objects.h>
+#include "tbl_standard.h"
 
 static STACK_OF(ASN1_STRING_TABLE) *stable = NULL;
 static void st_free(ASN1_STRING_TABLE *tbl);
@@ -107,8 +108,6 @@ ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out,
  * Now the tables and helper functions for the string table:
  */
 
-#include "tbl_standard.h"
-
 static int sk_table_cmp(const ASN1_STRING_TABLE *const *a,
     const ASN1_STRING_TABLE *const *b)
 {