diff options
author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 00:45:57 +0200 |
---|---|---|
committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 20:26:36 +0200 |
commit | ae4186b00487762f581b2276ba83e5214e0e7ee1 (patch) | |
tree | 78787c492eea42ddde78a9423aa1b507ffee162a /include/internal | |
parent | 8c78f0ec63f3e16bac1b888dbabf2b6c2d53a1ae (diff) |
Fix header file include guard names
Make the include guards consistent by renaming them systematically according
to the naming conventions below
For the public header files (in the 'include/openssl' directory), the guard
names try to match the path specified in the include directives, with
all letters converted to upper case and '/' and '.' replaced by '_'. For the
private header files files, an extra 'OSSL_' is added as prefix.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9333)
Diffstat (limited to 'include/internal')
-rw-r--r-- | include/internal/bio.h | 4 | ||||
-rw-r--r-- | include/internal/conf.h | 4 | ||||
-rw-r--r-- | include/internal/constant_time.h | 6 | ||||
-rw-r--r-- | include/internal/cryptlib.h | 4 | ||||
-rw-r--r-- | include/internal/dane.h | 6 | ||||
-rw-r--r-- | include/internal/dso.h | 4 | ||||
-rw-r--r-- | include/internal/dsoerr.h | 4 | ||||
-rw-r--r-- | include/internal/err.h | 4 | ||||
-rw-r--r-- | include/internal/md5_sha1.h | 6 | ||||
-rw-r--r-- | include/internal/nelem.h | 4 | ||||
-rw-r--r-- | include/internal/numbers.h | 4 | ||||
-rw-r--r-- | include/internal/o_dir.h | 4 | ||||
-rw-r--r-- | include/internal/packet.h | 6 | ||||
-rw-r--r-- | include/internal/property.h | 4 | ||||
-rw-r--r-- | include/internal/propertyerr.h | 4 | ||||
-rw-r--r-- | include/internal/refcount.h | 4 | ||||
-rw-r--r-- | include/internal/sha3.h | 6 | ||||
-rw-r--r-- | include/internal/sm3.h | 6 | ||||
-rw-r--r-- | include/internal/sockets.h | 4 | ||||
-rw-r--r-- | include/internal/sslconf.h | 4 |
20 files changed, 46 insertions, 46 deletions
diff --git a/include/internal/bio.h b/include/internal/bio.h index 8f368e36b3..2fb0d5cb76 100644 --- a/include/internal/bio.h +++ b/include/internal/bio.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_INTERNAL_BIO_H -# define HEADER_INTERNAL_BIO_H +#ifndef OSSL_INTERNAL_BIO_H +# define OSSL_INTERNAL_BIO_H #include <openssl/bio.h> diff --git a/include/internal/conf.h b/include/internal/conf.h index 389cdfd75b..1e7ab2cedf 100644 --- a/include/internal/conf.h +++ b/include/internal/conf.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_INTERNAL_CONF_H -# define HEADER_INTERNAL_CONF_H +#ifndef OSSL_INTERNAL_CONF_H +# define OSSL_INTERNAL_CONF_H #include <openssl/conf.h> diff --git a/include/internal/constant_time.h b/include/internal/constant_time.h index f7b264ee70..d98dae9545 100644 --- a/include/internal/constant_time.h +++ b/include/internal/constant_time.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_CONSTANT_TIME_LOCL_H -# define HEADER_CONSTANT_TIME_LOCL_H +#ifndef OSSL_INTERNAL_CONSTANT_TIME_H +# define OSSL_INTERNAL_CONSTANT_TIME_H # include <stdlib.h> # include <string.h> @@ -384,4 +384,4 @@ static ossl_inline void constant_time_lookup(void *out, */ void err_clear_last_constant_time(int clear); -#endif /* HEADER_CONSTANT_TIME_LOCL_H */ +#endif /* OSSL_INTERNAL_CONSTANT_TIME_H */ diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h index cfac74a328..f17816425d 100644 --- a/include/internal/cryptlib.h +++ b/include/internal/cryptlib.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_CRYPTLIB_H -# define HEADER_CRYPTLIB_H +#ifndef OSSL_INTERNAL_CRYPTLIB_H +# define OSSL_INTERNAL_CRYPTLIB_H # include <stdlib.h> # include <string.h> diff --git a/include/internal/dane.h b/include/internal/dane.h index 9a6432dad0..d9bae2b9f7 100644 --- a/include/internal/dane.h +++ b/include/internal/dane.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_INTERNAL_DANE_H -#define HEADER_INTERNAL_DANE_H +#ifndef OSSL_INTERNAL_DANE_H +#define OSSL_INTERNAL_DANE_H #include <openssl/safestack.h> @@ -100,4 +100,4 @@ struct ssl_dane_st { #define DANETLS_HAS_DANE_TA(dane) ((dane)&&((dane)->umask & DANETLS_DANE_TA_MASK)) #define DANETLS_HAS_DANE_EE(dane) ((dane)&&((dane)->umask & DANETLS_DANE_EE_MASK)) -#endif /* HEADER_INTERNAL_DANE_H */ +#endif /* OSSL_INTERNAL_DANE_H */ diff --git a/include/internal/dso.h b/include/internal/dso.h index 63881beffb..76cb3c6e0a 100644 --- a/include/internal/dso.h +++ b/include/internal/dso.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_H -# define HEADER_DSO_H +#ifndef OSSL_INTERNAL_DSO_H +# define OSSL_INTERNAL_DSO_H # include <openssl/crypto.h> # include "internal/dsoerr.h" diff --git a/include/internal/dsoerr.h b/include/internal/dsoerr.h index da51e5f6fd..9ddb9cff4d 100644 --- a/include/internal/dsoerr.h +++ b/include/internal/dsoerr.h @@ -8,8 +8,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSOERR_H -# define HEADER_DSOERR_H +#ifndef OSSL_INTERNAL_DSOERR_H +# define OSSL_INTERNAL_DSOERR_H # include <openssl/opensslconf.h> # include <openssl/symhacks.h> diff --git a/include/internal/err.h b/include/internal/err.h index 15511c7bec..8cb72ae370 100644 --- a/include/internal/err.h +++ b/include/internal/err.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef INTERNAL_ERR_H -# define INTERNAL_ERR_H +#ifndef OSSL_INTERNAL_ERR_H +# define OSSL_INTERNAL_ERR_H void err_free_strings_int(void); diff --git a/include/internal/md5_sha1.h b/include/internal/md5_sha1.h index 0f1f7350fb..3e80fdcf97 100644 --- a/include/internal/md5_sha1.h +++ b/include/internal/md5_sha1.h @@ -8,8 +8,8 @@ */ /* TODO(3.0) Move this header into provider when dependencies are removed */ -#ifndef HEADER_MD5_SHA1_H -# define HEADER_MD5_SHA1_H +#ifndef OSSL_INTERNAL_MD5_SHA1_H +# define OSSL_INTERNAL_MD5_SHA1_H # include <openssl/opensslconf.h> @@ -34,4 +34,4 @@ int md5_sha1_ctrl(MD5_SHA1_CTX *mctx, int cmd, int mslen, void *ms); # endif /* OPENSSL_NO_MD5 */ -#endif /* HEADER_MD5_SHA1_H */ +#endif /* OSSL_INTERNAL_MD5_SHA1_H */ diff --git a/include/internal/nelem.h b/include/internal/nelem.h index e599242508..0c32483fc5 100644 --- a/include/internal/nelem.h +++ b/include/internal/nelem.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_NELEM_H -# define HEADER_NELEM_H +#ifndef OSSL_INTERNAL_NELEM_H +# define OSSL_INTERNAL_NELEM_H # define OSSL_NELEM(x) (sizeof(x)/sizeof((x)[0])) #endif diff --git a/include/internal/numbers.h b/include/internal/numbers.h index f3c6bbc970..db65559c6b 100644 --- a/include/internal/numbers.h +++ b/include/internal/numbers.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_NUMBERS_H -# define HEADER_NUMBERS_H +#ifndef OSSL_INTERNAL_NUMBERS_H +# define OSSL_INTERNAL_NUMBERS_H # include <limits.h> diff --git a/include/internal/o_dir.h b/include/internal/o_dir.h index 72cdb5530c..220cf173e6 100644 --- a/include/internal/o_dir.h +++ b/include/internal/o_dir.h @@ -36,8 +36,8 @@ * SUCH DAMAGE. */ -#ifndef O_DIR_H -# define O_DIR_H +#ifndef OSSL_INTERNAL_O_DIR_H +# define OSSL_INTERNAL_O_DIR_H typedef struct OPENSSL_dir_context_st OPENSSL_DIR_CTX; diff --git a/include/internal/packet.h b/include/internal/packet.h index 69a6bd1308..c03d917da7 100644 --- a/include/internal/packet.h +++ b/include/internal/packet.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_PACKET_LOCL_H -# define HEADER_PACKET_LOCL_H +#ifndef OSSL_INTERNAL_PACKET_H +# define OSSL_INTERNAL_PACKET_H # include <string.h> # include <openssl/bn.h> @@ -881,4 +881,4 @@ int WPACKET_is_null_buf(WPACKET *pkt); /* Release resources in a WPACKET if a failure has occurred. */ void WPACKET_cleanup(WPACKET *pkt); -#endif /* HEADER_PACKET_LOCL_H */ +#endif /* OSSL_INTERNAL_PACKET_H */ diff --git a/include/internal/property.h b/include/internal/property.h index 842c7dea17..a3a4a62be6 100644 --- a/include/internal/property.h +++ b/include/internal/property.h @@ -8,8 +8,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_PROPERTY_H -# define HEADER_PROPERTY_H +#ifndef OSSL_INTERNAL_PROPERTY_H +# define OSSL_INTERNAL_PROPERTY_H #include "internal/cryptlib.h" diff --git a/include/internal/propertyerr.h b/include/internal/propertyerr.h index a5d5125770..ebbd8619b2 100644 --- a/include/internal/propertyerr.h +++ b/include/internal/propertyerr.h @@ -8,8 +8,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_PROPERR_H -# define HEADER_PROPERR_H +#ifndef OSSL_INTERNAL_PROPERTYERR_H +# define OSSL_INTERNAL_PROPERTYERR_H # include <openssl/opensslconf.h> # include <openssl/symhacks.h> diff --git a/include/internal/refcount.h b/include/internal/refcount.h index 1619b28932..4feecf971c 100644 --- a/include/internal/refcount.h +++ b/include/internal/refcount.h @@ -6,8 +6,8 @@ * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html */ -#ifndef HEADER_INTERNAL_REFCOUNT_H -# define HEADER_INTERNAL_REFCOUNT_H +#ifndef OSSL_INTERNAL_REFCOUNT_H +# define OSSL_INTERNAL_REFCOUNT_H /* Used to checking reference counts, most while doing perl5 stuff :-) */ # if defined(OPENSSL_NO_STDIO) diff --git a/include/internal/sha3.h b/include/internal/sha3.h index b07d50c6c2..81ba41ac0d 100644 --- a/include/internal/sha3.h +++ b/include/internal/sha3.h @@ -8,8 +8,8 @@ */ /* TODO(3.0) Move this header into provider when dependencies are removed */ -#ifndef HEADER_INTERNAL_SHA3_H -# define HEADER_INTERNAL_SHA3_H +#ifndef OSSL_INTERNAL_SHA3_H +# define OSSL_INTERNAL_SHA3_H # include <openssl/e_os2.h> # include <stddef.h> @@ -49,4 +49,4 @@ int sha3_final(unsigned char *md, KECCAK1600_CTX *ctx); size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len, size_t r); -#endif /* HEADER_INTERNAL_SHA3_H */ +#endif /* OSSL_INTERNAL_SHA3_H */ diff --git a/include/internal/sm3.h b/include/internal/sm3.h index 2aef712e6a..51bb265fff 100644 --- a/include/internal/sm3.h +++ b/include/internal/sm3.h @@ -9,8 +9,8 @@ */ /* TODO(3.0) Move this header into provider when dependencies are removed */ -#ifndef HEADER_SM3_H -# define HEADER_SM3_H +#ifndef OSSL_INTERNAL_SM3_H +# define OSSL_INTERNAL_SM3_H # include <openssl/opensslconf.h> @@ -35,4 +35,4 @@ int sm3_init(SM3_CTX *c); int sm3_update(SM3_CTX *c, const void *data, size_t len); int sm3_final(unsigned char *md, SM3_CTX *c); -#endif /* HEADER_SM3_H */ +#endif /* OSSL_INTERNAL_SM3_H */ diff --git a/include/internal/sockets.h b/include/internal/sockets.h index 8e84f0b0f7..e444766dec 100644 --- a/include/internal/sockets.h +++ b/include/internal/sockets.h @@ -8,8 +8,8 @@ */ -#ifndef HEADER_INTERNAL_SOCKETS -# define HEADER_INTERNAL_SOCKETS +#ifndef OSSL_INTERNAL_SOCKETS_H +# define OSSL_INTERNAL_SOCKETS_H # if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI) # define NO_SYS_PARAM_H diff --git a/include/internal/sslconf.h b/include/internal/sslconf.h index 94e6724e61..9e635da98a 100644 --- a/include/internal/sslconf.h +++ b/include/internal/sslconf.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_SSLCONF_H -# define HEADER_SSLCONF_H +#ifndef OSSL_INTERNAL_SSLCONF_H +# define OSSL_INTERNAL_SSLCONF_H typedef struct ssl_conf_cmd_st SSL_CONF_CMD; |