summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2024-11-05 06:09:13 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2024-11-05 06:09:13 +0000
commitc055fbad810e1f76a9a329f171d88f4c2b25b651 (patch)
treeff8550bd4f36ad526daeb100de284969e8620c65
parent7c7bbd9a0be8eb18d6bc1368988289471be65237 (diff)
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
Diffstat
-rw-r--r--lib/libcrypto/arch/aarch64/opensslconf.h2
-rw-r--r--lib/libcrypto/arch/alpha/opensslconf.h2
-rw-r--r--lib/libcrypto/arch/amd64/opensslconf.h2
-rw-r--r--lib/libcrypto/arch/arm/opensslconf.h2
-rw-r--r--lib/libcrypto/arch/hppa/opensslconf.h2
-rw-r--r--lib/libcrypto/arch/i386/opensslconf.h2
-rw-r--r--lib/libcrypto/arch/m88k/opensslconf.h2
-rw-r--r--lib/libcrypto/arch/mips64/opensslconf.h2
-rw-r--r--lib/libcrypto/arch/powerpc/opensslconf.h2
-rw-r--r--lib/libcrypto/arch/powerpc64/opensslconf.h2
-rw-r--r--lib/libcrypto/arch/riscv64/opensslconf.h2
-rw-r--r--lib/libcrypto/arch/sh/opensslconf.h2
-rw-r--r--lib/libcrypto/arch/sparc64/opensslconf.h2
-rw-r--r--lib/libcrypto/cryptlib.h6
14 files changed, 16 insertions, 16 deletions
diff --git a/lib/libcrypto/arch/aarch64/opensslconf.h b/lib/libcrypto/arch/aarch64/opensslconf.h
index b41109e284b..fed209a0088 100644
--- a/lib/libcrypto/arch/aarch64/opensslconf.h
+++ b/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/lib/libcrypto/arch/alpha/opensslconf.h b/lib/libcrypto/arch/alpha/opensslconf.h
index 6f1bfcc6d9e..1dbd8f22faf 100644
--- a/lib/libcrypto/arch/alpha/opensslconf.h
+++ b/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/lib/libcrypto/arch/amd64/opensslconf.h b/lib/libcrypto/arch/amd64/opensslconf.h
index 8faa79741a0..7615744a6b1 100644
--- a/lib/libcrypto/arch/amd64/opensslconf.h
+++ b/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/lib/libcrypto/arch/arm/opensslconf.h b/lib/libcrypto/arch/arm/opensslconf.h
index 998f50e0da7..3413abb672d 100644
--- a/lib/libcrypto/arch/arm/opensslconf.h
+++ b/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/lib/libcrypto/arch/hppa/opensslconf.h b/lib/libcrypto/arch/hppa/opensslconf.h
index 998f50e0da7..3413abb672d 100644
--- a/lib/libcrypto/arch/hppa/opensslconf.h
+++ b/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/lib/libcrypto/arch/i386/opensslconf.h b/lib/libcrypto/arch/i386/opensslconf.h
index d948ae1d7ee..ac1ea99cc95 100644
--- a/lib/libcrypto/arch/i386/opensslconf.h
+++ b/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/lib/libcrypto/arch/m88k/opensslconf.h b/lib/libcrypto/arch/m88k/opensslconf.h
index 998f50e0da7..3413abb672d 100644
--- a/lib/libcrypto/arch/m88k/opensslconf.h
+++ b/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/lib/libcrypto/arch/mips64/opensslconf.h b/lib/libcrypto/arch/mips64/opensslconf.h
index c1bba81f7f7..e5b1b51ec55 100644
--- a/lib/libcrypto/arch/mips64/opensslconf.h
+++ b/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/lib/libcrypto/arch/powerpc/opensslconf.h b/lib/libcrypto/arch/powerpc/opensslconf.h
index 998f50e0da7..3413abb672d 100644
--- a/lib/libcrypto/arch/powerpc/opensslconf.h
+++ b/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/lib/libcrypto/arch/powerpc64/opensslconf.h b/lib/libcrypto/arch/powerpc64/opensslconf.h
index 8faa79741a0..7615744a6b1 100644
--- a/lib/libcrypto/arch/powerpc64/opensslconf.h
+++ b/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/lib/libcrypto/arch/riscv64/opensslconf.h b/lib/libcrypto/arch/riscv64/opensslconf.h
index b41109e284b..fed209a0088 100644
--- a/lib/libcrypto/arch/riscv64/opensslconf.h
+++ b/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/lib/libcrypto/arch/sh/opensslconf.h b/lib/libcrypto/arch/sh/opensslconf.h
index 998f50e0da7..3413abb672d 100644
--- a/lib/libcrypto/arch/sh/opensslconf.h
+++ b/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/lib/libcrypto/arch/sparc64/opensslconf.h b/lib/libcrypto/arch/sparc64/opensslconf.h
index c1bba81f7f7..e5b1b51ec55 100644
--- a/lib/libcrypto/arch/sparc64/opensslconf.h
+++ b/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/lib/libcrypto/cryptlib.h b/lib/libcrypto/cryptlib.h
index 6c3731d9717..cc4abf3639b 100644
--- a/lib/libcrypto/cryptlib.h
+++ b/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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 21:30:57 +0000