X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-gc-pbkdf2-sha1.c;h=d0e6189eea2b989befdf82b9aba54441bc24c09c;hb=f283cf4e5364da816fdd6e376110035b04facae9;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..d0e6189ee 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, 2003, 2004, 2005, 2007, 2010 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,
@@ -18,9 +18,7 @@
 
 /* Written by Simon Josefsson.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "gc.h"
 
@@ -91,19 +89,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;