From da214f7dcc24dcb9b24028c1aaca17f104cf4496 Mon Sep 17 00:00:00 2001 From: tb <> Date: Thu, 5 Jun 2025 06:37:26 +0000 Subject: 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 --- 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/des/des.h | 6 +++--- 14 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/lib') 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 @@ #endif #endif -#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) +#if defined(HEADER_DES_H) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #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 @@ #endif #endif -#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) +#if defined(HEADER_DES_H) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #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 @@ #endif #endif -#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) +#if defined(HEADER_DES_H) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #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 @@ #endif #endif -#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) +#if defined(HEADER_DES_H) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #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 @@ #endif #endif -#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) +#if defined(HEADER_DES_H) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #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 @@ #endif #endif -#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) +#if defined(HEADER_DES_H) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #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 @@ #endif #endif -#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) +#if defined(HEADER_DES_H) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #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 @@ #endif #endif -#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) +#if defined(HEADER_DES_H) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #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 @@ #endif #endif -#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) +#if defined(HEADER_DES_H) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #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 @@ #endif #endif -#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) +#if defined(HEADER_DES_H) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #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 @@ #endif #endif -#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) +#if defined(HEADER_DES_H) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #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 @@ #endif #endif -#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) +#if defined(HEADER_DES_H) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #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 @@ #endif #endif -#if defined(HEADER_NEW_DES_H) && !defined(DES_LONG) +#if defined(HEADER_DES_H) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #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 @@ -/* $OpenBSD: des.h,v 1.23 2025/01/25 17:59:44 tb Exp $ */ +/* $OpenBSD: des.h,v 1.24 2025/06/05 06:37:26 tb Exp $ */ /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ -#ifndef HEADER_NEW_DES_H -#define HEADER_NEW_DES_H +#ifndef HEADER_DES_H +#define HEADER_DES_H #include -- cgit v1.2.3-55-g6feb