Hit idea with the loving mallet of knfmt

ok knfmt

7 files changed, 399 insertions, 380 deletions

diff --git a/lib/libcrypto/idea/i_cbc.c b/lib/libcrypto/idea/i_cbc.c
index e382a0a69e2..a9de41d647d 100644
--- a/lib/libcrypto/idea/i_cbc.c
+++ b/lib/libcrypto/idea/i_cbc.c
@@ -1,25 +1,25 @@
-/* $OpenBSD: i_cbc.c,v 1.4 2022/11/26 16:08:53 tb Exp $ */
+/* $OpenBSD: i_cbc.c,v 1.5 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,7 +49,7 @@
  * 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
@@ -59,91 +59,96 @@
 #include <openssl/idea.h>
 #include "idea_local.h"
 
-void idea_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-	     IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int encrypt)
-	{
-	unsigned long tin0,tin1;
-	unsigned long tout0,tout1,xor0,xor1;
-	long l=length;
+void
+idea_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
+    IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int encrypt)
+{
+	unsigned long tin0, tin1;
+	unsigned long tout0, tout1, xor0, xor1;
+	long l = length;
 	unsigned long tin[2];
 
-	if (encrypt)
+	if (encrypt) {
+		n2l(iv, tout0);
+		n2l(iv, tout1);
+		iv -= 8;
+		for (l -= 8; l >= 0; l -= 8)
 		{
-		n2l(iv,tout0);
-		n2l(iv,tout1);
-		iv-=8;
-		for (l-=8; l>=0; l-=8)
-			{
-			n2l(in,tin0);
-			n2l(in,tin1);
-			tin0^=tout0;
-			tin1^=tout1;
-			tin[0]=tin0;
-			tin[1]=tin1;
-			idea_encrypt(tin,ks);
-			tout0=tin[0]; l2n(tout0,out);
-			tout1=tin[1]; l2n(tout1,out);
-			}
-		if (l != -8)
-			{
-			n2ln(in,tin0,tin1,l+8);
-			tin0^=tout0;
-			tin1^=tout1;
-			tin[0]=tin0;
-			tin[1]=tin1;
-			idea_encrypt(tin,ks);
-			tout0=tin[0]; l2n(tout0,out);
-			tout1=tin[1]; l2n(tout1,out);
-			}
-		l2n(tout0,iv);
-		l2n(tout1,iv);
+			n2l(in, tin0);
+			n2l(in, tin1);
+			tin0 ^= tout0;
+			tin1 ^= tout1;
+			tin[0] = tin0;
+			tin[1] = tin1;
+			idea_encrypt(tin, ks);
+			tout0 = tin[0];
+			l2n(tout0, out);
+			tout1 = tin[1];
+			l2n(tout1, out);
+		}
+		if (l != -8) {
+			n2ln(in, tin0, tin1, l + 8);
+			tin0 ^= tout0;
+			tin1 ^= tout1;
+			tin[0] = tin0;
+			tin[1] = tin1;
+			idea_encrypt(tin, ks);
+			tout0 = tin[0];
+			l2n(tout0, out);
+			tout1 = tin[1];
+			l2n(tout1, out);
 		}
-	else
+		l2n(tout0, iv);
+		l2n(tout1, iv);
+	} else {
+		n2l(iv, xor0);
+		n2l(iv, xor1);
+		iv -= 8;
+		for (l -= 8; l >= 0; l -= 8)
 		{
-		n2l(iv,xor0);
-		n2l(iv,xor1);
-		iv-=8;
-		for (l-=8; l>=0; l-=8)
-			{
-			n2l(in,tin0); tin[0]=tin0;
-			n2l(in,tin1); tin[1]=tin1;
-			idea_encrypt(tin,ks);
-			tout0=tin[0]^xor0;
-			tout1=tin[1]^xor1;
-			l2n(tout0,out);
-			l2n(tout1,out);
-			xor0=tin0;
-			xor1=tin1;
-			}
-		if (l != -8)
-			{
-			n2l(in,tin0); tin[0]=tin0;
-			n2l(in,tin1); tin[1]=tin1;
-			idea_encrypt(tin,ks);
-			tout0=tin[0]^xor0;
-			tout1=tin[1]^xor1;
-			l2nn(tout0,tout1,out,l+8);
-			xor0=tin0;
-			xor1=tin1;
-			}
-		l2n(xor0,iv);
-		l2n(xor1,iv);
+			n2l(in, tin0);
+			tin[0] = tin0;
+			n2l(in, tin1);
+			tin[1] = tin1;
+			idea_encrypt(tin, ks);
+			tout0 = tin[0] ^ xor0;
+			tout1 = tin[1] ^ xor1;
+			l2n(tout0, out);
+			l2n(tout1, out);
+			xor0 = tin0;
+			xor1 = tin1;
 		}
-	tin0=tin1=tout0=tout1=xor0=xor1=0;
-	tin[0]=tin[1]=0;
+		if (l != -8) {
+			n2l(in, tin0);
+			tin[0] = tin0;
+			n2l(in, tin1);
+			tin[1] = tin1;
+			idea_encrypt(tin, ks);
+			tout0 = tin[0] ^ xor0;
+			tout1 = tin[1] ^ xor1;
+			l2nn(tout0, tout1, out, l + 8);
+			xor0 = tin0;
+			xor1 = tin1;
+		}
+		l2n(xor0, iv);
+		l2n(xor1, iv);
 	}
+	tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
+	tin[0] = tin[1] = 0;
+}
 
-void idea_encrypt(unsigned long *d, IDEA_KEY_SCHEDULE *key)
-	{
+void
+idea_encrypt(unsigned long *d, IDEA_KEY_SCHEDULE *key)
+{
 	IDEA_INT *p;
-	unsigned long x1,x2,x3,x4,t0,t1,ul;
+	unsigned long x1, x2, x3, x4, t0, t1, ul;
 
-	x2=d[0];
-	x1=(x2>>16);
-	x4=d[1];
-	x3=(x4>>16);
+	x2 = d[0];
+	x1 = (x2 >> 16);
+	x4 = d[1];
+	x3 = (x4 >> 16);
 
-	p= &(key->data[0][0]);
+	p = &(key->data[0][0]);
 
 	E_IDEA(0);
 	E_IDEA(1);
@@ -154,15 +159,16 @@ void idea_encrypt(unsigned long *d, IDEA_KEY_SCHEDULE *key)
 	E_IDEA(6);
 	E_IDEA(7);
 
-	x1&=0xffff;
-	idea_mul(x1,x1,*p,ul); p++;
+	x1 &= 0xffff;
+	idea_mul(x1, x1, *p, ul);
+	p++;
 
-	t0= x3+ *(p++);
-	t1= x2+ *(p++);
+	t0 = x3 + *(p++);
+	t1 = x2 + *(p++);
 
-	x4&=0xffff;
-	idea_mul(x4,x4,*p,ul);
+	x4 &= 0xffff;
+	idea_mul(x4, x4, *p, ul);
 
-	d[0]=(t0&0xffff)|((x1&0xffff)<<16);
-	d[1]=(x4&0xffff)|((t1&0xffff)<<16);
-	}
+	d[0] = (t0 & 0xffff)|((x1 & 0xffff) << 16);
+	d[1] = (x4 & 0xffff)|((t1 & 0xffff) << 16);
+}
diff --git a/lib/libcrypto/idea/i_cfb64.c b/lib/libcrypto/idea/i_cfb64.c
index d6b641197a3..f284684502e 100644
--- a/lib/libcrypto/idea/i_cfb64.c
+++ b/lib/libcrypto/idea/i_cfb64.c
@@ -1,25 +1,25 @@
-/* $OpenBSD: i_cfb64.c,v 1.4 2022/11/26 16:08:53 tb Exp $ */
+/* $OpenBSD: i_cfb64.c,v 1.5 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,7 +49,7 @@
  * 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
@@ -64,59 +64,60 @@
  * 64bit block we have used is contained in *num;
  */
 
