9 files changed, 54 insertions, 9 deletions

diff --git a/src/lib/libcrypto/asn1/asn1_local.h b/src/lib/libcrypto/asn1/asn1_local.h
index 19de978772..d61cfaa7b9 100644
--- a/src/lib/libcrypto/asn1/asn1_local.h
+++ b/src/lib/libcrypto/asn1/asn1_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1_local.h,v 1.10 2024/03/02 09:10:42 tb Exp $ */
+/* $OpenBSD: asn1_local.h,v 1.11 2025/11/26 10:19:57 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -56,6 +56,9 @@
  *
  */
 
+#ifndef HEADER_ASN1_LOCAL_H
+#define HEADER_ASN1_LOCAL_H
+
 #include "bytestring.h"
 
 __BEGIN_HIDDEN_DECLS
@@ -191,3 +194,5 @@ int ASN1_time_parse(const char *_bytes, size_t _len, struct tm *_tm, int _mode);
 int ASN1_time_tm_cmp(struct tm *_tm1, struct tm *_tm2);
 
 __END_HIDDEN_DECLS
+
+#endif /* HEADER_ASN1_LOCAL_H */
diff --git a/src/lib/libcrypto/cast/cast_local.h b/src/lib/libcrypto/cast/cast_local.h
index 5fb9911105..c8b89071c5 100644
--- a/src/lib/libcrypto/cast/cast_local.h
+++ b/src/lib/libcrypto/cast/cast_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cast_local.h,v 1.2 2023/07/08 07:25:43 jsing Exp $ */
+/* $OpenBSD: cast_local.h,v 1.3 2025/11/26 10:19:57 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,6 +56,9 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef HEADER_CAST_LOCAL_H
+#define HEADER_CAST_LOCAL_H
+
 #undef c2l
 #define c2l(c,l)        (l =((unsigned long)(*((c)++)))    , \
                          l|=((unsigned long)(*((c)++)))<< 8L, \
@@ -214,3 +217,5 @@ extern const CAST_LONG CAST_S_table4[256];
 extern const CAST_LONG CAST_S_table5[256];
 extern const CAST_LONG CAST_S_table6[256];
 extern const CAST_LONG CAST_S_table7[256];
+
+#endif /* HEADER_CAST_LOCAL_H */
diff --git a/src/lib/libcrypto/ct/ct_local.h b/src/lib/libcrypto/ct/ct_local.h
index cd19ed096a..152ab9d8c4 100644
--- a/src/lib/libcrypto/ct/ct_local.h
+++ b/src/lib/libcrypto/ct/ct_local.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ct_local.h,v 1.8 2021/12/20 17:19:19 jsing Exp $ */
+/*      $OpenBSD: ct_local.h,v 1.9 2025/11/26 10:19:57 tb Exp $ */
 /*
  * Written by Rob Percival (robpercival@google.com) for the OpenSSL project.
  */
@@ -51,6 +51,9 @@
  * ====================================================================
  */
 
+#ifndef HEADER_CT_LOCAL_H
+#define HEADER_CT_LOCAL_H
+
 #include <stddef.h>
 
 #include <openssl/ct.h>
@@ -258,3 +261,5 @@ int o2i_SCT_signature(SCT *sct, CBS *cbs);
  * Handlers for Certificate Transparency X509v3/OCSP extensions
  */
 extern const X509V3_EXT_METHOD v3_ct_scts[3];
+
+#endif /* HEADER_CT_LOCAL_H */
diff --git a/src/lib/libcrypto/dsa/dsa_local.h b/src/lib/libcrypto/dsa/dsa_local.h
index fc77c09fcb..3d32e5e547 100644
--- a/src/lib/libcrypto/dsa/dsa_local.h
+++ b/src/lib/libcrypto/dsa/dsa_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_local.h,v 1.5 2024/11/29 07:42:35 tb Exp $ */
+/* $OpenBSD: dsa_local.h,v 1.6 2025/11/26 10:19:57 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 2007 The OpenSSL Project.  All rights reserved.
  *
@@ -53,6 +53,9 @@
  *
  */
 
+#ifndef HEADER_DSA_LOCAL_H
+#define HEADER_DSA_LOCAL_H
+
 #include <openssl/dsa.h>
 
 __BEGIN_HIDDEN_DECLS
@@ -102,3 +105,5 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
 int dsa_check_key(const DSA *dsa);
 
 __END_HIDDEN_DECLS
+
+#endif /* HEADER_DSA_LOCAL_H */
diff --git a/src/lib/libcrypto/ec/ec_local.h b/src/lib/libcrypto/ec/ec_local.h
index eac9e6d26c..48a7d929ea 100644
--- a/src/lib/libcrypto/ec/ec_local.h
+++ b/src/lib/libcrypto/ec/ec_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_local.h,v 1.70 2025/08/03 15:07:57 jsing Exp $ */
+/* $OpenBSD: ec_local.h,v 1.71 2025/11/26 10:19:57 tb Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -69,6 +69,9 @@
  *
  */
 
