Rewrite header guards
When we have both crypto/foo/internal.h and
crypto/fipsmodule/foo/internal.h, it's important that we put FIPSMODULE
into the header guard.
At that point, we probably should just put CRYPTO in there too, and
indeed we have been putting it in a few places. Go ahead and rewrite
them all with some clever shell scripting.
Change-Id: If61586f1d49ed477023530c36e9ed74373d4d1e6
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/77727
Reviewed-by: Bob Beck <bbe@google.com>
Auto-Submit: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/STYLE.md b/STYLE.md
index 98a8159..1b6bd0b 100644
--- a/STYLE.md
+++ b/STYLE.md
@@ -143,7 +143,7 @@
Name public headers like `include/openssl/evp.h` with header guards like
`OPENSSL_HEADER_EVP_H`. Name internal headers like
`crypto/ec/internal.h` with header guards like
-`OPENSSL_HEADER_EC_INTERNAL_H`.
+`OPENSSL_HEADER_CRYPTO_EC_INTERNAL_H`.
Name enums like `enum unix_hacker_t`. For instance:
diff --git a/crypto/asn1/internal.h b/crypto/asn1/internal.h
index 302dd71..8c31f52 100644
--- a/crypto/asn1/internal.h
+++ b/crypto/asn1/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_ASN1_INTERNAL_H
-#define OPENSSL_HEADER_ASN1_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_ASN1_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_ASN1_INTERNAL_H
#include <time.h>
@@ -219,4 +219,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_ASN1_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_ASN1_INTERNAL_H
diff --git a/crypto/bio/internal.h b/crypto/bio/internal.h
index 8c44d2d..50cda5c 100644
--- a/crypto/bio/internal.h
+++ b/crypto/bio/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_BIO_INTERNAL_H
-#define OPENSSL_HEADER_BIO_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_BIO_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_BIO_INTERNAL_H
#include <openssl/base.h>
@@ -76,4 +76,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_BIO_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_BIO_INTERNAL_H
diff --git a/crypto/bytestring/internal.h b/crypto/bytestring/internal.h
index f2ea91a..110fb95 100644
--- a/crypto/bytestring/internal.h
+++ b/crypto/bytestring/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_BYTESTRING_INTERNAL_H
-#define OPENSSL_HEADER_BYTESTRING_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_BYTESTRING_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_BYTESTRING_INTERNAL_H
#include <openssl/base.h>
@@ -71,4 +71,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_BYTESTRING_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_BYTESTRING_INTERNAL_H
diff --git a/crypto/chacha/internal.h b/crypto/chacha/internal.h
index 9abf6b5..ec0c79f 100644
--- a/crypto/chacha/internal.h
+++ b/crypto/chacha/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_CHACHA_INTERNAL
-#define OPENSSL_HEADER_CHACHA_INTERNAL
+#ifndef OPENSSL_HEADER_CRYPTO_CHACHA_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_CHACHA_INTERNAL_H
#include <openssl/base.h>
@@ -99,4 +99,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_CHACHA_INTERNAL
+#endif // OPENSSL_HEADER_CRYPTO_CHACHA_INTERNAL_H
diff --git a/crypto/cipher/internal.h b/crypto/cipher/internal.h
index c0fb07a..3b0fb7c 100644
--- a/crypto/cipher/internal.h
+++ b/crypto/cipher/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_CIPHER_EXTRA_INTERNAL_H
-#define OPENSSL_HEADER_CIPHER_EXTRA_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_CIPHER_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_CIPHER_INTERNAL_H
#include <assert.h>
#include <stdlib.h>
@@ -237,4 +237,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_CIPHER_EXTRA_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_CIPHER_INTERNAL_H
diff --git a/crypto/curve25519/internal.h b/crypto/curve25519/internal.h
index c8797d4..17efc95 100644
--- a/crypto/curve25519/internal.h
+++ b/crypto/curve25519/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_CURVE25519_INTERNAL_H
-#define OPENSSL_HEADER_CURVE25519_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_CURVE25519_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_CURVE25519_INTERNAL_H
#include <openssl/curve25519.h>
@@ -161,4 +161,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_CURVE25519_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_CURVE25519_INTERNAL_H
diff --git a/crypto/des/internal.h b/crypto/des/internal.h
index 78e193a..e51c6e3 100644
--- a/crypto/des/internal.h
+++ b/crypto/des/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_DES_INTERNAL_H
-#define OPENSSL_HEADER_DES_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_DES_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_DES_INTERNAL_H
#include <openssl/base.h>
#include <openssl/des.h>
@@ -146,4 +146,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_DES_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_DES_INTERNAL_H
diff --git a/crypto/dsa/internal.h b/crypto/dsa/internal.h
index e987774..537c576 100644
--- a/crypto/dsa/internal.h
+++ b/crypto/dsa/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_DSA_INTERNAL_H
-#define OPENSSL_HEADER_DSA_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_DSA_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_DSA_INTERNAL_H
#include <openssl/dsa.h>
@@ -51,4 +51,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_DSA_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_DSA_INTERNAL_H
diff --git a/crypto/ec/internal.h b/crypto/ec/internal.h
index 86e19e2..8dbe4a7 100644
--- a/crypto/ec/internal.h
+++ b/crypto/ec/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_EC_EXTRA_INTERNAL_H
-#define OPENSSL_HEADER_EC_EXTRA_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_EC_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_EC_INTERNAL_H
#include <openssl/ec.h>
@@ -75,4 +75,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_EC_EXTRA_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_EC_INTERNAL_H
diff --git a/crypto/evp/internal.h b/crypto/evp/internal.h
index da07c27..8307aa4 100644
--- a/crypto/evp/internal.h
+++ b/crypto/evp/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_EVP_INTERNAL_H
-#define OPENSSL_HEADER_EVP_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_EVP_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_EVP_INTERNAL_H
#include <openssl/base.h>
@@ -265,4 +265,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_EVP_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_EVP_INTERNAL_H
diff --git a/crypto/fipsmodule/aes/internal.h b/crypto/fipsmodule/aes/internal.h
index b71c20d..23766fe 100644
--- a/crypto/fipsmodule/aes/internal.h
+++ b/crypto/fipsmodule/aes/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_AES_INTERNAL_H
-#define OPENSSL_HEADER_AES_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_FIPSMODULE_AES_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_FIPSMODULE_AES_INTERNAL_H
#include <stdlib.h>
@@ -571,4 +571,4 @@
} // extern C
-#endif // OPENSSL_HEADER_AES_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_FIPSMODULE_AES_INTERNAL_H
diff --git a/crypto/fipsmodule/bcm_interface.h b/crypto/fipsmodule/bcm_interface.h
index 204c36f..a70636d 100644
--- a/crypto/fipsmodule/bcm_interface.h
+++ b/crypto/fipsmodule/bcm_interface.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_CRYPTO_BCM_INTERFACE_H
-#define OPENSSL_HEADER_CRYPTO_BCM_INTERFACE_H
+#ifndef OPENSSL_HEADER_CRYPTO_FIPSMODULE_BCM_INTERFACE_H
+#define OPENSSL_HEADER_CRYPTO_FIPSMODULE_BCM_INTERFACE_H
// For the moment, we reach out for AES_KEY.
#include <openssl/aes.h>
@@ -822,4 +822,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_CRYPTO_BCM_INTERFACE_H
+#endif // OPENSSL_HEADER_CRYPTO_FIPSMODULE_BCM_INTERFACE_H
diff --git a/crypto/fipsmodule/bn/internal.h b/crypto/fipsmodule/bn/internal.h
index 9e14fed..938d275 100644
--- a/crypto/fipsmodule/bn/internal.h
+++ b/crypto/fipsmodule/bn/internal.h
@@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_BN_INTERNAL_H
-#define OPENSSL_HEADER_BN_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_FIPSMODULE_BN_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_FIPSMODULE_BN_INTERNAL_H
#include <openssl/bn.h>
@@ -725,4 +725,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_BN_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_FIPSMODULE_BN_INTERNAL_H
diff --git a/crypto/fipsmodule/bn/rsaz_exp.h b/crypto/fipsmodule/bn/rsaz_exp.h
index e0e9aa2..2e1d59e 100644
--- a/crypto/fipsmodule/bn/rsaz_exp.h
+++ b/crypto/fipsmodule/bn/rsaz_exp.h
@@ -17,8 +17,8 @@
// (1) Intel Corporation, Israel Development Center, Haifa, Israel
// (2) University of Haifa, Israel
-#ifndef OPENSSL_HEADER_BN_RSAZ_EXP_H
-#define OPENSSL_HEADER_BN_RSAZ_EXP_H
+#ifndef OPENSSL_HEADER_CRYPTO_FIPSMODULE_BN_RSAZ_EXP_H
+#define OPENSSL_HEADER_CRYPTO_FIPSMODULE_BN_RSAZ_EXP_H
#include <openssl/bn.h>
@@ -108,4 +108,4 @@
} // extern "C"
#endif
-#endif // OPENSSL_HEADER_BN_RSAZ_EXP_H
+#endif // OPENSSL_HEADER_CRYPTO_FIPSMODULE_BN_RSAZ_EXP_H
diff --git a/crypto/fipsmodule/cipher/internal.h b/crypto/fipsmodule/cipher/internal.h
index d4a06f7..c5373bb 100644
--- a/crypto/fipsmodule/cipher/internal.h
+++ b/crypto/fipsmodule/cipher/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_CIPHER_INTERNAL_H
-#define OPENSSL_HEADER_CIPHER_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_FIPSMODULE_CIPHER_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_FIPSMODULE_CIPHER_INTERNAL_H
#include <openssl/base.h>
@@ -110,4 +110,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_CIPHER_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_FIPSMODULE_CIPHER_INTERNAL_H
diff --git a/crypto/fipsmodule/delocate.h b/crypto/fipsmodule/delocate.h
index e104d6e..ae7781e 100644
--- a/crypto/fipsmodule/delocate.h
+++ b/crypto/fipsmodule/delocate.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_FIPSMODULE_DELOCATE_H
-#define OPENSSL_HEADER_FIPSMODULE_DELOCATE_H
+#ifndef OPENSSL_HEADER_CRYPTO_FIPSMODULE_DELOCATE_H
+#define OPENSSL_HEADER_CRYPTO_FIPSMODULE_DELOCATE_H
#include <openssl/base.h>
@@ -96,4 +96,4 @@
#define DEFINE_LOCAL_DATA(type, name) DEFINE_DATA(type, name, static const)
-#endif // OPENSSL_HEADER_FIPSMODULE_DELOCATE_H
+#endif // OPENSSL_HEADER_CRYPTO_FIPSMODULE_DELOCATE_H
diff --git a/crypto/fipsmodule/digest/internal.h b/crypto/fipsmodule/digest/internal.h
index 0cef38e..0e850c9 100644
--- a/crypto/fipsmodule/digest/internal.h
+++ b/crypto/fipsmodule/digest/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_DIGEST_INTERNAL_H
-#define OPENSSL_HEADER_DIGEST_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_FIPSMODULE_DIGEST_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_FIPSMODULE_DIGEST_INTERNAL_H
#include <openssl/base.h>
@@ -67,4 +67,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_DIGEST_INTERNAL
+#endif // OPENSSL_HEADER_CRYPTO_FIPSMODULE_DIGEST_INTERNAL_H
diff --git a/crypto/fipsmodule/digest/md32_common.h b/crypto/fipsmodule/digest/md32_common.h
index 6cba40a..b64f20b 100644
--- a/crypto/fipsmodule/digest/md32_common.h
+++ b/crypto/fipsmodule/digest/md32_common.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_DIGEST_MD32_COMMON_H
-#define OPENSSL_HEADER_DIGEST_MD32_COMMON_H
+#ifndef OPENSSL_HEADER_CRYPTO_FIPSMODULE_DIGEST_MD32_COMMON_H
+#define OPENSSL_HEADER_CRYPTO_FIPSMODULE_DIGEST_MD32_COMMON_H
#include <openssl/base.h>
@@ -158,4 +158,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_DIGEST_MD32_COMMON_H
+#endif // OPENSSL_HEADER_CRYPTO_FIPSMODULE_DIGEST_MD32_COMMON_H
diff --git a/crypto/fipsmodule/ec/internal.h b/crypto/fipsmodule/ec/internal.h
index 4599c3c..2c610ba 100644
--- a/crypto/fipsmodule/ec/internal.h
+++ b/crypto/fipsmodule/ec/internal.h
@@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_EC_INTERNAL_H
-#define OPENSSL_HEADER_EC_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_FIPSMODULE_EC_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_FIPSMODULE_EC_INTERNAL_H
#include <openssl/base.h>
@@ -706,4 +706,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_EC_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_FIPSMODULE_EC_INTERNAL_H
diff --git a/crypto/fipsmodule/ec/p256-nistz.h b/crypto/fipsmodule/ec/p256-nistz.h
index be6b5ec..326e38d 100644
--- a/crypto/fipsmodule/ec/p256-nistz.h
+++ b/crypto/fipsmodule/ec/p256-nistz.h
@@ -21,8 +21,8 @@
// S.Gueron and V.Krasnov, "Fast Prime Field Elliptic Curve Cryptography with
// 256 Bit Primes"
-#ifndef OPENSSL_HEADER_EC_P256_X86_64_H
-#define OPENSSL_HEADER_EC_P256_X86_64_H
+#ifndef OPENSSL_HEADER_CRYPTO_FIPSMODULE_EC_P256_NISTZ_H
+#define OPENSSL_HEADER_CRYPTO_FIPSMODULE_EC_P256_NISTZ_H
#include <openssl/base.h>
@@ -204,4 +204,4 @@
} // extern C++
#endif
-#endif // OPENSSL_HEADER_EC_P256_X86_64_H
+#endif // OPENSSL_HEADER_CRYPTO_FIPSMODULE_EC_P256_NISTZ_H
diff --git a/crypto/fipsmodule/keccak/internal.h b/crypto/fipsmodule/keccak/internal.h
index f5a15f5..273e666 100644
--- a/crypto/fipsmodule/keccak/internal.h
+++ b/crypto/fipsmodule/keccak/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_CRYPTO_KECCAK_INTERNAL_H
-#define OPENSSL_HEADER_CRYPTO_KECCAK_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_FIPSMODULE_KECCAK_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_FIPSMODULE_KECCAK_INTERNAL_H
#include <openssl/base.h>
@@ -67,4 +67,4 @@
}
#endif
-#endif // OPENSSL_HEADER_CRYPTO_KECCAK_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_FIPSMODULE_KECCAK_INTERNAL_H
diff --git a/crypto/fipsmodule/rand/internal.h b/crypto/fipsmodule/rand/internal.h
index 7ffe617..e791edf 100644
--- a/crypto/fipsmodule/rand/internal.h
+++ b/crypto/fipsmodule/rand/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_CRYPTO_RAND_INTERNAL_H
-#define OPENSSL_HEADER_CRYPTO_RAND_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_FIPSMODULE_RAND_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_FIPSMODULE_RAND_INTERNAL_H
#include <openssl/aes.h>
#include <openssl/ctrdrbg.h>
@@ -81,4 +81,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_CRYPTO_RAND_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_FIPSMODULE_RAND_INTERNAL_H
diff --git a/crypto/fipsmodule/rsa/internal.h b/crypto/fipsmodule/rsa/internal.h
index 6636104..94719ce 100644
--- a/crypto/fipsmodule/rsa/internal.h
+++ b/crypto/fipsmodule/rsa/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_RSA_INTERNAL_H
-#define OPENSSL_HEADER_RSA_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_FIPSMODULE_RSA_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_FIPSMODULE_RSA_INTERNAL_H
#include <openssl/base.h>
@@ -167,4 +167,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_RSA_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_FIPSMODULE_RSA_INTERNAL_H
diff --git a/crypto/fipsmodule/service_indicator/internal.h b/crypto/fipsmodule/service_indicator/internal.h
index 182aefc..5b69172 100644
--- a/crypto/fipsmodule/service_indicator/internal.h
+++ b/crypto/fipsmodule/service_indicator/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_SERVICE_INDICATOR_INTERNAL_H
-#define OPENSSL_HEADER_SERVICE_INDICATOR_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_FIPSMODULE_SERVICE_INDICATOR_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_FIPSMODULE_SERVICE_INDICATOR_INTERNAL_H
#include <openssl/base.h>
#include <openssl/service_indicator.h>
@@ -86,4 +86,4 @@
#endif // BORINGSSL_FIPS
-#endif // OPENSSL_HEADER_SERVICE_INDICATOR_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_FIPSMODULE_SERVICE_INDICATOR_INTERNAL_H
diff --git a/crypto/fipsmodule/sha/internal.h b/crypto/fipsmodule/sha/internal.h
index bd29719..d68bf0d 100644
--- a/crypto/fipsmodule/sha/internal.h
+++ b/crypto/fipsmodule/sha/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_SHA_INTERNAL_H
-#define OPENSSL_HEADER_SHA_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_FIPSMODULE_SHA_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_FIPSMODULE_SHA_INTERNAL_H
#include <openssl/base.h>
@@ -211,4 +211,4 @@
} // extern "C"
#endif
-#endif // OPENSSL_HEADER_SHA_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_FIPSMODULE_SHA_INTERNAL_H
diff --git a/crypto/hrss/internal.h b/crypto/hrss/internal.h
index 44066cf..ab7ebc8 100644
--- a/crypto/hrss/internal.h
+++ b/crypto/hrss/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_HRSS_INTERNAL_H
-#define OPENSSL_HEADER_HRSS_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_HRSS_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_HRSS_INTERNAL_H
#include <openssl/base.h>
#include "../internal.h"
@@ -65,4 +65,4 @@
} // extern "C"
#endif
-#endif // !OPENSSL_HEADER_HRSS_INTERNAL_H
+#endif // !OPENSSL_HEADER_CRYPTO_HRSS_INTERNAL_H
diff --git a/crypto/lhash/internal.h b/crypto/lhash/internal.h
index 9208d58..cb09dfa 100644
--- a/crypto/lhash/internal.h
+++ b/crypto/lhash/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_LHASH_INTERNAL_H
-#define OPENSSL_HEADER_LHASH_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_LHASH_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_LHASH_INTERNAL_H
#include <openssl/lhash.h>
@@ -218,4 +218,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_LHASH_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_LHASH_INTERNAL_H
diff --git a/crypto/md5/internal.h b/crypto/md5/internal.h
index 501b389..5d38e3e 100644
--- a/crypto/md5/internal.h
+++ b/crypto/md5/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_MD5_INTERNAL_H
-#define OPENSSL_HEADER_MD5_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_MD5_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_MD5_INTERNAL_H
#include <openssl/base.h>
@@ -34,4 +34,4 @@
} // extern "C"
#endif
-#endif // OPENSSL_HEADER_MD5_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_MD5_INTERNAL_H
diff --git a/crypto/pem/internal.h b/crypto/pem/internal.h
index bda89a6..3178c11 100644
--- a/crypto/pem/internal.h
+++ b/crypto/pem/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_PEM_INTERNAL_H
-#define OPENSSL_HEADER_PEM_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_PEM_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_PEM_INTERNAL_H
#include <openssl/pem.h>
@@ -41,4 +41,4 @@
} // extern "C"
#endif
-#endif // OPENSSL_HEADER_PEM_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_PEM_INTERNAL_H
diff --git a/crypto/pkcs7/internal.h b/crypto/pkcs7/internal.h
index 7505e33..eaf292d 100644
--- a/crypto/pkcs7/internal.h
+++ b/crypto/pkcs7/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_PKCS7_INTERNAL_H
-#define OPENSSL_HEADER_PKCS7_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_PKCS7_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_PKCS7_INTERNAL_H
#include <openssl/base.h>
@@ -55,4 +55,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_PKCS7_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_PKCS7_INTERNAL_H
diff --git a/crypto/pkcs8/internal.h b/crypto/pkcs8/internal.h
index 20f76cd..06f17a6 100644
--- a/crypto/pkcs8/internal.h
+++ b/crypto/pkcs8/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_PKCS8_INTERNAL_H
-#define OPENSSL_HEADER_PKCS8_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_PKCS8_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_PKCS8_INTERNAL_H
#include <openssl/base.h>
#include <openssl/stack.h>
@@ -100,4 +100,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_PKCS8_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_PKCS8_INTERNAL_H
diff --git a/crypto/poly1305/internal.h b/crypto/poly1305/internal.h
index 0ef2a9c..3447b4f 100644
--- a/crypto/poly1305/internal.h
+++ b/crypto/poly1305/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_POLY1305_INTERNAL_H
-#define OPENSSL_HEADER_POLY1305_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_POLY1305_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_POLY1305_INTERNAL_H
#include <openssl/base.h>
#include <openssl/poly1305.h>
@@ -38,4 +38,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_POLY1305_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_POLY1305_INTERNAL_H
diff --git a/crypto/pool/internal.h b/crypto/pool/internal.h
index bb119b1..2533fc9 100644
--- a/crypto/pool/internal.h
+++ b/crypto/pool/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_POOL_INTERNAL_H
-#define OPENSSL_HEADER_POOL_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_POOL_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_POOL_INTERNAL_H
#include <openssl/lhash.h>
#include <openssl/thread.h>
@@ -48,4 +48,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_POOL_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_POOL_INTERNAL_H
diff --git a/crypto/rand/sysrand_internal.h b/crypto/rand/sysrand_internal.h
index 90931a2..30e3270 100644
--- a/crypto/rand/sysrand_internal.h
+++ b/crypto/rand/sysrand_internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_CRYPTO_SYSRAND_INTERNAL_H
-#define OPENSSL_HEADER_CRYPTO_SYSRAND_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_RAND_SYSRAND_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_RAND_SYSRAND_INTERNAL_H
#include <openssl/base.h>
@@ -34,4 +34,4 @@
#define OPENSSL_RAND_GETENTROPY
#endif
-#endif // OPENSSL_HEADER_CRYPTO__SYSRAND_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_RAND_SYSRAND_INTERNAL_H
diff --git a/crypto/rsa/internal.h b/crypto/rsa/internal.h
index 4e88afd..21552bf 100644
--- a/crypto/rsa/internal.h
+++ b/crypto/rsa/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_RSA_EXTRA_INTERNAL_H
-#define OPENSSL_HEADER_RSA_EXTRA_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_RSA_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_RSA_INTERNAL_H
#include <openssl/base.h>
@@ -33,4 +33,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_RSA_EXTRA_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_RSA_INTERNAL_H
diff --git a/crypto/spake2plus/internal.h b/crypto/spake2plus/internal.h
index 49a8a28..c5c99cd 100644
--- a/crypto/spake2plus/internal.h
+++ b/crypto/spake2plus/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_SPAKE2PLUS_INTERNAL_H
-#define OPENSSL_HEADER_SPAKE2PLUS_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_SPAKE2PLUS_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_SPAKE2PLUS_INTERNAL_H
#include <openssl/base.h>
@@ -201,4 +201,4 @@
BSSL_NAMESPACE_END
-#endif // OPENSSL_HEADER_SPAKE2PLUS_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_SPAKE2PLUS_INTERNAL_H
diff --git a/crypto/test/abi_test.h b/crypto/test/abi_test.h
index bb5ae94..ad65c57 100644
--- a/crypto/test/abi_test.h
+++ b/crypto/test/abi_test.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_ABI_TEST_H
-#define OPENSSL_HEADER_ABI_TEST_H
+#ifndef OPENSSL_HEADER_CRYPTO_TEST_ABI_TEST_H
+#define OPENSSL_HEADER_CRYPTO_TEST_ABI_TEST_H
#include <gtest/gtest.h>
@@ -479,4 +479,4 @@
#endif // SUPPORTS_ABI_TEST
-#endif // OPENSSL_HEADER_ABI_TEST_H
+#endif // OPENSSL_HEADER_CRYPTO_TEST_ABI_TEST_H
diff --git a/crypto/trust_token/internal.h b/crypto/trust_token/internal.h
index 308a8e8..208e9c3 100644
--- a/crypto/trust_token/internal.h
+++ b/crypto/trust_token/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_TRUST_TOKEN_INTERNAL_H
-#define OPENSSL_HEADER_TRUST_TOKEN_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_TRUST_TOKEN_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_TRUST_TOKEN_INTERNAL_H
#include <openssl/base.h>
#include <openssl/ec.h>
@@ -409,4 +409,4 @@
} // extern C++
#endif
-#endif // OPENSSL_HEADER_TRUST_TOKEN_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_TRUST_TOKEN_INTERNAL_H
diff --git a/crypto/x509/internal.h b/crypto/x509/internal.h
index 7e92c1f..1794d16 100644
--- a/crypto/x509/internal.h
+++ b/crypto/x509/internal.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_X509_INTERNAL_H
-#define OPENSSL_HEADER_X509_INTERNAL_H
+#ifndef OPENSSL_HEADER_CRYPTO_X509_INTERNAL_H
+#define OPENSSL_HEADER_CRYPTO_X509_INTERNAL_H
#include <openssl/base.h>
#include <openssl/evp.h>
@@ -552,4 +552,4 @@
} // extern C
#endif
-#endif // OPENSSL_HEADER_X509_INTERNAL_H
+#endif // OPENSSL_HEADER_CRYPTO_X509_INTERNAL_H
diff --git a/include/openssl/hpke.h b/include/openssl/hpke.h
index c47be4f..ca10731 100644
--- a/include/openssl/hpke.h
+++ b/include/openssl/hpke.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef OPENSSL_HEADER_CRYPTO_HPKE_INTERNAL_H
-#define OPENSSL_HEADER_CRYPTO_HPKE_INTERNAL_H
+#ifndef OPENSSL_HEADER_HPKE_H
+#define OPENSSL_HEADER_HPKE_H
#include <openssl/aead.h>
#include <openssl/base.h> // IWYU pragma: export
@@ -406,4 +406,4 @@
} // extern C++
#endif
-#endif // OPENSSL_HEADER_CRYPTO_HPKE_INTERNAL_H
+#endif // OPENSSL_HEADER_HPKE_H
