1 files changed, 63 insertions, 64 deletions
diff --git a/src/lib/libcrypto/idea/idea_local.h b/src/lib/libcrypto/idea/idea_local.h
index 2663516c20..c7fd3271a7 100644
--- a/src/lib/libcrypto/idea/idea_local.h
+++ b/src/lib/libcrypto/idea/idea_local.h
@@ -1,25 +1,25 @@
-/* $OpenBSD: idea_local.h,v 1.1 2022/11/26 16:08:53 tb Exp $ */
+/* $OpenBSD: idea_local.h,v 1.2 2023/07/07 12:51:58 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
 * This package is an SSL implementation written
 * by Eric Young (eay@cryptsoft.com).
 * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
 * This library is free for commercial and non-commercial use as long as
 * the following conditions are aheared to.  The following conditions
 * apply to all code found in this distribution, be it the RC4, RSA,
 * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
 * included with this distribution is covered by the same copyright terms
 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
 * Copyright remains Eric Young's, and as such any Copyright notices in
 * the code are not to be removed.
 * If this package is used in a product, Eric Young should be given attribution
 * as the author of the parts of the library used.
 * This can be in the form of a textual message at program startup or
 * in documentation (online or textual) provided with the package.
- * 
+ *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
@@ -34,10 +34,10 @@
 *     Eric Young (eay@cryptsoft.com)"
 *    The word 'cryptographic' can be left out if the rouines from the library
 *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
 *    the apps directory (application code) you must include an acknowledgement:
 *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,24 +49,24 @@
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
- * 
+ *
 * The licence and distribution terms for any publically available version or
 * derivative of this code cannot be changed.  i.e. this code cannot simply be
 * copied and put under another distribution licence
 * [including the GNU Public Licence.]
 */
-/* The new form of this macro (check if the a*b == 0) was suggested by 
+/* The new form of this macro (check if the a*b == 0) was suggested by
 * Colin Plumb <colin@nyx10.cs.du.edu> */
 /* Removal of the inner if from from Wei Dai 24/4/96 */
-#define idea_mul(r,a,b,ul) \
+#define idea_mul(r,a,b,ul)                                              \
-ul=(unsigned long)a*b; \
+ul=(unsigned long)a*b;                                                  \
-if (ul != 0) \
+if (ul != 0)                                                            \
-        { \
+        {                                                               \
-        r=(ul&0xffff)-(ul>>16); \
+        r=(ul&0xffff)-(ul>>16);                                         \
-        r-=((r)>>16); \
+        r-=((r)>>16);                                                   \
-        } \
+        }                                                               \
-else \
+else                                                                    \
        r=(-(int)a-b+1); /* assuming a or b is 0 and in range */ 
 /*  7/12/95 - Many thanks to Rhys Weatherley <rweather@us.oracle.com>
@@ -80,46 +80,46 @@ else \
 */
 /* NOTE - c is not incremented as per n2l */
-#define n2ln(c,l1,l2,n) { \
+#define n2ln(c,l1,l2,n) {                                               \
-                        c+=n; \
+                        c+=n;                                           \
-                        l1=l2=0; \
+                        l1=l2=0;                                        \
-                        switch (n) { \
+                        switch (n) {                                    \
-                        case 8: l2 =((unsigned long)(*(--(c))))    ; \
+                        case 8: l2 =((unsigned long)(*(--(c))))    ;    \
-                        case 7: l2|=((unsigned long)(*(--(c))))<< 8; \
+                        case 7: l2|=((unsigned long)(*(--(c))))<< 8;    \
-                        case 6: l2|=((unsigned long)(*(--(c))))<<16; \
+                        case 6: l2|=((unsigned long)(*(--(c))))<<16;    \
-                        case 5: l2|=((unsigned long)(*(--(c))))<<24; \
+                        case 5: l2|=((unsigned long)(*(--(c))))<<24;    \
-                        case 4: l1 =((unsigned long)(*(--(c))))    ; \
+                        case 4: l1 =((unsigned long)(*(--(c))))    ;    \
-                        case 3: l1|=((unsigned long)(*(--(c))))<< 8; \
+                        case 3: l1|=((unsigned long)(*(--(c))))<< 8;    \
-                        case 2: l1|=((unsigned long)(*(--(c))))<<16; \
+                        case 2: l1|=((unsigned long)(*(--(c))))<<16;    \
-                        case 1: l1|=((unsigned long)(*(--(c))))<<24; \
+                        case 1: l1|=((unsigned long)(*(--(c))))<<24;    \
-                                } \
+                                }                                       \
                        }
 /* NOTE - c is not incremented as per l2n */
