diff options
Diffstat (limited to 'src/lib/libcrypto/idea')
| -rw-r--r-- | src/lib/libcrypto/idea/idea.h | 9 | ||||
| -rw-r--r-- | src/lib/libcrypto/idea/idea_local.h | 7 |
2 files changed, 13 insertions, 3 deletions
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 @@ | |||
| 1 | /* $OpenBSD: idea.h,v 1.13 2025/01/25 17:59:44 tb Exp $ */ | 1 | /* $OpenBSD: idea.h,v 1.14 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 | * |
| @@ -59,7 +59,12 @@ | |||
| 59 | #ifndef HEADER_IDEA_H | 59 | #ifndef HEADER_IDEA_H |
| 60 | #define HEADER_IDEA_H | 60 | #define HEADER_IDEA_H |
| 61 | 61 | ||
| 62 | #include <openssl/opensslconf.h> /* IDEA_INT, OPENSSL_NO_IDEA */ | 62 | #include <openssl/opensslconf.h> /* OPENSSL_NO_IDEA */ |
| 63 | |||
| 64 | #ifndef IDEA_INT | ||
| 65 | /* XXX - typedef */ | ||
| 66 | #define IDEA_INT unsigned int | ||
| 67 | #endif | ||
| 63 | 68 | ||
| 64 | #define IDEA_ENCRYPT 1 | 69 | #define IDEA_ENCRYPT 1 |
| 65 | #define IDEA_DECRYPT 0 | 70 | #define IDEA_DECRYPT 0 |
diff --git a/src/lib/libcrypto/idea/idea_local.h b/src/lib/libcrypto/idea/idea_local.h index c7fd3271a7..c0a592ab1c 100644 --- a/src/lib/libcrypto/idea/idea_local.h +++ b/src/lib/libcrypto/idea/idea_local.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: idea_local.h,v 1.2 2023/07/07 12:51:58 beck Exp $ */ | 1 | /* $OpenBSD: idea_local.h,v 1.3 2025/11/26 10:19:57 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,6 +56,9 @@ | |||
| 56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #ifndef HEADER_IDEA_LOCAL_H | ||
| 60 | #define HEADER_IDEA_LOCAL_H | ||
| 61 | |||
| 59 | /* The new form of this macro (check if the a*b == 0) was suggested by | 62 | /* The new form of this macro (check if the a*b == 0) was suggested by |
| 60 | * Colin Plumb <colin@nyx10.cs.du.edu> */ | 63 | * Colin Plumb <colin@nyx10.cs.du.edu> */ |
| 61 | /* Removal of the inner if from from Wei Dai 24/4/96 */ | 64 | /* Removal of the inner if from from Wei Dai 24/4/96 */ |
| @@ -147,3 +150,5 @@ else \ | |||
| 147 | ul=x2^t0; /* do the swap to x3 */ \ | 150 | ul=x2^t0; /* do the swap to x3 */ \ |
| 148 | x2=x3^t1; \ | 151 | x2=x3^t1; \ |
| 149 | x3=ul; | 152 | x3=ul; |
| 153 | |||
| 154 | #endif /* HEADER_IDEA_LOCAL_H */ | ||
