test/crypto.c

changeset 488
29b979ca8750
parent 487
a2fc5b1cd476
child 515
2465dd550bb5
--- a/test/crypto.c	Sat Oct 20 13:33:46 2018 +0200
+++ b/test/crypto.c	Sat Oct 20 13:46:32 2018 +0200
@@ -418,25 +418,25 @@
             DavKey *keys[4];
             keys[0] =  dav_pw2key(
                     pws[p],
-                    salt[s],
+                    (char*)salt[s],
                     saltlen[s],
                     DAV_PWFUNC_PBKDF2_SHA256,
                     DAV_KEY_AES128);
             keys[1] = dav_pw2key(
                     pws[p],
-                    salt[s],
+                    (char*)salt[s],
                     saltlen[s],
                     DAV_PWFUNC_PBKDF2_SHA256,
                     DAV_KEY_AES256);
             keys[2] = dav_pw2key(
                     pws[p],
-                    salt[s],
+                    (char*)salt[s],
                     saltlen[s],
                     DAV_PWFUNC_PBKDF2_SHA512,
                     DAV_KEY_AES128);
             keys[3] = dav_pw2key(
                     pws[p],
-                    salt[s],
+                    (char*)salt[s],
                     saltlen[s],
                     DAV_PWFUNC_PBKDF2_SHA512,
                     DAV_KEY_AES256);
@@ -447,9 +447,6 @@
                 int index = 16*p + 4*s + i;
                 int keylen = index % 2 == 0 ? 16 : 32;
                 
-                char *s1 = pwgenkeys[index];
-                char *s2 = key->data;
-                
                 UCX_TEST_ASSERT(keylen == key->length, "wrong key length");
                 UCX_TEST_ASSERT(!memcmp(key->data, pwgenkeys[index], keylen), "wrong key data");
             }

mercurial