-#define l2nn(l1,l2,c,n) { \
+#define l2nn(l1,l2,c,n) {                                               \
-                        c+=n; \
+                        c+=n;                                           \
-                        switch (n) { \
+                        switch (n) {                                    \
-                        case 8: *(--(c))=(unsigned char)(((l2)    )&0xff); \
+                        case 8: *(--(c))=(unsigned char)(((l2)    )&0xff);\
-                        case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \
+                        case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff);\
-                        case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \
+                        case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff);\
-                        case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \
+                        case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff);\
-                        case 4: *(--(c))=(unsigned char)(((l1)    )&0xff); \
+                        case 4: *(--(c))=(unsigned char)(((l1)    )&0xff);\
-                        case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \
+                        case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff);\
-                        case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \
+                        case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff);\
-                        case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \
+                        case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff);\
-                                } \
+                                }                                       \
                        }
 #undef n2l
-#define n2l(c,l)        (l =((unsigned long)(*((c)++)))<<24L, \
+#define n2l(c,l)        (l =((unsigned long)(*((c)++)))<<24L,           \
-                         l|=((unsigned long)(*((c)++)))<<16L, \
+                         l|=((unsigned long)(*((c)++)))<<16L,           \
-                         l|=((unsigned long)(*((c)++)))<< 8L, \
+                         l|=((unsigned long)(*((c)++)))<< 8L,           \
                         l|=((unsigned long)(*((c)++))))
 #undef l2n
-#define l2n(l,c)        (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
+#define l2n(l,c)        (*((c)++)=(unsigned char)(((l)>>24L)&0xff),     \
-                         *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
+                         *((c)++)=(unsigned char)(((l)>>16L)&0xff),     \
-                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
+                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff),     \
                         *((c)++)=(unsigned char)(((l)     )&0xff))
 #undef s2n
@@ -130,21 +130,20 @@ else \
 #define n2s(c,l)        (l =((IDEA_INT)(*((c)++)))<< 8L, \
                         l|=((IDEA_INT)(*((c)++)))      )
-#define E_IDEA(num) \
+#define E_IDEA(num)                                                     \
-        x1&=0xffff; \
+        x1&=0xffff;                                                     \
-        idea_mul(x1,x1,*p,ul); p++; \
+        idea_mul(x1,x1,*p,ul); p++;                                     \
-        x2+= *(p++); \
+        x2+= *(p++);                                                    \
-        x3+= *(p++); \
+        x3+= *(p++);                                                    \
-        x4&=0xffff; \
+        x4&=0xffff;                                                     \
-        idea_mul(x4,x4,*p,ul); p++; \
+        idea_mul(x4,x4,*p,ul); p++;                                     \
-        t0=(x1^x3)&0xffff; \
+        t0=(x1^x3)&0xffff;                                              \
-        idea_mul(t0,t0,*p,ul); p++; \
+        idea_mul(t0,t0,*p,ul); p++;                                     \
-        t1=(t0+(x2^x4))&0xffff; \
+        t1=(t0+(x2^x4))&0xffff;                                         \
-        idea_mul(t1,t1,*p,ul); p++; \
+        idea_mul(t1,t1,*p,ul); p++;                                     \
-        t0+=t1; \
+        t0+=t1;                                                         \
-        x1^=t1; \
+        x1^=t1;                                                         \
-        x4^=t0; \
+        x4^=t0;                                                         \
-        ul=x2^t0; /* do the swap to x3 */ \
+        ul=x2^t0; /* do the swap to x3 */                               \
-        x2=x3^t1; \
+        x2=x3^t1;                                                       \
        x3=ul;

