X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-gc-pbkdf2-sha1.c;h=d0e6189eea2b989befdf82b9aba54441bc24c09c;hb=de9f4b1;hp=d4f9dc86a7bfdcad7b52df19203ecfc74bc1f659;hpb=4f87874de0991adc35c4777dbc3542677ca8dec9;p=gnulib.git diff --git a/tests/test-gc-pbkdf2-sha1.c b/tests/test-gc-pbkdf2-sha1.c index d4f9dc86a..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, 2007 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 -#endif +#include #include "gc.h" @@ -91,20 +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 %ld failed fatally: %d\n", - (unsigned long) 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 %ld failed\n", (unsigned long) i); - return 1; - } + { + printf ("PKCS5 entry %ld failed\n", (unsigned long) i); + return 1; + } } return 0;