Hit rc2 with the loving mallet of knfmt.

ok tb@

1 files changed, 77 insertions, 78 deletions

diff --git a/src/lib/libcrypto/rc2/rc2_local.h b/src/lib/libcrypto/rc2/rc2_local.h
index c8bb468d1d..64c9c5388d 100644
--- a/src/lib/libcrypto/rc2/rc2_local.h
+++ b/src/lib/libcrypto/rc2/rc2_local.h
@@ -1,25 +1,25 @@
-/* $OpenBSD: rc2_local.h,v 1.1 2022/11/26 16:08:54 tb Exp $ */
+/* $OpenBSD: rc2_local.h,v 1.2 2023/07/07 08:29:37 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
@@ -57,100 +57,99 @@
  */
 
 #undef c2l
-#define c2l(c,l)        (l =((unsigned long)(*((c)++)))    , \
-                         l|=((unsigned long)(*((c)++)))<< 8L, \
-                         l|=((unsigned long)(*((c)++)))<<16L, \
+#define c2l(c,l)        (l =((unsigned long)(*((c)++)))    ,            \
+                         l|=((unsigned long)(*((c)++)))<< 8L,           \
+                         l|=((unsigned long)(*((c)++)))<<16L,           \
                          l|=((unsigned long)(*((c)++)))<<24L)
 
 /* NOTE - c is not incremented as per c2l */
 #undef c2ln
-#define c2ln(c,l1,l2,n) { \
-                        c+=n; \
-                        l1=l2=0; \
-                        switch (n) { \
-                        case 8: l2 =((unsigned long)(*(--(c))))<<24L; \
-                        case 7: l2|=((unsigned long)(*(--(c))))<<16L; \
-                        case 6: l2|=((unsigned long)(*(--(c))))<< 8L; \
-                        case 5: l2|=((unsigned long)(*(--(c))));     \
-                        case 4: l1 =((unsigned long)(*(--(c))))<<24L; \
-                        case 3: l1|=((unsigned long)(*(--(c))))<<16L; \
-                        case 2: l1|=((unsigned long)(*(--(c))))<< 8L; \
-                        case 1: l1|=((unsigned long)(*(--(c))));     \
-                                } \
+#define c2ln(c,l1,l2,n) {                                               \
+                        c+=n;                                           \
+                        l1=l2=0;                                        \
+                        switch (n) {                                    \
+                        case 8: l2 =((unsigned long)(*(--(c))))<<24L;   \
+                        case 7: l2|=((unsigned long)(*(--(c))))<<16L;   \
+                        case 6: l2|=((unsigned long)(*(--(c))))<< 8L;   \
+                        case 5: l2|=((unsigned long)(*(--(c))));        \
+                        case 4: l1 =((unsigned long)(*(--(c))))<<24L;   \
+                        case 3: l1|=((unsigned long)(*(--(c))))<<16L;   \
+                        case 2: l1|=((unsigned long)(*(--(c))))<< 8L;   \
+                        case 1: l1|=((unsigned long)(*(--(c))));        \
+                                }                                       \
                         }
 
 #undef l2c
-#define l2c(l,c)        (*((c)++)=(unsigned char)(((l)     )&0xff), \
-                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
+#define l2c(l,c)        (*((c)++)=(unsigned char)(((l)     )&0xff),     \
+                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff),     \
+                         *((c)++)=(unsigned char)(((l)>>16L)&0xff),     \
                          *((c)++)=(unsigned char)(((l)>>24L)&0xff))
 
 /* NOTE - c is not incremented as per l2c */
 #undef l2cn
-#define l2cn(l1,l2,c,n) { \
-                        c+=n; \
-                        switch (n) { \
-                        case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \
-                        case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \
-                        case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \
-                        case 5: *(--(c))=(unsigned char)(((l2)     )&0xff); \
-                        case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \
-                        case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \
-                        case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \
-                        case 1: *(--(c))=(unsigned char)(((l1)     )&0xff); \
-                                } \
+#define l2cn(l1,l2,c,n) {                                               \
+                        c+=n;                                           \
+                        switch (n) {                                    \
+                        case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff);\
+                        case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff);\
+                        case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff);\
+                        case 5: *(--(c))=(unsigned char)(((l2)     )&0xff);\
+                        case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff);\
+                        case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff);\
+                        case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff);\
+                        case 1: *(--(c))=(unsigned char)(((l1)     )&0xff);\
+                                }                                       \
                         }
 
 /* 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))
 
-#define C_RC2(n) \
-        t=(x0+(x1& ~x3)+(x2&x3)+ *(p0++))&0xffff; \
-        x0=(t<<1)|(t>>15); \
-        t=(x1+(x2& ~x0)+(x3&x0)+ *(p0++))&0xffff; \
-        x1=(t<<2)|(t>>14); \
-        t=(x2+(x3& ~x1)+(x0&x1)+ *(p0++))&0xffff; \
-        x2=(t<<3)|(t>>13); \
-        t=(x3+(x0& ~x2)+(x1&x2)+ *(p0++))&0xffff; \
+#define C_RC2(n)                                                        \
+        t=(x0+(x1& ~x3)+(x2&x3)+ *(p0++))&0xffff;                       \
+        x0=(t<<1)|(t>>15);                                              \
+        t=(x1+(x2& ~x0)+(x3&x0)+ *(p0++))&0xffff;                       \
+        x1=(t<<2)|(t>>14);                                              \
+        t=(x2+(x3& ~x1)+(x0&x1)+ *(p0++))&0xffff;                       \
+        x2=(t<<3)|(t>>13);                                              \
+        t=(x3+(x0& ~x2)+(x1&x2)+ *(p0++))&0xffff;                       \
         x3=(t<<5)|(t>>11);
-