summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2024-11-05 06:09:12 +0000
committertb <>2024-11-05 06:09:12 +0000
commit12f0b7f7c165293139ae84e7743ac35e9daec51f (patch)
tree2961522b96fdd32dee3fe1acf3a5515302a99c06
parent2e2a5aaeadf08b6fed07e049e8e841f99343f354 (diff)
downloadopenbsd-12f0b7f7c165293139ae84e7743ac35e9daec51f.tar.gz
openbsd-12f0b7f7c165293139ae84e7743ac35e9daec51f.tar.bz2
openbsd-12f0b7f7c165293139ae84e7743ac35e9daec51f.zip
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--src/lib/libcrypto/arch/aarch64/opensslconf.h2
-rw-r--r--src/lib/libcrypto/arch/alpha/opensslconf.h2
-rw-r--r--src/lib/libcrypto/arch/amd64/opensslconf.h2
-rw-r--r--src/lib/libcrypto/arch/arm/opensslconf.h2
-rw-r--r--src/lib/libcrypto/arch/hppa/opensslconf.h2
-rw-r--r--src/lib/libcrypto/arch/i386/opensslconf.h2
-rw-r--r--src/lib/libcrypto/arch/m88k/opensslconf.h2
-rw-r--r--src/lib/libcrypto/arch/mips64/opensslconf.h2
-rw-r--r--src/lib/libcrypto/arch/powerpc/opensslconf.h2
-rw-r--r--src/lib/libcrypto/arch/powerpc64/opensslconf.h2
-rw-r--r--src/lib/libcrypto/arch/riscv64/opensslconf.h2
-rw-r--r--src/lib/libcrypto/arch/sh/opensslconf.h2
-rw-r--r--src/lib/libcrypto/arch/sparc64/opensslconf.h2
-rw-r--r--src/lib/libcrypto/cryptlib.h6
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 @@
1#include <openssl/opensslfeatures.h> 1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */ 2/* crypto/opensslconf.h.in */
3 3
4#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 4#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR)
5#define OPENSSLDIR "/etc/ssl" 5#define OPENSSLDIR "/etc/ssl"
6#endif 6#endif
7 7
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 @@
1#include <openssl/opensslfeatures.h> 1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */ 2/* crypto/opensslconf.h.in */
3 3
4#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 4#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR)
5#define OPENSSLDIR "/etc/ssl" 5#define OPENSSLDIR "/etc/ssl"
6#endif 6#endif
7 7
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 @@
1#include <openssl/opensslfeatures.h> 1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */ 2/* crypto/opensslconf.h.in */
3 3
4#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 4#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR)
5#define OPENSSLDIR "/etc/ssl" 5#define OPENSSLDIR "/etc/ssl"
6#endif 6#endif
7 7
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 @@
1#include <openssl/opensslfeatures.h> 1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */ 2/* crypto/opensslconf.h.in */
3 3
4#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 4#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR)
5#define OPENSSLDIR "/etc/ssl" 5#define OPENSSLDIR "/etc/ssl"
6#endif 6#endif
7 7
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 @@
1#include <openssl/opensslfeatures.h> 1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */ 2/* crypto/opensslconf.h.in */
3 3
4#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 4#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR)
5#define OPENSSLDIR "/etc/ssl" 5#define OPENSSLDIR "/etc/ssl"
6#endif 6#endif
7 7
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 @@
1#include <openssl/opensslfeatures.h> 1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */ 2/* crypto/opensslconf.h.in */
3 3
4#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 4#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR)
5#define OPENSSLDIR "/etc/ssl" 5#define OPENSSLDIR "/etc/ssl"
6#endif 6#endif
7 7
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 @@
1#include <openssl/opensslfeatures.h> 1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */ 2/* crypto/opensslconf.h.in */
3 3
4#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 4#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR)
5#define OPENSSLDIR "/etc/ssl" 5#define OPENSSLDIR "/etc/ssl"
6#endif 6#endif
7 7
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 @@
1#include <openssl/opensslfeatures.h> 1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */ 2/* crypto/opensslconf.h.in */
3 3
4#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 4#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR)
5#define OPENSSLDIR "/etc/ssl" 5#define OPENSSLDIR "/etc/ssl"
6#endif 6#endif
7 7
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 @@
1#include <openssl/opensslfeatures.h> 1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */ 2/* crypto/opensslconf.h.in */
3 3
4#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 4#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR)
5#define OPENSSLDIR "/etc/ssl" 5#define OPENSSLDIR "/etc/ssl"
6#endif 6#endif
7 7
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 @@
1#include <openssl/opensslfeatures.h> 1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */ 2/* crypto/opensslconf.h.in */
3 3
4#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 4#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR)
5#define OPENSSLDIR "/etc/ssl" 5#define OPENSSLDIR "/etc/ssl"
6#endif 6#endif
7 7
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 @@
1#include <openssl/opensslfeatures.h> 1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */ 2/* crypto/opensslconf.h.in */
3 3
4#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 4#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR)
5#define OPENSSLDIR "/etc/ssl" 5#define OPENSSLDIR "/etc/ssl"
6#endif 6#endif
7 7
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 @@
1#include <openssl/opensslfeatures.h> 1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */ 2/* crypto/opensslconf.h.in */
3 3
4#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 4#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR)
5#define OPENSSLDIR "/etc/ssl" 5#define OPENSSLDIR "/etc/ssl"
6#endif 6#endif
7 7
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 @@
1#include <openssl/opensslfeatures.h> 1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */ 2/* crypto/opensslconf.h.in */
3 3
4#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 4#if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR)
5#define OPENSSLDIR "/etc/ssl" 5#define OPENSSLDIR "/etc/ssl"
6#endif 6#endif
7 7
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 @@
1/* $OpenBSD: cryptlib.h,v 1.26 2021/11/24 01:12:43 beck Exp $ */ 1/* $OpenBSD: cryptlib.h,v 1.27 2024/11/05 06:09:12 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -56,8 +56,8 @@
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58 58
59#ifndef HEADER_CRYPTLIB_H 59#ifndef HEADER_CRYPTO_LOCAL_H
60#define HEADER_CRYPTLIB_H 60#define HEADER_CRYPTO_LOCAL_H
61 61
62#include <openssl/opensslconf.h> 62#include <openssl/opensslconf.h>
63 63
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-20 12:05:06 +0000