CVS shishi/tests

[shishi-commit]

Update of /home/cvs/shishi/tests
In directory dopio:/tmp/cvs-serv6181/tests

Modified Files:
        authenticator.c rijndael.c utils.c 
Log Message:
Indent.

--- /home/cvs/shishi/tests/authenticator.c      2004/09/17 12:45:27     1.20
+++ /home/cvs/shishi/tests/authenticator.c      2004/10/15 11:05:59     1.21
@@ -144,8 +144,7 @@
   res = shishi_authenticator_client (handle, a, &buf, &n);
   if (debug)
     escapeprint (buf, n);
-  if (res == SHISHI_OK && n == strlen ("foo")
-      && memcmp (buf, "foo", n) == 0)
+  if (res == SHISHI_OK && n == strlen ("foo") && memcmp (buf, "foo", n) == 0)
     {
       success ("shishi_authenticator_client() OK\n");
       free (buf);
--- /home/cvs/shishi/tests/rijndael.c   2004/04/18 13:36:46     1.3
+++ /home/cvs/shishi/tests/rijndael.c   2004/10/15 11:05:59     1.4
@@ -27,7 +27,8 @@
 #define IN "I would like the General Gau's Chicken, please, and wonton soup."
 #define ZERO "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
 
-static struct {
+static struct
+{
   const char *key;
   size_t keylen;
   const char *iv;
@@ -36,52 +37,53 @@
   const char *out;
   size_t outlen;
   const char *nextiv;
-} tv[] = {
+} tv[] =
+{
   {
-    KEY, 16,
-    ZERO,
-    IN, 17,
-    "\xc6\x35\x35\x68\xf2\xbf\x8c\xb4\xd8\xa5\x80\x36\x2d\xa7\xff\x7f\x97", 17,
-    "\xc6\x35\x35\x68\xf2\xbf\x8c\xb4\xd8\xa5\x80\x36\x2d\xa7\xff\x7f"},
-  {
-    KEY, 16,
-    ZERO,
-    IN, 31,
-    "\xfc\x00\x78\x3e\x0e\xfd\xb2\xc1\xd4\x45\xd4\xc8\xef\xf7\xed\x22"
-    "\x97\x68\x72\x68\xd6\xec\xcc\xc0\xc0\x7b\x25\xe2\x5e\xcf\xe5", 31,
-    "\xfc\x00\x78\x3e\x0e\xfd\xb2\xc1\xd4\x45\xd4\xc8\xef\xf7\xed\x22"},
-  {
-    KEY, 16,
-    ZERO,
-    IN, 32,
-    "\x39\x31\x25\x23\xa7\x86\x62\xd5\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8"
-    "\x97\x68\x72\x68\xd6\xec\xcc\xc0\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84", 32,
-    "\x39\x31\x25\x23\xa7\x86\x62\xd5\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8"},
-  {
-    KEY, 16,
-    ZERO,
-    IN, 47,
-    "\x97\x68\x72\x68\xd6\xec\xcc\xc0\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"
-    "\xb3\xff\xfd\x94\x0c\x16\xa1\x8c\x1b\x55\x49\xd2\xf8\x38\x02\x9e"
-    "\x39\x31\x25\x23\xa7\x86\x62\xd5\xbe\x7f\xcb\xcc\x98\xeb\xf5", 47,
-    "\xb3\xff\xfd\x94\x0c\x16\xa1\x8c\x1b\x55\x49\xd2\xf8\x38\x02\x9e"},
-  {
-    KEY, 16,
-    ZERO,
-    IN, 48,
-    "\x97\x68\x72\x68\xd6\xec\xcc\xc0\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"
-    "\x9d\xad\x8b\xbb\x96\xc4\xcd\xc0\x3b\xc1\x03\xe1\xa1\x94\xbb\xd8"
-    "\x39\x31\x25\x23\xa7\x86\x62\xd5\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8", 48,
-    "\x9d\xad\x8b\xbb\x96\xc4\xcd\xc0\x3b\xc1\x03\xe1\xa1\x94\xbb\xd8"},
-  {
-    KEY, 16,
-    ZERO,
-    IN, 64,
-    "\x97\x68\x72\x68\xd6\xec\xcc\xc0\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"
-    "\x39\x31\x25\x23\xa7\x86\x62\xd5\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8"
-    "\x48\x07\xef\xe8\x36\xee\x89\xa5\x26\x73\x0d\xbc\x2f\x7b\xc8\x40"
-    "\x9d\xad\x8b\xbb\x96\xc4\xcd\xc0\x3b\xc1\x03\xe1\xa1\x94\xbb\xd8", 64,
-    "\x48\x07\xef\xe8\x36\xee\x89\xa5\x26\x73\x0d\xbc\x2f\x7b\xc8\x40"}
+  KEY, 16,
+      ZERO,
+      IN, 17,
+      "\xc6\x35\x35\x68\xf2\xbf\x8c\xb4\xd8\xa5\x80\x36\x2d\xa7\xff\x7f\x97",
+      17, "\xc6\x35\x35\x68\xf2\xbf\x8c\xb4\xd8\xa5\x80\x36\x2d\xa7\xff\x7f"},
+  {
+  KEY, 16,
+      ZERO,
+      IN, 31,
+      "\xfc\x00\x78\x3e\x0e\xfd\xb2\xc1\xd4\x45\xd4\xc8\xef\xf7\xed\x22"
+      "\x97\x68\x72\x68\xd6\xec\xcc\xc0\xc0\x7b\x25\xe2\x5e\xcf\xe5", 31,
+      "\xfc\x00\x78\x3e\x0e\xfd\xb2\xc1\xd4\x45\xd4\xc8\xef\xf7\xed\x22"},
+  {
+  KEY, 16,
+      ZERO,
+      IN, 32,
+      "\x39\x31\x25\x23\xa7\x86\x62\xd5\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8"
+      "\x97\x68\x72\x68\xd6\xec\xcc\xc0\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84",
+      32, "\x39\x31\x25\x23\xa7\x86\x62\xd5\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8"},
+  {
+  KEY, 16,
+      ZERO,
+      IN, 47,
+      "\x97\x68\x72\x68\xd6\xec\xcc\xc0\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"
+      "\xb3\xff\xfd\x94\x0c\x16\xa1\x8c\x1b\x55\x49\xd2\xf8\x38\x02\x9e"
+      "\x39\x31\x25\x23\xa7\x86\x62\xd5\xbe\x7f\xcb\xcc\x98\xeb\xf5", 47,
+      "\xb3\xff\xfd\x94\x0c\x16\xa1\x8c\x1b\x55\x49\xd2\xf8\x38\x02\x9e"},
+  {
+  KEY, 16,
+      ZERO,
+      IN, 48,
+      "\x97\x68\x72\x68\xd6\xec\xcc\xc0\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"
+      "\x9d\xad\x8b\xbb\x96\xc4\xcd\xc0\x3b\xc1\x03\xe1\xa1\x94\xbb\xd8"
+      "\x39\x31\x25\x23\xa7\x86\x62\xd5\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8",
+      48, "\x9d\xad\x8b\xbb\x96\xc4\xcd\xc0\x3b\xc1\x03\xe1\xa1\x94\xbb\xd8"},
+  {
+  KEY, 16,
+      ZERO,
+      IN, 64,
+      "\x97\x68\x72\x68\xd6\xec\xcc\xc0\xc0\x7b\x25\xe2\x5e\xcf\xe5\x84"
+      "\x39\x31\x25\x23\xa7\x86\x62\xd5\xbe\x7f\xcb\xcc\x98\xeb\xf5\xa8"
+      "\x48\x07\xef\xe8\x36\xee\x89\xa5\x26\x73\x0d\xbc\x2f\x7b\xc8\x40"
+      "\x9d\xad\x8b\xbb\x96\xc4\xcd\xc0\x3b\xc1\x03\xe1\xa1\x94\xbb\xd8",
+      64, "\x48\x07\xef\xe8\x36\xee\x89\xa5\x26\x73\x0d\xbc\x2f\x7b\xc8\x40"}
 };
 
 void
@@ -98,9 +100,7 @@
     {
       err = shishi_aes_cts (handle, 0,
                            tv[i].key, tv[i].keylen,
-                           tv[i].iv, &ivout,
-                           tv[i].in, tv[i].inlen,
-                           &out);
+                           tv[i].iv, &ivout, tv[i].in, tv[i].inlen, &out);
 
       if (debug)
        {
--- /home/cvs/shishi/tests/utils.c      2004/04/17 22:41:34     1.11
+++ /home/cvs/shishi/tests/utils.c      2004/10/15 11:05:59     1.12
@@ -177,7 +177,7 @@
       if ((i + 1) % 16 == 0 && i + 1 < len)
        printf ("\n\t ;; ");
     }
-  puts("");
+  puts ("");
 }
 
 static void
@@ -204,7 +204,7 @@
       if ((i + 1) % 6 == 0 && i + 1 < len)
        printf ("\n\t ;; ");
     }
-  puts("");
+  puts ("");
 }
 
 void test (Shishi * handle);