+#ifndef HEADER_EC_LOCAL_H
+#define HEADER_EC_LOCAL_H
+
 #include <stdlib.h>
 
 #include <openssl/bn.h>
@@ -265,3 +268,5 @@ int ecdh_KDF_X9_63(unsigned char *out, size_t outlen, const unsigned char *Z,
     size_t Zlen, const unsigned char *sinfo, size_t sinfolen, const EVP_MD *md);
 
 __END_HIDDEN_DECLS
+
+#endif /* HEADER_EC_LOCAL_H */
diff --git a/src/lib/libcrypto/idea/idea_local.h b/src/lib/libcrypto/idea/idea_local.h
index c7fd3271a7..c0a592ab1c 100644
--- a/src/lib/libcrypto/idea/idea_local.h
+++ b/src/lib/libcrypto/idea/idea_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: idea_local.h,v 1.2 2023/07/07 12:51:58 beck Exp $ */
+/* $OpenBSD: idea_local.h,v 1.3 2025/11/26 10:19:57 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,6 +56,9 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef HEADER_IDEA_LOCAL_H
+#define HEADER_IDEA_LOCAL_H
+
 /* The new form of this macro (check if the a*b == 0) was suggested by
  * Colin Plumb <colin@nyx10.cs.du.edu> */
 /* Removal of the inner if from from Wei Dai 24/4/96 */
@@ -147,3 +150,5 @@ else									\
         ul=x2^t0; /* do the swap to x3 */                               \
         x2=x3^t1;                                                       \
         x3=ul;
+
+#endif /* HEADER_IDEA_LOCAL_H */
diff --git a/src/lib/libcrypto/modes/modes_local.h b/src/lib/libcrypto/modes/modes_local.h
index 5c1acfc25f..df699d3e4c 100644
--- a/src/lib/libcrypto/modes/modes_local.h
+++ b/src/lib/libcrypto/modes/modes_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: modes_local.h,v 1.7 2025/07/13 06:01:33 jsing Exp $ */
+/* $OpenBSD: modes_local.h,v 1.8 2025/11/26 10:19:57 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 2010 The OpenSSL Project.  All rights reserved.
  *
@@ -6,6 +6,9 @@
  * ====================================================================
  */
 
+#ifndef HEADER_MODES_LOCAL_H
+#define HEADER_MODES_LOCAL_H
+
 #include <endian.h>
 
 #include <openssl/opensslconf.h>
@@ -61,3 +64,5 @@ struct ccm128_context {
 };
 
 __END_HIDDEN_DECLS
+
+#endif /* HEADER_MODES_LOCAL_H */
diff --git a/src/lib/libcrypto/rc2/rc2_local.h b/src/lib/libcrypto/rc2/rc2_local.h
index dd5598760e..885b17aa5e 100644
--- a/src/lib/libcrypto/rc2/rc2_local.h
+++ b/src/lib/libcrypto/rc2/rc2_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc2_local.h,v 1.3 2024/03/29 05:03:48 jsing Exp $ */
+/* $OpenBSD: rc2_local.h,v 1.4 2025/11/26 10:19:57 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,6 +56,9 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef HEADER_RC2_LOCAL_H
+#define HEADER_RC2_LOCAL_H
+
 #undef c2l
 #define c2l(c,l)        (l =((unsigned long)(*((c)++)))    ,            \
                          l|=((unsigned long)(*((c)++)))<< 8L,           \
@@ -110,3 +113,5 @@
         x2=(t<<3)|(t>>13);                                              \
         t=(x3+(x0& ~x2)+(x1&x2)+ *(p0++))&0xffff;                       \
         x3=(t<<5)|(t>>11);
+
+#endif /* HEADER_RC2_LOCAL_H */
diff --git a/src/lib/libcrypto/rsa/rsa_local.h b/src/lib/libcrypto/rsa/rsa_local.h
index 3f88b952a2..a026a488b6 100644
--- a/src/lib/libcrypto/rsa/rsa_local.h
+++ b/src/lib/libcrypto/rsa/rsa_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_local.h,v 1.10 2025/01/05 15:39:12 tb Exp $ */
+/* $OpenBSD: rsa_local.h,v 1.11 2025/11/26 10:19:57 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,6 +56,9 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef HEADER_RSA_LOCAL_H
+#define HEADER_RSA_LOCAL_H
+
 __BEGIN_HIDDEN_DECLS
 
 #define RSA_MIN_MODULUS_BITS    512
@@ -152,3 +155,5 @@ int BN_BLINDING_is_local(BN_BLINDING *b);
 BN_BLINDING *RSA_setup_blinding(RSA *rsa, BN_CTX *ctx);
 
 __END_HIDDEN_DECLS
+
+#endif /* HEADER_RSA_LOCAL_H */