summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2025-06-05 06:37:26 +0000
committertb <>2025-06-05 06:37:26 +0000
commit1a45d378f533417c698f15c1ae6c881de2128dda (patch)
treee60f0ad0bc647c33aeed078c9eede0c2bb83ae45 /src
parentdfad566506315993510a26ab210aacfd44a545e3 (diff)
downloadopenbsd-1a45d378f533417c698f15c1ae6c881de2128dda.tar.gz
openbsd-1a45d378f533417c698f15c1ae6c881de2128dda.tar.bz2
openbsd-1a45d378f533417c698f15c1ae6c881de2128dda.zip
Rename the header guard of des.h with HEADER_DES_H
libdes is dead, Jim. Only its successors continue to haunt us. discussed with jsing
Diffstat (limited to 'src')
-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/des/des.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 ece2714d89..02ef2b73a1 100644
--- a/src/lib/libcrypto/arch/aarch64/opensslconf.h
+++ b/src/lib/libcrypto/arch/aarch64/opensslconf.h
@@ -46,7 +46,7 @@
46#endif 46#endif
47#endif 47#endif
48 48
49#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) 49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */ 51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG 52#ifndef DES_LONG
diff --git a/src/lib/libcrypto/arch/alpha/opensslconf.h b/src/lib/libcrypto/arch/alpha/opensslconf.h
index 55f8340965..331f7a0978 100644
--- a/src/lib/libcrypto/arch/alpha/opensslconf.h
+++ b/src/lib/libcrypto/arch/alpha/opensslconf.h
@@ -46,7 +46,7 @@
46#endif 46#endif
47#endif 47#endif
48 48
49#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) 49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */ 51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG 52#ifndef DES_LONG
diff --git a/src/lib/libcrypto/arch/amd64/opensslconf.h b/src/lib/libcrypto/arch/amd64/opensslconf.h
index eb8b812d84..e4868597f2 100644
--- a/src/lib/libcrypto/arch/amd64/opensslconf.h
+++ b/src/lib/libcrypto/arch/amd64/opensslconf.h
@@ -46,7 +46,7 @@
46#endif 46#endif
47#endif 47#endif
48 48
49#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) 49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */ 51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG 52#ifndef DES_LONG
diff --git a/src/lib/libcrypto/arch/arm/opensslconf.h b/src/lib/libcrypto/arch/arm/opensslconf.h
index 958c01246b..4fb2f080e6 100644
--- a/src/lib/libcrypto/arch/arm/opensslconf.h
+++ b/src/lib/libcrypto/arch/arm/opensslconf.h
@@ -46,7 +46,7 @@
46#endif 46#endif
47#endif 47#endif
48 48
49#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) 49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */ 51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG 52#ifndef DES_LONG
diff --git a/src/lib/libcrypto/arch/hppa/opensslconf.h b/src/lib/libcrypto/arch/hppa/opensslconf.h
index 958c01246b..4fb2f080e6 100644
--- a/src/lib/libcrypto/arch/hppa/opensslconf.h
+++ b/src/lib/libcrypto/arch/hppa/opensslconf.h
@@ -46,7 +46,7 @@
46#endif 46#endif
47#endif 47#endif
48 48
49#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) 49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */ 51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG 52#ifndef DES_LONG
diff --git a/src/lib/libcrypto/arch/i386/opensslconf.h b/src/lib/libcrypto/arch/i386/opensslconf.h
index 1be9e6e229..54a8517954 100644
--- a/src/lib/libcrypto/arch/i386/opensslconf.h
+++ b/src/lib/libcrypto/arch/i386/opensslconf.h
@@ -46,7 +46,7 @@
46#endif 46#endif
47#endif 47#endif
48 48
49#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) 49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */ 51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG 52#ifndef DES_LONG
diff --git a/src/lib/libcrypto/arch/m88k/opensslconf.h b/src/lib/libcrypto/arch/m88k/opensslconf.h
index 958c01246b..4fb2f080e6 100644
--- a/src/lib/libcrypto/arch/m88k/opensslconf.h
+++ b/src/lib/libcrypto/arch/m88k/opensslconf.h
@@ -46,7 +46,7 @@
46#endif 46#endif
47#endif 47#endif
48 48
49#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) 49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */ 51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG 52#ifndef DES_LONG
diff --git a/src/lib/libcrypto/arch/mips64/opensslconf.h b/src/lib/libcrypto/arch/mips64/opensslconf.h
index 9ec1eef5f2..52da151be2 100644
--- a/src/lib/libcrypto/arch/mips64/opensslconf.h
+++ b/src/lib/libcrypto/arch/mips64/opensslconf.h
@@ -46,7 +46,7 @@
46#endif 46#endif
47#endif 47#endif
48 48
49#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) 49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */ 51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG 52#ifndef DES_LONG
diff --git a/src/lib/libcrypto/arch/powerpc/opensslconf.h b/src/lib/libcrypto/arch/powerpc/opensslconf.h
index 958c01246b..4fb2f080e6 100644
--- a/src/lib/libcrypto/arch/powerpc/opensslconf.h
+++ b/src/lib/libcrypto/arch/powerpc/opensslconf.h
@@ -46,7 +46,7 @@
46#endif 46#endif
47#endif 47#endif
48 48
49#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) 49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */ 51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG 52#ifndef DES_LONG
diff --git a/src/lib/libcrypto/arch/powerpc64/opensslconf.h b/src/lib/libcrypto/arch/powerpc64/opensslconf.h
index eb8b812d84..e4868597f2 100644
--- a/src/lib/libcrypto/arch/powerpc64/opensslconf.h
+++ b/src/lib/libcrypto/arch/powerpc64/opensslconf.h
@@ -46,7 +46,7 @@
46#endif 46#endif
47#endif 47#endif
48 48
49#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) 49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */ 51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG 52#ifndef DES_LONG
diff --git a/src/lib/libcrypto/arch/riscv64/opensslconf.h b/src/lib/libcrypto/arch/riscv64/opensslconf.h
index ece2714d89..02ef2b73a1 100644
--- a/src/lib/libcrypto/arch/riscv64/opensslconf.h
+++ b/src/lib/libcrypto/arch/riscv64/opensslconf.h
@@ -46,7 +46,7 @@
46#endif 46#endif
47#endif 47#endif
48 48
49#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) 49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */ 51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG 52#ifndef DES_LONG
diff --git a/src/lib/libcrypto/arch/sh/opensslconf.h b/src/lib/libcrypto/arch/sh/opensslconf.h
index 958c01246b..4fb2f080e6 100644
--- a/src/lib/libcrypto/arch/sh/opensslconf.h
+++ b/src/lib/libcrypto/arch/sh/opensslconf.h
@@ -46,7 +46,7 @@
46#endif 46#endif
47#endif 47#endif
48 48
49#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) 49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */ 51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG 52#ifndef DES_LONG
diff --git a/src/lib/libcrypto/arch/sparc64/opensslconf.h b/src/lib/libcrypto/arch/sparc64/opensslconf.h
index 9ec1eef5f2..52da151be2 100644
--- a/src/lib/libcrypto/arch/sparc64/opensslconf.h
+++ b/src/lib/libcrypto/arch/sparc64/opensslconf.h
@@ -46,7 +46,7 @@
46#endif 46#endif
47#endif 47#endif
48 48
49#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) 49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */ 51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG 52#ifndef DES_LONG
diff --git a/src/lib/libcrypto/des/des.h b/src/lib/libcrypto/des/des.h
index 2d957a192c..277702f87b 100644
--- a/src/lib/libcrypto/des/des.h
+++ b/src/lib/libcrypto/des/des.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: des.h,v 1.23 2025/01/25 17:59:44 tb Exp $ */ 1/* $OpenBSD: des.h,v 1.24 2025/06/05 06:37:26 tb Exp $ */
2/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1997 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_NEW_DES_H 59#ifndef HEADER_DES_H
60#define HEADER_NEW_DES_H 60#define HEADER_DES_H
61 61
62#include <openssl/opensslconf.h> 62#include <openssl/opensslconf.h>
63 63