summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/des
diff options
context:
space:
mode:
authortb <>2025-06-09 14:37:49 +0000
committertb <>2025-06-09 14:37:49 +0000
commit77890745eac7fbfd51208f10c1759d6998f0692b (patch)
tree3ae93c6a8839fff883c0dce5f2d46c7942284ac6 /src/lib/libcrypto/des
parent951cd4503ff3c4cc93c1a36cf06138b1ddd739d7 (diff)
downloadopenbsd-77890745eac7fbfd51208f10c1759d6998f0692b.tar.gz
openbsd-77890745eac7fbfd51208f10c1759d6998f0692b.tar.bz2
openbsd-77890745eac7fbfd51208f10c1759d6998f0692b.zip
Move (mostly) MI constants to proper headers
Most of the constants here are only defined if a specific header is in scope. So move the machine-independent macros to those headers and lose the header guards. Most of these should actually be typedefs but let's change this when we're bumping the major since this technically has ABI impact. IDEA_INT RC2_INT and RC4_INT are always unsigned int DES_LONG is always unsigned int except on i386 This preserves the existing situation on OpenBSD. If you're using portable on i386 with a compiler that does not define __i386__, there's an ABI break. ok jsing
Diffstat (limited to 'src/lib/libcrypto/des')
-rw-r--r--src/lib/libcrypto/des/des.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/lib/libcrypto/des/des.h b/src/lib/libcrypto/des/des.h
index 277702f87b..4ff4ceca19 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.24 2025/06/05 06:37:26 tb Exp $ */ 1/* $OpenBSD: des.h,v 1.25 2025/06/09 14:37:49 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 *
@@ -61,6 +61,15 @@
61 61
62#include <openssl/opensslconf.h> 62#include <openssl/opensslconf.h>
63 63
64#ifndef DES_LONG
65/* XXX - typedef to int everywhere. */
66#ifdef __i386__
67#define DES_LONG unsigned long
68#else
69#define DES_LONG unsigned int
70#endif
71#endif
72
64#ifdef __cplusplus 73#ifdef __cplusplus
65extern "C" { 74extern "C" {
66#endif 75#endif