Latest update.

test/ossl_shim/async_bio.h

@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_ASYNC_BIO
-#define HEADER_ASYNC_BIO
+#ifndef OSSL_TEST_SHIM_ASYNC_BIO_H
+#define OSSL_TEST_SHIM_ASYNC_BIO_H
 
 #include <openssl/base.h>
 #include <openssl/bio.h>
@@ -36,4 +36,4 @@ void AsyncBioAllowWrite(BIO *bio, size_t count);
 void AsyncBioEnforceWriteQuota(BIO *bio, bool enforce);
 
 
-#endif  // HEADER_ASYNC_BIO
+#endif  // OSSL_TEST_SHIM_ASYNC_BIO_H

test/ossl_shim/include/openssl/base.h

@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OPENSSL_HEADER_BASE_H
-#define OPENSSL_HEADER_BASE_H
+#ifndef OSSL_TEST_SHIM_INCLUDE_OPENSSL_BASE_H
+#define OSSL_TEST_SHIM_INCLUDE_OPENSSL_BASE_H
 
 /* Needed for BORINGSSL_MAKE_DELETER */
 # include <openssl/bio.h>
@@ -108,4 +108,4 @@ BORINGSSL_MAKE_DELETER(SSL_SESSION, SSL_SESSION_free)
 }  /* extern C++ */
 
 
-#endif  /* OPENSSL_HEADER_BASE_H */
+#endif  /* OSSL_TEST_SHIM_INCLUDE_OPENSSL_BASE_H */

test/ossl_shim/packeted_bio.h

@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_PACKETED_BIO
-#define HEADER_PACKETED_BIO
+#ifndef OSSL_TEST_SHIM_PACKETED_BIO_H
+#define OSSL_TEST_SHIM_PACKETED_BIO_H
 
 #include <openssl/base.h>
 #include <openssl/bio.h>
@@ -32,4 +32,4 @@ timeval PacketedBioGetClock(const BIO *bio);
 bool PacketedBioAdvanceClock(BIO *bio);
 
 
-#endif  // HEADER_PACKETED_BIO
+#endif  // OSSL_TEST_SHIM_PACKETED_BIO_H

test/ossl_shim/test_config.h

@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_TEST_CONFIG
-#define HEADER_TEST_CONFIG
+#ifndef OSSL_TEST_SHIM_TEST_CONFIG_H
+#define OSSL_TEST_SHIM_TEST_CONFIG_H
 
 #include <string>
 #include <vector>
@@ -85,4 +85,4 @@ struct TestConfig {
 bool ParseConfig(int argc, char **argv, TestConfig *out_config);
 
 
-#endif  // HEADER_TEST_CONFIG
+#endif  // OSSL_TEST_SHIM_TEST_CONFIG_H