From 77890745eac7fbfd51208f10c1759d6998f0692b Mon Sep 17 00:00:00 2001
From: tb <>
Date: Mon, 9 Jun 2025 14:37:49 +0000
Subject: 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
---
 src/lib/libcrypto/idea/idea.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/lib/libcrypto/idea')

diff --git a/src/lib/libcrypto/idea/idea.h b/src/lib/libcrypto/idea/idea.h
index 2bdd3647fd..fccef8fc73 100644
--- a/src/lib/libcrypto/idea/idea.h
+++ b/src/lib/libcrypto/idea/idea.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: idea.h,v 1.13 2025/01/25 17:59:44 tb Exp $ */
+/* $OpenBSD: idea.h,v 1.14 2025/06/09 14:37:49 tb Exp $ */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -59,7 +59,12 @@
 #ifndef HEADER_IDEA_H
 #define HEADER_IDEA_H
 
-#include <openssl/opensslconf.h> /* IDEA_INT, OPENSSL_NO_IDEA */
+#include <openssl/opensslconf.h> /* OPENSSL_NO_IDEA */
+
+#ifndef IDEA_INT
+/* XXX - typedef */
+#define IDEA_INT unsigned int
+#endif
 
 #define IDEA_ENCRYPT	1
 #define IDEA_DECRYPT	0
-- 
cgit v1.2.3-55-g6feb