1 files changed, 146 insertions, 139 deletions

diff --git a/src/regress/lib/libcrypto/cast/casttest.c b/src/regress/lib/libcrypto/cast/casttest.c
index 81b878ee7f..88c374ed65 100644
--- a/src/regress/lib/libcrypto/cast/casttest.c
+++ b/src/regress/lib/libcrypto/cast/casttest.c
@@ -1,25 +1,25 @@
-/*      $OpenBSD: casttest.c,v 1.2 2018/07/17 17:06:49 tb Exp $ */
+/*      $OpenBSD: casttest.c,v 1.3 2023/08/20 22:26:24 tb 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
@@ -65,158 +65,165 @@
 
 #define FULL_TEST
 
-static unsigned char k[16]={
-        0x01,0x23,0x45,0x67,0x12,0x34,0x56,0x78,
-        0x23,0x45,0x67,0x89,0x34,0x56,0x78,0x9A
-        };
+static unsigned char k[16] = {
+        0x01, 0x23, 0x45, 0x67, 0x12, 0x34, 0x56, 0x78,
+        0x23, 0x45, 0x67, 0x89, 0x34, 0x56, 0x78, 0x9A
+};
 
-static unsigned char in[8]={ 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF};
+static unsigned char in[8] = { 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF};
 
-static int k_len[3]={16,10,5};
-static unsigned char c[3][8]={
+static int k_len[3] = {16,10,5};
+static unsigned char c[3][8] = {
         {0x23,0x8B,0x4F,0xE5,0x84,0x7E,0x44,0xB2},
         {0xEB,0x6A,0x71,0x1A,0x2C,0x02,0x27,0x1B},
         {0x7A,0xC8,0x16,0xD1,0x6E,0x9B,0x30,0x2E},
-        };
+};
 static unsigned char out[80];
 
-static unsigned char in_a[16]={
-        0x01,0x23,0x45,0x67,0x12,0x34,0x56,0x78,
-        0x23,0x45,0x67,0x89,0x34,0x56,0x78,0x9A};
-static unsigned char in_b[16]={
-        0x01,0x23,0x45,0x67,0x12,0x34,0x56,0x78,
-        0x23,0x45,0x67,0x89,0x34,0x56,0x78,0x9A};
-
-static unsigned char c_a[16]={
-        0xEE,0xA9,0xD0,0xA2,0x49,0xFD,0x3B,0xA6,
-        0xB3,0x43,0x6F,0xB8,0x9D,0x6D,0xCA,0x92};
-static unsigned char c_b[16]={
-        0xB2,0xC9,0x5E,0xB0,0x0C,0x31,0xAD,0x71,
-        0x80,0xAC,0x05,0xB8,0xE8,0x3D,0x69,0x6E};
+static unsigned char in_a[16] = {
+        0x01, 0x23, 0x45, 0x67, 0x12, 0x34, 0x56, 0x78,
+        0x23, 0x45, 0x67, 0x89, 0x34, 0x56, 0x78, 0x9A
+};
+static unsigned char in_b[16] = {
+        0x01, 0x23, 0x45, 0x67, 0x12, 0x34, 0x56, 0x78,
+        0x23, 0x45, 0x67, 0x89, 0x34, 0x56, 0x78, 0x9A
+};
+
+static unsigned char c_a[16] = {
+        0xEE, 0xA9, 0xD0, 0xA2, 0x49, 0xFD, 0x3B, 0xA6,
+        0xB3, 0x43, 0x6F, 0xB8, 0x9D, 0x6D, 0xCA, 0x92
+};
+static unsigned char c_b[16] = {
+        0xB2, 0xC9, 0x5E, 0xB0, 0x0C, 0x31, 0xAD, 0x71,
+        0x80, 0xAC, 0x05, 0xB8, 0xE8, 0x3D, 0x69, 0x6E
+};
 
 #if 0
-char *text="Hello to all people out there";
-
-static unsigned char cfb_key[16]={
-        0xe1,0xf0,0xc3,0xd2,0xa5,0xb4,0x87,0x96,
-        0x69,0x78,0x4b,0x5a,0x2d,0x3c,0x0f,0x1e,
-        };
-static unsigned char cfb_iv[80]={0x34,0x12,0x78,0x56,0xab,0x90,0xef,0xcd};
-static unsigned char cfb_buf1[40],cfb_buf2[40],cfb_tmp[8];
+char *text = "Hello to all people out there";
+
+static unsigned char cfb_key[16] = {
+        0xe1, 0xf0, 0xc3, 0xd2, 0xa5, 0xb4, 0x87, 0x96,
+        0x69, 0x78, 0x4b, 0x5a, 0x2d, 0x3c, 0x0f, 0x1e,
+};
+static unsigned char cfb_iv[80] = {0x34,0x12,0x78,0x56,0xab,0x90,0xef,0xcd};
+static unsigned char cfb_buf1[40], cfb_buf2[40], cfb_tmp[8];
 #define CFB_TEST_SIZE 24
-static unsigned char plain[CFB_TEST_SIZE]=
-        {
-        0x4e,0x6f,0x77,0x20,0x69,0x73,
-        0x20,0x74,0x68,0x65,0x20,0x74,
-        0x69,0x6d,0x65,0x20,0x66,0x6f,
-        0x72,0x20,0x61,0x6c,0x6c,0x20
-        };
-static unsigned char cfb_cipher64[CFB_TEST_SIZE]={
-        0x59,0xD8,0xE2,0x65,0x00,0x58,0x6C,0x3F,
-        0x2C,0x17,0x25,0xD0,0x1A,0x38,0xB7,0x2A,
-        0x39,0x61,0x37,0xDC,0x79,0xFB,0x9F,0x45
+static unsigned char plain[CFB_TEST_SIZE] = {
+        0x4e, 0x6f, 0x77, 0x20, 0x69, 0x73,
+        0x20, 0x74, 0x68, 0x65, 0x20, 0x74,
+        0x69, 0x6d, 0x65, 0x20, 0x66, 0x6f,
+        0x72, 0x20, 0x61, 0x6c, 0x6c, 0x20
+};
+static unsigned char cfb_cipher64[CFB_TEST_SIZE] = {
+        0x59, 0xD8, 0xE2, 0x65, 0x00, 0x58, 0x6C, 0x3F,
+        0x2C, 0x17, 0x25, 0xD0, 0x1A, 0x38, 0xB7, 0x2A,
+        0x39, 0x61, 0x37, 0xDC, 0x79, 0xFB, 0x9F, 0x45
 
 /*      0xF9,0x78,0x32,0xB5,0x42,0x1A,0x6B,0x38,
         0x9A,0x44,0xD6,0x04,0x19,0x43,0xC4,0xD9,
         0x3D,0x1E,0xAE,0x47,0xFC,0xCF,0x29,0x0B,*/
