X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-gc-pbkdf2-sha1.c;h=3cf49968b660b626364ff2d421709da15c279c46;hb=d94bcb85e2e486d9ae424721cd8a6fd60553e6f6;hp=8027b9cb3efbf4875221687bc1b82dc0da3b93fa;hpb=9045e5f89f3d9b8d1033a67f47b4859e2618583c;p=gnulib.git

diff --git a/tests/test-gc-pbkdf2-sha1.c b/tests/test-gc-pbkdf2-sha1.c
index 8027b9cb3..3cf49968b 100644
--- a/tests/test-gc-pbkdf2-sha1.c
+++ b/tests/test-gc-pbkdf2-sha1.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005  Free Software Foundation
+ * Copyright (C) 2002-2005, 2007, 2010-2013 Free Software Foundation, Inc.
  *
  * 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)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -12,15 +12,11 @@
  * 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/>.  */
 
 /* Written by Simon Josefsson.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "gc.h"
 
@@ -91,19 +87,20 @@ main (int argc, char *argv[])
   for (i = 0; i < sizeof (pkcs5) / sizeof (pkcs5[0]); i++)
     {
       rc = gc_pbkdf2_sha1 (pkcs5[i].password, strlen (pkcs5[i].password),
-			   pkcs5[i].salt, strlen (pkcs5[i].salt),
-			   pkcs5[i].iterations, out, pkcs5[i].dklen);
+                           pkcs5[i].salt, strlen (pkcs5[i].salt),
+                           pkcs5[i].iterations, out, pkcs5[i].dklen);
       if (rc != GC_OK)
-	{
-	  printf ("PKCS5 entry %d failed fatally: %d\n", i, rc);
-	  return 1;
-	}
+        {
+          printf ("PKCS5 entry %ld failed fatally: %d\n",
+                  (unsigned long) i, rc);
+          return 1;
+        }
 
       if (memcmp (pkcs5[i].expected, out, pkcs5[i].dklen) != 0)
-	{
-	  printf ("PKCS5 entry %d failed\n", i);
-	  return 1;
-	}
+        {
+          printf ("PKCS5 entry %ld failed\n", (unsigned long) i);
+          return 1;
+        }
     }
 
   return 0;