From 12f0b7f7c165293139ae84e7743ac35e9daec51f Mon Sep 17 00:00:00 2001 From: tb <> Date: Tue, 5 Nov 2024 06:09:12 +0000 Subject: cryptlib.h: adjust header guard for upcoming surgery It is gross that an internal detail leaked into a public header, but, hey, it's openssl. No hack is too terrible to appear in this library. opensslconf.h needs major pruning but the day that happens is not today. ok jsing --- src/lib/libcrypto/arch/aarch64/opensslconf.h | 2 +- src/lib/libcrypto/arch/alpha/opensslconf.h | 2 +- src/lib/libcrypto/arch/amd64/opensslconf.h | 2 +- src/lib/libcrypto/arch/arm/opensslconf.h | 2 +- src/lib/libcrypto/arch/hppa/opensslconf.h | 2 +- src/lib/libcrypto/arch/i386/opensslconf.h | 2 +- src/lib/libcrypto/arch/m88k/opensslconf.h | 2 +- src/lib/libcrypto/arch/mips64/opensslconf.h | 2 +- src/lib/libcrypto/arch/powerpc/opensslconf.h | 2 +- src/lib/libcrypto/arch/powerpc64/opensslconf.h | 2 +- src/lib/libcrypto/arch/riscv64/opensslconf.h | 2 +- src/lib/libcrypto/arch/sh/opensslconf.h | 2 +- src/lib/libcrypto/arch/sparc64/opensslconf.h | 2 +- src/lib/libcrypto/cryptlib.h | 6 +++--- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/lib/libcrypto/arch/aarch64/opensslconf.h b/src/lib/libcrypto/arch/aarch64/opensslconf.h index b41109e284..fed209a008 100644 --- a/src/lib/libcrypto/arch/aarch64/opensslconf.h +++ b/src/lib/libcrypto/arch/aarch64/opensslconf.h @@ -1,7 +1,7 @@ #include <openssl/opensslfeatures.h> /* crypto/opensslconf.h.in */ -#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) #define OPENSSLDIR "/etc/ssl" #endif diff --git a/src/lib/libcrypto/arch/alpha/opensslconf.h b/src/lib/libcrypto/arch/alpha/opensslconf.h index 6f1bfcc6d9..1dbd8f22fa 100644 --- a/src/lib/libcrypto/arch/alpha/opensslconf.h +++ b/src/lib/libcrypto/arch/alpha/opensslconf.h @@ -1,7 +1,7 @@ #include <openssl/opensslfeatures.h> /* crypto/opensslconf.h.in */ -#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) #define OPENSSLDIR "/etc/ssl" #endif diff --git a/src/lib/libcrypto/arch/amd64/opensslconf.h b/src/lib/libcrypto/arch/amd64/opensslconf.h index 8faa79741a..7615744a6b 100644 --- a/src/lib/libcrypto/arch/amd64/opensslconf.h +++ b/src/lib/libcrypto/arch/amd64/opensslconf.h @@ -1,7 +1,7 @@ #include <openssl/opensslfeatures.h> /* crypto/opensslconf.h.in */ -#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) #define OPENSSLDIR "/etc/ssl" #endif diff --git a/src/lib/libcrypto/arch/arm/opensslconf.h b/src/lib/libcrypto/arch/arm/opensslconf.h index 998f50e0da..3413abb672 100644 --- a/src/lib/libcrypto/arch/arm/opensslconf.h +++ b/src/lib/libcrypto/arch/arm/opensslconf.h @@ -1,7 +1,7 @@ #include <openssl/opensslfeatures.h> /* crypto/opensslconf.h.in */ -#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) #define OPENSSLDIR "/etc/ssl" #endif diff --git a/src/lib/libcrypto/arch/hppa/opensslconf.h b/src/lib/libcrypto/arch/hppa/opensslconf.h index 998f50e0da..3413abb672 100644 --- a/src/lib/libcrypto/arch/hppa/opensslconf.h +++ b/src/lib/libcrypto/arch/hppa/opensslconf.h @@ -1,7 +1,7 @@ #include <openssl/opensslfeatures.h> /* crypto/opensslconf.h.in */ -#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) #define OPENSSLDIR "/etc/ssl" #endif diff --git a/src/lib/libcrypto/arch/i386/opensslconf.h b/src/lib/libcrypto/arch/i386/opensslconf.h index d948ae1d7e..ac1ea99cc9 100644 --- a/src/lib/libcrypto/arch/i386/opensslconf.h +++ b/src/lib/libcrypto/arch/i386/opensslconf.h @@ -1,7 +1,7 @@ #include <openssl/opensslfeatures.h> /* crypto/opensslconf.h.in */ -#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) #define OPENSSLDIR "/etc/ssl" #endif diff --git a/src/lib/libcrypto/arch/m88k/opensslconf.h b/src/lib/libcrypto/arch/m88k/opensslconf.h index 998f50e0da..3413abb672 100644 --- a/src/lib/libcrypto/arch/m88k/opensslconf.h +++ b/src/lib/libcrypto/arch/m88k/opensslconf.h @@ -1,7 +1,7 @@ #include <openssl/opensslfeatures.h> /* crypto/opensslconf.h.in */ -#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) #define OPENSSLDIR "/etc/ssl" #endif diff --git a/src/lib/libcrypto/arch/mips64/opensslconf.h b/src/lib/libcrypto/arch/mips64/opensslconf.h index c1bba81f7f..e5b1b51ec5 100644 --- a/src/lib/libcrypto/arch/mips64/opensslconf.h +++ b/src/lib/libcrypto/arch/mips64/opensslconf.h @@ -1,7 +1,7 @@ #include <openssl/opensslfeatures.h> /* crypto/opensslconf.h.in */ -#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) #define OPENSSLDIR "/etc/ssl" #endif diff --git a/src/lib/libcrypto/arch/powerpc/opensslconf.h b/src/lib/libcrypto/arch/powerpc/opensslconf.h index 998f50e0da..3413abb672 100644 --- a/src/lib/libcrypto/arch/powerpc/opensslconf.h +++ b/src/lib/libcrypto/arch/powerpc/opensslconf.h @@ -1,7 +1,7 @@ #include <openssl/opensslfeatures.h> /* crypto/opensslconf.h.in */ -#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) #define OPENSSLDIR "/etc/ssl" #endif diff --git a/src/lib/libcrypto/arch/powerpc64/opensslconf.h b/src/lib/libcrypto/arch/powerpc64/opensslconf.h index 8faa79741a..7615744a6b 100644 --- a/src/lib/libcrypto/arch/powerpc64/opensslconf.h +++ b/src/lib/libcrypto/arch/powerpc64/opensslconf.h @@ -1,7 +1,7 @@ #include <openssl/opensslfeatures.h> /* crypto/opensslconf.h.in */ -#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) #define OPENSSLDIR "/etc/ssl" #endif diff --git a/src/lib/libcrypto/arch/riscv64/opensslconf.h b/src/lib/libcrypto/arch/riscv64/opensslconf.h index b41109e284..fed209a008 100644 --- a/src/lib/libcrypto/arch/riscv64/opensslconf.h +++ b/src/lib/libcrypto/arch/riscv64/opensslconf.h @@ -1,7 +1,7 @@ #include <openssl/opensslfeatures.h> /* crypto/opensslconf.h.in */ -#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) #define OPENSSLDIR "/etc/ssl" #endif diff --git a/src/lib/libcrypto/arch/sh/opensslconf.h b/src/lib/libcrypto/arch/sh/opensslconf.h index 998f50e0da..3413abb672 100644 --- a/src/lib/libcrypto/arch/sh/opensslconf.h +++ b/src/lib/libcrypto/arch/sh/opensslconf.h @@ -1,7 +1,7 @@ #include <openssl/opensslfeatures.h> /* crypto/opensslconf.h.in */ -#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) #define OPENSSLDIR "/etc/ssl" #endif diff --git a/src/lib/libcrypto/arch/sparc64/opensslconf.h b/src/lib/libcrypto/arch/sparc64/opensslconf.h index c1bba81f7f..e5b1b51ec5 100644 --- a/src/lib/libcrypto/arch/sparc64/opensslconf.h +++ b/src/lib/libcrypto/arch/sparc64/opensslconf.h @@ -1,7 +1,7 @@ #include <openssl/opensslfeatures.h> /* crypto/opensslconf.h.in */ -#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) #define OPENSSLDIR "/etc/ssl" #endif diff --git a/src/lib/libcrypto/cryptlib.h b/src/lib/libcrypto/cryptlib.h index 6c3731d971..cc4abf3639 100644 --- a/src/lib/libcrypto/cryptlib.h +++ b/src/lib/libcrypto/cryptlib.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cryptlib.h,v 1.26 2021/11/24 01:12:43 beck Exp $ */ +/* $OpenBSD: cryptlib.h,v 1.27 2024/11/05 06:09:12 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ -#ifndef HEADER_CRYPTLIB_H -#define HEADER_CRYPTLIB_H +#ifndef HEADER_CRYPTO_LOCAL_H +#define HEADER_CRYPTO_LOCAL_H #include <openssl/opensslconf.h> -- cgit v1.2.3-55-g6feb