X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-rijndael.c;h=1c956c414994886b93fb7deb0bac193f7fcf8e71;hb=f5e8d1d113d7767091266896f6dc5d5b2939b301;hp=e060d40f48567e787ab6f37b83f795659691e810;hpb=c903fb50d185dd1f0f6195e7113aaafb20a0a0af;p=gnulib.git

diff --git a/tests/test-rijndael.c b/tests/test-rijndael.c
index e060d40f4..1c956c414 100644
--- a/tests/test-rijndael.c
+++ b/tests/test-rijndael.c
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2005 Free Software Foundation
+ * Copyright (C) 2005, 2010-2012 Free Software Foundation, Inc.
  * Written by Simon Josefsson
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,13 +13,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.  */
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -40,7 +36,7 @@ main (int argc, char *argv[])
   size_t i;
 
   rc = rijndaelMakeKey (&key, RIJNDAEL_DIR_ENCRYPT,
-			128, "00000000000000000000000000000000");
+                        128, "00000000000000000000000000000000");
   if (rc != 0)
     printf ("makeKey failed %d\n", rc);
 
@@ -54,7 +50,7 @@ main (int argc, char *argv[])
     {
       rc = rijndaelBlockEncrypt (&cipher, &key, in, 128, out);
       if (rc < 0)
-	printf ("blockEncrypt failed %d\n", rc);
+        printf ("blockEncrypt failed %d\n", rc);
 
       memcpy (in, out, RIJNDAEL_BITSPERBLOCK / 8);
     }
@@ -64,16 +60,16 @@ main (int argc, char *argv[])
       size_t i;
       printf ("expected:\n");
       for (i = 0; i < RIJNDAEL_BITSPERBLOCK / 8; i++)
-	printf ("%02x ", ct[i] & 0xFF);
+        printf ("%02x ", ct[i] & 0xFF);
       printf ("\ncomputed:\n");
       for (i = 0; i < RIJNDAEL_BITSPERBLOCK / 8; i++)
-	printf ("%02x ", out[i] & 0xFF);
+        printf ("%02x ", out[i] & 0xFF);
       printf ("\n");
       return 1;
     }
 
   rc = rijndaelMakeKey (&key, RIJNDAEL_DIR_DECRYPT,
-			128, "00000000000000000000000000000000");
+                        128, "00000000000000000000000000000000");
   if (rc != 0)
     printf ("makeKey failed %d\n", rc);
 
@@ -87,7 +83,7 @@ main (int argc, char *argv[])
 
       rc = rijndaelBlockDecrypt (&cipher, &key, in, 128, out);
       if (rc < 0)
-	printf ("blockEncrypt failed %d\n", rc);
+        printf ("blockEncrypt failed %d\n", rc);
     }
 
   if (memcmp (out, pt, RIJNDAEL_BITSPERBLOCK / 8) != 0)
@@ -95,10 +91,10 @@ main (int argc, char *argv[])
       size_t i;
       printf ("expected:\n");
       for (i = 0; i < RIJNDAEL_BITSPERBLOCK / 8; i++)
-	printf ("%02x ", pt[i] & 0xFF);
+        printf ("%02x ", pt[i] & 0xFF);
       printf ("\ncomputed:\n");
       for (i = 0; i < RIJNDAEL_BITSPERBLOCK / 8; i++)
-	printf ("%02x ", out[i] & 0xFF);
+        printf ("%02x ", out[i] & 0xFF);
       printf ("\n");
       return 1;
     }