-void idea_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-			long length, IDEA_KEY_SCHEDULE *schedule,
-			unsigned char *ivec, int *num, int encrypt)
-	{
-	unsigned long v0,v1,t;
-	int n= *num;
-	long l=length;
+void
+idea_cfb64_encrypt(const unsigned char *in, unsigned char *out,
+    long length, IDEA_KEY_SCHEDULE *schedule,
+    unsigned char *ivec, int *num, int encrypt)
+{
+	unsigned long v0, v1, t;
+	int n = *num;
+	long l = length;
 	unsigned long ti[2];
-	unsigned char *iv,c,cc;
+	unsigned char *iv, c, cc;
 
-	iv=(unsigned char *)ivec;
-	if (encrypt)
-		{
-		while (l--)
-			{
-			if (n == 0)
-				{
-				n2l(iv,v0); ti[0]=v0;
-				n2l(iv,v1); ti[1]=v1;
-				idea_encrypt((unsigned long *)ti,schedule);
-				iv=(unsigned char *)ivec;
-				t=ti[0]; l2n(t,iv);
-				t=ti[1]; l2n(t,iv);
-				iv=(unsigned char *)ivec;
-				}
-			c= *(in++)^iv[n];
-			*(out++)=c;
-			iv[n]=c;
-			n=(n+1)&0x07;
+	iv = (unsigned char *)ivec;
+	if (encrypt) {
+		while (l--) {
+			if (n == 0) {
+				n2l(iv, v0);
+				ti[0] = v0;
+				n2l(iv, v1);
+				ti[1] = v1;
+				idea_encrypt((unsigned long *)ti, schedule);
+				iv = (unsigned char *)ivec;
+				t = ti[0];
+				l2n(t, iv);
+				t = ti[1];
+				l2n(t, iv);
+				iv = (unsigned char *)ivec;
 			}
+			c = *(in++) ^ iv[n];
+			*(out++) = c;
+			iv[n] = c;
+			n = (n + 1) & 0x07;
 		}
-	else
-		{
-		while (l--)
-			{
-			if (n == 0)
-				{
-				n2l(iv,v0); ti[0]=v0;
-				n2l(iv,v1); ti[1]=v1;
-				idea_encrypt((unsigned long *)ti,schedule);
-				iv=(unsigned char *)ivec;
-				t=ti[0]; l2n(t,iv);
-				t=ti[1]; l2n(t,iv);
-				iv=(unsigned char *)ivec;
-				}
-			cc= *(in++);
-			c=iv[n];
-			iv[n]=cc;
-			*(out++)=c^cc;
-			n=(n+1)&0x07;
+	} else {
+		while (l--) {
+			if (n == 0) {
+				n2l(iv, v0);
+				ti[0] = v0;
+				n2l(iv, v1);
+				ti[1] = v1;
+				idea_encrypt((unsigned long *)ti, schedule);
+				iv = (unsigned char *)ivec;
+				t = ti[0];
+				l2n(t, iv);
+				t = ti[1];
+				l2n(t, iv);
+				iv = (unsigned char *)ivec;
 			}
+			cc = *(in++);
+			c = iv[n];
+			iv[n] = cc;
+			*(out++) = c ^ cc;
+			n = (n + 1) & 0x07;
 		}
-	v0=v1=ti[0]=ti[1]=t=c=cc=0;
-	*num=n;
 	}
-
+	v0 = v1 = ti[0] = ti[1] = t = c = cc = 0;
+	*num = n;
+}
diff --git a/lib/libcrypto/idea/i_ecb.c b/lib/libcrypto/idea/i_ecb.c
index 6fada765cd4..ce67edba664 100644
--- a/lib/libcrypto/idea/i_ecb.c
+++ b/lib/libcrypto/idea/i_ecb.c
@@ -1,25 +1,25 @@
-/* $OpenBSD: i_ecb.c,v 1.4 2022/11/26 16:08:53 tb Exp $ */
+/* $OpenBSD: i_ecb.c,v 1.5 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,7 +49,7 @@
  * 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
@@ -60,24 +60,29 @@
 #include "idea_local.h"
 #include <openssl/opensslv.h>
 
-const char *idea_options(void)
-	{
+const char *
+idea_options(void)
+{
 	if (sizeof(short) != sizeof(IDEA_INT))
-		return("idea(int)");
+		return ("idea(int)");
 	else
-		return("idea(short)");
-	}
-
-void idea_ecb_encrypt(const unsigned char *in, unsigned char *out,
-	     IDEA_KEY_SCHEDULE *ks)
-	{
-	unsigned long l0,l1,d[2];
+		return ("idea(short)");
+}
 
-	n2l(in,l0); d[0]=l0;
-	n2l(in,l1); d[1]=l1;
-	idea_encrypt(d,ks);
-	l0=d[0]; l2n(l0,out);
-	l1=d[1]; l2n(l1,out);
-	l0=l1=d[0]=d[1]=0;
-	}
+void
+idea_ecb_encrypt(const unsigned char *in, unsigned char *out,
+    IDEA_KEY_SCHEDULE *ks)
+{
+	unsigned long l0, l1, d[2];
 
+	n2l(in, l0);
+	d[0] = l0;
+	n2l(in, l1);
+	d[1] = l1;
+	idea_encrypt(d, ks);
+	l0 = d[0];
+	l2n(l0, out);
+	l1 = d[1];
+	l2n(l1, out);
+	l0 = l1 = d[0] = d[1] = 0;
+}
diff --git a/lib/libcrypto/idea/i_ofb64.c b/lib/libcrypto/idea/i_ofb64.c
index b63144b6c42..27d85e5a37b 100644
--- a/lib/libcrypto/idea/i_ofb64.c
+++ b/lib/libcrypto/idea/i_ofb64.c
@@ -1,25 +1,25 @@
-/* $OpenBSD: i_ofb64.c,v 1.4 2022/11/26 16:08:53 tb Exp $ */
+/* $OpenBSD: i_ofb64.c,v 1.5 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,7 +49,7 @@
  * 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
@@ -63,49 +63,48 @@
  * used.  The extra state information to record how much of the
  * 64bit block we have used is contained in *num;
  */
-void idea_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-			long length, IDEA_KEY_SCHEDULE *schedule,
-			unsigned char *ivec, int *num)
-	{
-	unsigned long v0,v1,t;
-	int n= *num;
-	long l=length;
+void
+idea_ofb64_encrypt(const unsigned char *in, unsigned char *out,
+    long length, IDEA_KEY_SCHEDULE *schedule,
+    unsigned char *ivec, int *num)
+{
+	unsigned long v0, v1, t;
+	int n = *num;
+	long l = length;
 	unsigned char d[8];
 	char *dp;
 	unsigned long ti[2];
 	unsigned char *iv;
-	int save=0;
+	int save = 0;
 
-	iv=(unsigned char *)ivec;
-	n2l(iv,v0);
-	n2l(iv,v1);
-	ti[0]=v0;
-	ti[1]=v1;
-	dp=(char *)d;
-	l2n(v0,dp);
-	l2n(v1,dp);
-	while (l--)
-		{
-		if (n == 0)
-			{
-			idea_encrypt((unsigned long *)ti,schedule);
-			dp=(char *)d;
-			t=ti[0]; l2n(t,dp);
-			t=ti[1]; l2n(t,dp);
+	iv = (unsigned char *)ivec;
+	n2l(iv, v0);
+	n2l(iv, v1);
+	ti[0] = v0;
+	ti[1] = v1;
+	dp = (char *)d;
+	l2n(v0, dp);
+	l2n(v1, dp);
+	while (l--) {
+		if (n == 0) {
+			idea_encrypt((unsigned long *)ti, schedule);
+			dp = (char *)d;
+			t = ti[0];
+			l2n(t, dp);
+			t = ti[1];
+			l2n(t, dp);
 			save++;
-			}
-		*(out++)= *(in++)^d[n];
-		n=(n+1)&0x07;
-		}
-	if (save)
-		{
-		v0=ti[0];
-		v1=ti[1];
-		iv=(unsigned char *)ivec;
-		l2n(v0,iv);
-		l2n(v1,iv);
 		}
-	t=v0=v1=ti[0]=ti[1]=0;
-	*num=n;
+		*(out++) = *(in++) ^ d[n];
+		n = (n + 1) & 0x07;
 	}
-
+	if (save) {
+		v0 = ti[0];
+		v1 = ti[1];
+		iv = (unsigned char *)ivec;
+		l2n(v0, iv);
+		l2n(v1, iv);
+	}
+	t = v0 = v1 = ti[0] = ti[1] = 0;
+	*num = n;
+}
diff --git a/lib/libcrypto/idea/i_skey.c b/lib/libcrypto/idea/i_skey.c
index 43381651275..481c50ba55f 100644
--- a/lib/libcrypto/idea/i_skey.c
+++ b/lib/libcrypto/idea/i_skey.c
@@ -1,25 +1,25 @@
-/* $OpenBSD: i_skey.c,v 1.5 2022/11/26 16:08:53 tb Exp $ */
+/* $OpenBSD: i_skey.c,v 1.6 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,7 +49,7 @@
  * 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
@@ -61,97 +61,107 @@
 #include "idea_local.h"
 
 static IDEA_INT inverse(unsigned int xin);
-void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks)
-	{
+void
+idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks)
+{
 	int i;
-	IDEA_INT *kt,*kf,r0,r1,r2;
+	IDEA_INT *kt, *kf, r0, r1, r2;
 
-	kt= &(ks->data[0][0]);
-	n2s(key,kt[0]); n2s(key,kt[1]); n2s(key,kt[2]); n2s(key,kt[3]);
-	n2s(key,kt[4]); n2s(key,kt[5]); n2s(key,kt[6]); n2s(key,kt[7]);
+	kt = &(ks->data[0][0]);
+	n2s(key, kt[0]);
+	n2s(key, kt[1]);
+	n2s(key, kt[2]);
+	n2s(key, kt[3]);
+	n2s(key, kt[4]);
+	n2s(key, kt[5]);
+	n2s(key, kt[6]);
+	n2s(key, kt[7]);
 
-	kf=kt;
-	kt+=8;
-	for (i=0; i<6; i++)
-		{
-		r2= kf[1];
-		r1= kf[2];
-		*(kt++)= ((r2<<9) | (r1>>7))&0xffff;
-		r0= kf[3];
-		*(kt++)= ((r1<<9) | (r0>>7))&0xffff;
-		r1= kf[4];
-		*(kt++)= ((r0<<9) | (r1>>7))&0xffff;
-		r0= kf[5];
-		*(kt++)= ((r1<<9) | (r0>>7))&0xffff;
-		r1= kf[6];
-		*(kt++)= ((r0<<9) | (r1>>7))&0xffff;
-		r0= kf[7];
-		*(kt++)= ((r1<<9) | (r0>>7))&0xffff;
-		r1= kf[0];
-		if (i >= 5) break;
-		*(kt++)= ((r0<<9) | (r1>>7))&0xffff;
-		*(kt++)= ((r1<<9) | (r2>>7))&0xffff;
-		kf+=8;
-		}
+	kf = kt;
+	kt += 8;
+	for (i = 0; i < 6; i++)
+	{
+		r2 = kf[1];
+		r1 = kf[2];
+		*(kt++) = ((r2 << 9) | (r1 >> 7)) & 0xffff;
+		r0 = kf[3];
+		*(kt++) = ((r1 << 9) | (r0 >> 7)) & 0xffff;
+		r1 = kf[4];
+		*(kt++) = ((r0 << 9) | (r1 >> 7)) & 0xffff;
+		r0 = kf[5];
+		*(kt++) = ((r1 << 9) | (r0 >> 7)) & 0xffff;
+		r1 = kf[6];
+		*(kt++) = ((r0 << 9) | (r1 >> 7)) & 0xffff;
+		r0 = kf[7];
+		*(kt++) = ((r1 << 9) | (r0 >> 7)) & 0xffff;
+		r1 = kf[0];
+		if (i >= 5)
+			break;
+		*(kt++) = ((r0 << 9) | (r1 >> 7)) & 0xffff;
+		*(kt++) = ((r1 << 9) | (r2 >> 7)) & 0xffff;
+		kf += 8;
 	}
+}
 
-void idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk)
-	{
+void
+idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk)
+{
 	int r;
-	IDEA_INT *fp,*tp,t;
+	IDEA_INT *fp, *tp, t;
 
-	tp= &(dk->data[0][0]);
-	fp= &(ek->data[8][0]);
-	for (r=0; r<9; r++)
-		{
-		*(tp++)=inverse(fp[0]);
-		*(tp++)=((int)(0x10000L-fp[2])&0xffff);
-		*(tp++)=((int)(0x10000L-fp[1])&0xffff);
-		*(tp++)=inverse(fp[3]);
-		if (r == 8) break;
-		fp-=6;
-		*(tp++)=fp[4];
-		*(tp++)=fp[5];
-		}
+	tp = &(dk->data[0][0]);
+	fp = &(ek->data[8][0]);
+	for (r = 0; r < 9; r++)
+	{
+		*(tp++) = inverse(fp[0]);
+		*(tp++) = ((int)(0x10000L - fp[2]) & 0xffff);
+		*(tp++) = ((int)(0x10000L - fp[1]) & 0xffff);
+		*(tp++) = inverse(fp[3]);
+		if (r == 8)
+			break;
+		fp -= 6;
+		*(tp++) = fp[4];
+		*(tp++) = fp[5];
+	}
 
-	tp= &(dk->data[0][0]);
-	t=tp[1];
-	tp[1]=tp[2];
-	tp[2]=t;
+	tp = &(dk->data[0][0]);
+	t = tp[1];
+	tp[1] = tp[2];
+	tp[2] = t;
 
-	t=tp[49];
-	tp[49]=tp[50];
-	tp[50]=t;
-	}
+	t = tp[49];
+	tp[49] = tp[50];
+	tp[50] = t;
+}
 
 /* taken directly from the 'paper' I'll have a look at it later */
-static IDEA_INT inverse(unsigned int xin)
-	{
-	long n1,n2,q,r,b1,b2,t;
+static IDEA_INT
+inverse(unsigned int xin)
+{
+	long n1, n2, q, r, b1, b2, t;
 
 	if (xin == 0)
-		b2=0;
-	else
-		{
-		n1=0x10001;
-		n2=xin;
-		b2=1;
-		b1=0;
+		b2 = 0;
+	else {
+		n1 = 0x10001;
+		n2 = xin;
+		b2 = 1;
+		b1 = 0;
 
-		do	{
-			r=(n1%n2);
-			q=(n1-r)/n2;
-			if (r == 0)
-				{ if (b2 < 0) b2=0x10001+b2; }
-			else
-				{
-				n1=n2;
-				n2=r;
-				t=b2;
-				b2=b1-q*b2;
-				b1=t;
-				}
-			} while (r != 0);
-		}
-	return((IDEA_INT)b2);
+		do {
+			r = (n1 % n2);
+			q = (n1 - r)/n2;
+			if (r == 0) {
+				if (b2 < 0)
+					b2 = 0x10001 + b2;
+			} else {
+				n1 = n2;
+				n2 = r;
+				t = b2;
+				b2 = b1 - q*b2;
+				b1 = t;
+			}
+		} while (r != 0);
 	}
+	return ((IDEA_INT)b2);
+}
diff --git a/lib/libcrypto/idea/idea.h b/lib/libcrypto/idea/idea.h
index f76bcaeba58..e5ddd3a6f61 100644
--- a/lib/libcrypto/idea/idea.h
+++ b/lib/libcrypto/idea/idea.h
@@ -1,25 +1,25 @@
-/* $OpenBSD: idea.h,v 1.10 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: idea.h,v 1.11 2023/07/07 12:51:58 beck Exp $ */
 /* Copyright (C) 1995-1997 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,7 +49,7 @@
  * 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
@@ -75,23 +75,22 @@
 extern "C" {
 #endif
 
-typedef struct idea_key_st
-	{
+typedef struct idea_key_st {
 	IDEA_INT data[9][6];
-	} IDEA_KEY_SCHEDULE;
+} IDEA_KEY_SCHEDULE;
 
 const char *idea_options(void);
 void idea_ecb_encrypt(const unsigned char *in, unsigned char *out,
-	IDEA_KEY_SCHEDULE *ks);
+    IDEA_KEY_SCHEDULE *ks);
 void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks);
 void idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk);
 void idea_cbc_encrypt(const unsigned char *in, unsigned char *out,
-	long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,int enc);
+    long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int enc);
 void idea_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-	long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
-	int *num,int enc);
+    long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
+    int *num, int enc);
 void idea_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-	long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int *num);
+    long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int *num);
 void idea_encrypt(unsigned long *in, IDEA_KEY_SCHEDULE *ks);
 #ifdef  __cplusplus
 }
diff --git a/lib/libcrypto/idea/idea_local.h b/lib/libcrypto/idea/idea_local.h
index 2663516c20e..c7fd3271a74 100644
--- a/lib/libcrypto/idea/idea_local.h
+++ b/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) \
-ul=(unsigned long)a*b; \
-if (ul != 0) \
-	{ \
-	r=(ul&0xffff)-(ul>>16); \
-	r-=((r)>>16); \
-	} \
-else \
+#define idea_mul(r,a,b,ul)						\
+ul=(unsigned long)a*b;							\
+if (ul != 0)								\
+	{								\
+	r=(ul&0xffff)-(ul>>16);						\
+	r-=((r)>>16);							\
+	}								\
+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)	{ \
-			c+=n; \
-			l1=l2=0; \
-			switch (n) { \
-			case 8: l2 =((unsigned long)(*(--(c))))    ; \
-			case 7: l2|=((unsigned long)(*(--(c))))<< 8; \
-			case 6: l2|=((unsigned long)(*(--(c))))<<16; \
-			case 5: l2|=((unsigned long)(*(--(c))))<<24; \
-			case 4: l1 =((unsigned long)(*(--(c))))    ; \
-			case 3: l1|=((unsigned long)(*(--(c))))<< 8; \
-			case 2: l1|=((unsigned long)(*(--(c))))<<16; \
-			case 1: l1|=((unsigned long)(*(--(c))))<<24; \
-				} \
+#define n2ln(c,l1,l2,n)	{						\
+			c+=n;						\
+			l1=l2=0;					\
+			switch (n) {					\
+			case 8: l2 =((unsigned long)(*(--(c))))    ;	\
+			case 7: l2|=((unsigned long)(*(--(c))))<< 8;	\
+			case 6: l2|=((unsigned long)(*(--(c))))<<16;	\
+			case 5: l2|=((unsigned long)(*(--(c))))<<24;	\
+			case 4: l1 =((unsigned long)(*(--(c))))    ;	\
+			case 3: l1|=((unsigned long)(*(--(c))))<< 8;	\
+			case 2: l1|=((unsigned long)(*(--(c))))<<16;	\
+			case 1: l1|=((unsigned long)(*(--(c))))<<24;	\
+				}					\
 			}
 
 /* NOTE - c is not incremented as per l2n */
-#define l2nn(l1,l2,c,n)	{ \
-			c+=n; \
-			switch (n) { \
-			case 8: *(--(c))=(unsigned char)(((l2)    )&0xff); \
-			case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \
-			case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \
-			case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \
-			case 4: *(--(c))=(unsigned char)(((l1)    )&0xff); \
-			case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \
-			case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \
-			case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \
-				} \
+#define l2nn(l1,l2,c,n)	{						\
+			c+=n;						\
+			switch (n) {					\
+			case 8: *(--(c))=(unsigned char)(((l2)    )&0xff);\
+			case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff);\
+			case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff);\
+			case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff);\
+			case 4: *(--(c))=(unsigned char)(((l1)    )&0xff);\
+			case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff);\
+			case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff);\
+			case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff);\
+				}					\
 			}
 
 #undef n2l