-        }; 
+};
 #endif
 
-int main(int argc, char *argv[])
-    {
+int
+main(int argc, char *argv[])
+{
 #ifdef FULL_TEST
-    long l;
-    CAST_KEY key_b;
+        long l;
+        CAST_KEY key_b;
 #endif
-    int i,z,err=0;
-    CAST_KEY key;
-
-    for (z=0; z<3; z++)
-        {
-        CAST_set_key(&key,k_len[z],k);
-
-        CAST_ecb_encrypt(in,out,&key,CAST_ENCRYPT);
-        if (memcmp(out,&(c[z][0]),8) != 0)
-            {
-            printf("ecb cast error encrypting for keysize %d\n",k_len[z]*8);
-            printf("got     :");
-            for (i=0; i<8; i++)
-                printf("%02X ",out[i]);
-            printf("\n");
-            printf("expected:");
-            for (i=0; i<8; i++)
-                printf("%02X ",c[z][i]);
-            err=20;
-            printf("\n");
-            }
-
-        CAST_ecb_encrypt(out,out,&key,CAST_DECRYPT);
-        if (memcmp(out,in,8) != 0)
-            {
-            printf("ecb cast error decrypting for keysize %d\n",k_len[z]*8);
-            printf("got     :");
-            for (i=0; i<8; i++)
-                printf("%02X ",out[i]);
-            printf("\n");
-            printf("expected:");
-            for (i=0; i<8; i++)
-                printf("%02X ",in[i]);
-            printf("\n");
-            err=3;
-            }
+        int i, z, err = 0;
+        CAST_KEY key;
+
+        for (z = 0; z < 3; z++) {
+                CAST_set_key(&key, k_len[z], k);
+
+                CAST_ecb_encrypt(in, out, &key, CAST_ENCRYPT);
+                if (memcmp(out, &(c[z][0]), 8) != 0) {
+                        printf("ecb cast error encrypting for keysize %d\n",
+                            k_len[z]*8);
+                        printf("got     :");
+                        for (i = 0; i < 8; i++)
+                                printf("%02X ", out[i]);
+                        printf("\n");
+                        printf("expected:");
+                        for (i = 0; i < 8; i++)
+                                printf("%02X ", c[z][i]);
+                        err = 20;
+                        printf("\n");
+                }
+
+                CAST_ecb_encrypt(out, out, &key, CAST_DECRYPT);
+                if (memcmp(out, in, 8) != 0) {
+                        printf("ecb cast error decrypting for keysize %d\n",
+                            k_len[z]*8);
+                        printf("got     :");
+                        for (i = 0; i < 8; i++)
+                                printf("%02X ", out[i]);
+                        printf("\n");
+                        printf("expected:");
+                        for (i = 0; i < 8; i++)
+                                printf("%02X ", in[i]);
+                        printf("\n");
+                        err = 3;
+                }
         }
-    if (err == 0)
-        printf("ecb cast5 ok\n");
+        if (err == 0)
+                printf("ecb cast5 ok\n");
 
 #ifdef FULL_TEST
-      {
-      unsigned char out_a[16],out_b[16];
-      static char *hex="0123456789ABCDEF";
-      
-      printf("This test will take some time....");
-      fflush(stdout);
-      memcpy(out_a,in_a,sizeof(in_a));
-      memcpy(out_b,in_b,sizeof(in_b));
-      i=1;
-
-      for (l=0; l<1000000L; l++)
-          {
-          CAST_set_key(&key_b,16,out_b);
-          CAST_ecb_encrypt(&(out_a[0]),&(out_a[0]),&key_b,CAST_ENCRYPT);
-          CAST_ecb_encrypt(&(out_a[8]),&(out_a[8]),&key_b,CAST_ENCRYPT);
-          CAST_set_key(&key,16,out_a);
-          CAST_ecb_encrypt(&(out_b[0]),&(out_b[0]),&key,CAST_ENCRYPT);
-          CAST_ecb_encrypt(&(out_b[8]),&(out_b[8]),&key,CAST_ENCRYPT);
-          if ((l & 0xffff) == 0xffff)
-              {
-              printf("%c",hex[i&0x0f]);
-              fflush(stdout);
-              i++;
-              }
-          }
-
-      if (      (memcmp(out_a,c_a,sizeof(c_a)) != 0) ||
-                (memcmp(out_b,c_b,sizeof(c_b)) != 0))
-          {
-          printf("\n");
-          printf("Error\n");
-
-          printf("A out =");
-          for (i=0; i<16; i++) printf("%02X ",out_a[i]);
-          printf("\nactual=");
-          for (i=0; i<16; i++) printf("%02X ",c_a[i]);
-          printf("\n");
-
-          printf("B out =");
-          for (i=0; i<16; i++) printf("%02X ",out_b[i]);
-          printf("\nactual=");
-          for (i=0; i<16; i++) printf("%02X ",c_b[i]);
-          printf("\n");
-          }
-      else
-          printf(" ok\n");
-      }
+        {
+                unsigned char out_a[16], out_b[16];
+                static char *hex = "0123456789ABCDEF";
+
+                printf("This test will take some time....");
+                fflush(stdout);
+                memcpy(out_a, in_a, sizeof(in_a));
+                memcpy(out_b, in_b, sizeof(in_b));
+                i = 1;
+
+                for (l = 0; l < 1000000L; l++) {
+                        CAST_set_key(&key_b, 16, out_b);
+                        CAST_ecb_encrypt(&(out_a[0]), &(out_a[0]), &key_b,
+                            CAST_ENCRYPT);
+                        CAST_ecb_encrypt(&(out_a[8]), &(out_a[8]), &key_b,
+                            CAST_ENCRYPT);
+                        CAST_set_key(&key, 16, out_a);
+                        CAST_ecb_encrypt(&(out_b[0]), &(out_b[0]), &key,
+                            CAST_ENCRYPT);
+                        CAST_ecb_encrypt(&(out_b[8]), &(out_b[8]), &key,
+                            CAST_ENCRYPT);
+                        if ((l & 0xffff) == 0xffff) {
+                                printf("%c", hex[i & 0x0f]);
+                                fflush(stdout);
+                                i++;
+                        }
+                }
+
+                if ((memcmp(out_a, c_a, sizeof(c_a)) != 0) ||
+                    (memcmp(out_b, c_b, sizeof(c_b)) != 0)) {
+                        printf("\n");
+                        printf("Error\n");
+
+                        printf("A out =");
+                        for (i = 0; i < 16; i++)
+                                printf("%02X ", out_a[i]);
+                        printf("\nactual=");
+                        for (i = 0; i < 16; i++)
+                                printf("%02X ", c_a[i]);
+                        printf("\n");
+
+                        printf("B out =");
+                        for (i = 0; i < 16; i++)
+                                printf("%02X ", out_b[i]);
+                        printf("\nactual=");
+                        for (i = 0; i < 16; i++)
+                                printf("%02X ", c_b[i]);
+                        printf("\n");
+                } else
+                        printf(" ok\n");
+        }
 #endif
 
-    exit(err);
-    }
+        exit(err);
+}