diff --git a/src/lib/libcrypto/idea/idea_local.h b/src/lib/libcrypto/idea/idea_local.h index 2663516c20..c7fd3271a7 100644 --- a/src/lib/libcrypto/idea/idea_local.h +++ b/src/lib/libcrypto/idea/idea_local.h
@@ -1,25 +1,25 @@
1	/* $OpenBSD: idea_local.h,v 1.1 2022/11/26 16:08:53 tb Exp $ */	1	/* $OpenBSD: idea_local.h,v 1.2 2023/07/07 12:51:58 beck 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	*
5	* This package is an SSL implementation written	5	* This package is an SSL implementation written
6	* by Eric Young (eay@cryptsoft.com).	6	* by Eric Young (eay@cryptsoft.com).
7	* The implementation was written so as to conform with Netscapes SSL.	7	* The implementation was written so as to conform with Netscapes SSL.
8	*	8	*
9	* This library is free for commercial and non-commercial use as long as	9	* This library is free for commercial and non-commercial use as long as
10	* the following conditions are aheared to. The following conditions	10	* the following conditions are aheared to. The following conditions
11	* apply to all code found in this distribution, be it the RC4, RSA,	11	* apply to all code found in this distribution, be it the RC4, RSA,
12	* lhash, DES, etc., code; not just the SSL code. The SSL documentation	12	* lhash, DES, etc., code; not just the SSL code. The SSL documentation
13	* included with this distribution is covered by the same copyright terms	13	* included with this distribution is covered by the same copyright terms
14	* except that the holder is Tim Hudson (tjh@cryptsoft.com).	14	* except that the holder is Tim Hudson (tjh@cryptsoft.com).
15	*	15	*
16	* Copyright remains Eric Young's, and as such any Copyright notices in	16	* Copyright remains Eric Young's, and as such any Copyright notices in
17	* the code are not to be removed.	17	* the code are not to be removed.
18	* If this package is used in a product, Eric Young should be given attribution	18	* If this package is used in a product, Eric Young should be given attribution
19	* as the author of the parts of the library used.	19	* as the author of the parts of the library used.
20	* This can be in the form of a textual message at program startup or	20	* This can be in the form of a textual message at program startup or
21	* in documentation (online or textual) provided with the package.	21	* in documentation (online or textual) provided with the package.
22	*	22	*
23	* Redistribution and use in source and binary forms, with or without	23	* Redistribution and use in source and binary forms, with or without
24	* modification, are permitted provided that the following conditions	24	* modification, are permitted provided that the following conditions
25	* are met:	25	* are met:
@@ -34,10 +34,10 @@
34	* Eric Young (eay@cryptsoft.com)"	34	* Eric Young (eay@cryptsoft.com)"
35	* The word 'cryptographic' can be left out if the rouines from the library	35	* The word 'cryptographic' can be left out if the rouines from the library
36	* being used are not cryptographic related :-).	36	* being used are not cryptographic related :-).
37	* 4. If you include any Windows specific code (or a derivative thereof) from	37	* 4. If you include any Windows specific code (or a derivative thereof) from
38	* the apps directory (application code) you must include an acknowledgement:	38	* the apps directory (application code) you must include an acknowledgement:
39	* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"	39	* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40	*	40	*
41	* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND	41	* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE	42	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE	43	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,24 +49,24 @@
49	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY	49	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF	50	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51	* SUCH DAMAGE.	51	* SUCH DAMAGE.
52	*	52	*
53	* The licence and distribution terms for any publically available version or	53	* The licence and distribution terms for any publically available version or
54	* derivative of this code cannot be changed. i.e. this code cannot simply be	54	* derivative of this code cannot be changed. i.e. this code cannot simply be
55	* copied and put under another distribution licence	55	* copied and put under another distribution licence
56	* [including the GNU Public Licence.]	56	* [including the GNU Public Licence.]
57	*/	57	*/
58		58
59	/* The new form of this macro (check if the a*b == 0) was suggested by	59	/* The new form of this macro (check if the a*b == 0) was suggested by
60	* Colin Plumb <colin@nyx10.cs.du.edu> */	60	* Colin Plumb <colin@nyx10.cs.du.edu> */
61	/* Removal of the inner if from from Wei Dai 24/4/96 */	61	/* Removal of the inner if from from Wei Dai 24/4/96 */
62	#define idea_mul(r,a,b,ul) \	62	#define idea_mul(r,a,b,ul) \
63	ul=(unsigned long)a*b; \	63	ul=(unsigned long)a*b; \
64	if (ul != 0) \	64	if (ul != 0) \
65	{ \	65	{ \
66	r=(ul&0xffff)-(ul>>16); \	66	r=(ul&0xffff)-(ul>>16); \
67	r-=((r)>>16); \	67	r-=((r)>>16); \
68	} \	68	} \
69	else \	69	else \
70	r=(-(int)a-b+1); /* assuming a or b is 0 and in range */	70	r=(-(int)a-b+1); /* assuming a or b is 0 and in range */
71		71
72	/* 7/12/95 - Many thanks to Rhys Weatherley <rweather@us.oracle.com>	72	/* 7/12/95 - Many thanks to Rhys Weatherley <rweather@us.oracle.com>
@@ -80,46 +80,46 @@ else \
80	*/	80	*/
81		81
82	/* NOTE - c is not incremented as per n2l */	82	/* NOTE - c is not incremented as per n2l */
83	#define n2ln(c,l1,l2,n) { \	83	#define n2ln(c,l1,l2,n) { \
84	c+=n; \	84	c+=n; \
85	l1=l2=0; \	85	l1=l2=0; \
86	switch (n) { \	86	switch (n) { \
87	case 8: l2 =((unsigned long)(*(--(c)))) ; \	87	case 8: l2 =((unsigned long)(*(--(c)))) ; \
88	case 7: l2\|=((unsigned long)(*(--(c))))<< 8; \	88	case 7: l2\|=((unsigned long)(*(--(c))))<< 8; \
89	case 6: l2\|=((unsigned long)(*(--(c))))<<16; \	89	case 6: l2\|=((unsigned long)(*(--(c))))<<16; \
90	case 5: l2\|=((unsigned long)(*(--(c))))<<24; \	90	case 5: l2\|=((unsigned long)(*(--(c))))<<24; \
91	case 4: l1 =((unsigned long)(*(--(c)))) ; \	91	case 4: l1 =((unsigned long)(*(--(c)))) ; \
92	case 3: l1\|=((unsigned long)(*(--(c))))<< 8; \	92	case 3: l1\|=((unsigned long)(*(--(c))))<< 8; \
93	case 2: l1\|=((unsigned long)(*(--(c))))<<16; \	93	case 2: l1\|=((unsigned long)(*(--(c))))<<16; \
94	case 1: l1\|=((unsigned long)(*(--(c))))<<24; \	94	case 1: l1\|=((unsigned long)(*(--(c))))<<24; \
95	} \	95	} \
96	}	96	}
97		97
98	/* NOTE - c is not incremented as per l2n */	98	/* NOTE - c is not incremented as per l2n */
99	#define l2nn(l1,l2,c,n) { \	99	#define l2nn(l1,l2,c,n) { \
100	c+=n; \	100	c+=n; \
101	switch (n) { \	101	switch (n) { \
102	case 8: *(--(c))=(unsigned char)(((l2) )&0xff); \	102	case 8: *(--(c))=(unsigned char)(((l2) )&0xff);\
103	case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \	103	case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff);\
104	case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \	104	case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff);\
105	case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \	105	case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff);\
106	case 4: *(--(c))=(unsigned char)(((l1) )&0xff); \	106	case 4: *(--(c))=(unsigned char)(((l1) )&0xff);\
107	case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \	107	case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff);\
108	case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \	108	case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff);\
109	case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \	109	case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff);\
110	} \	110	} \
111	}	111	}
112		112
113	#undef n2l	113	#undef n2l
114	#define n2l(c,l) (l =((unsigned long)(*((c)++)))<<24L, \	114	#define n2l(c,l) (l =((unsigned long)(*((c)++)))<<24L, \
115	l\|=((unsigned long)(*((c)++)))<<16L, \	115	l\|=((unsigned long)(*((c)++)))<<16L, \
116	l\|=((unsigned long)(*((c)++)))<< 8L, \	116	l\|=((unsigned long)(*((c)++)))<< 8L, \
117	l\|=((unsigned long)(*((c)++))))	117	l\|=((unsigned long)(*((c)++))))
118		118
119	#undef l2n	119	#undef l2n
120	#define l2n(l,c) (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \	120	#define l2n(l,c) (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
121	*((c)++)=(unsigned char)(((l)>>16L)&0xff), \	121	*((c)++)=(unsigned char)(((l)>>16L)&0xff), \
122	*((c)++)=(unsigned char)(((l)>> 8L)&0xff), \	122	*((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
123	*((c)++)=(unsigned char)(((l) )&0xff))	123	*((c)++)=(unsigned char)(((l) )&0xff))
124		124
125	#undef s2n	125	#undef s2n
@@ -130,21 +130,20 @@ else \
130	#define n2s(c,l) (l =((IDEA_INT)(*((c)++)))<< 8L, \	130	#define n2s(c,l) (l =((IDEA_INT)(*((c)++)))<< 8L, \
131	l\|=((IDEA_INT)(*((c)++))) )	131	l\|=((IDEA_INT)(*((c)++))) )
132		132
133	#define E_IDEA(num) \	133	#define E_IDEA(num) \
134	x1&=0xffff; \	134	x1&=0xffff; \
135	idea_mul(x1,x1,*p,ul); p++; \	135	idea_mul(x1,x1,*p,ul); p++; \
136	x2+= *(p++); \	136	x2+= *(p++); \
137	x3+= *(p++); \	137	x3+= *(p++); \
138	x4&=0xffff; \	138	x4&=0xffff; \
139	idea_mul(x4,x4,*p,ul); p++; \	139	idea_mul(x4,x4,*p,ul); p++; \
140	t0=(x1^x3)&0xffff; \	140	t0=(x1^x3)&0xffff; \
141	idea_mul(t0,t0,*p,ul); p++; \	141	idea_mul(t0,t0,*p,ul); p++; \
142	t1=(t0+(x2^x4))&0xffff; \	142	t1=(t0+(x2^x4))&0xffff; \
143	idea_mul(t1,t1,*p,ul); p++; \	143	idea_mul(t1,t1,*p,ul); p++; \
144	t0+=t1; \	144	t0+=t1; \
145	x1^=t1; \	145	x1^=t1; \
146	x4^=t0; \	146	x4^=t0; \
147	ul=x2^t0; /* do the swap to x3 */ \	147	ul=x2^t0; /* do the swap to x3 */ \
148	x2=x3^t1; \	148	x2=x3^t1; \
149	x3=ul;	149	x3=ul;
150