-#define n2l(c,l)        (l =((unsigned long)(*((c)++)))<<24L, \
-                         l|=((unsigned long)(*((c)++)))<<16L, \
-                         l|=((unsigned long)(*((c)++)))<< 8L, \
+#define n2l(c,l)        (l =((unsigned long)(*((c)++)))<<24L,		\
+                         l|=((unsigned long)(*((c)++)))<<16L,		\
+                         l|=((unsigned long)(*((c)++)))<< 8L,		\
                          l|=((unsigned long)(*((c)++))))
 
 #undef l2n
-#define l2n(l,c)        (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
+#define l2n(l,c)        (*((c)++)=(unsigned char)(((l)>>24L)&0xff),	\
+                         *((c)++)=(unsigned char)(((l)>>16L)&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) \
-	x1&=0xffff; \
-	idea_mul(x1,x1,*p,ul); p++; \
-	x2+= *(p++); \
-	x3+= *(p++); \
-	x4&=0xffff; \
-	idea_mul(x4,x4,*p,ul); p++; \
-	t0=(x1^x3)&0xffff; \
-	idea_mul(t0,t0,*p,ul); p++; \
-	t1=(t0+(x2^x4))&0xffff; \
-	idea_mul(t1,t1,*p,ul); p++; \
-	t0+=t1; \
-	x1^=t1; \
-	x4^=t0; \
-	ul=x2^t0; /* do the swap to x3 */ \
-	x2=x3^t1; \
+#define E_IDEA(num)							\
+	x1&=0xffff;							\
+	idea_mul(x1,x1,*p,ul); p++;					\
+	x2+= *(p++);							\
+	x3+= *(p++);							\
+	x4&=0xffff;							\
+	idea_mul(x4,x4,*p,ul); p++;					\
+	t0=(x1^x3)&0xffff;						\
+	idea_mul(t0,t0,*p,ul); p++;					\
+	t1=(t0+(x2^x4))&0xffff;						\
+	idea_mul(t1,t1,*p,ul); p++;					\
+	t0+=t1;								\
+	x1^=t1;								\
+	x4^=t0;								\
+	ul=x2^t0; /* do the swap to x3 */				\
+	x2=x3^t1;							\
 	x3=ul;
-