From 3b680e0a52b3fdf6b890dbf7b66c4a45a4469af1 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 13 Sep 2014 13:56:41 -0700
Subject: [PATCH] Use high-level APIs in tests

---
 test/default/auth.c         | 2 +-
 test/default/auth5.c        | 8 ++++----
 test/default/box.c          | 2 +-
 test/default/box2.c         | 2 +-
 test/default/box_seed.c     | 2 +-
 test/default/hash3.c        | 6 +++---
 test/default/onetimeauth.c  | 2 +-
 test/default/onetimeauth2.c | 2 +-
 test/default/onetimeauth7.c | 8 ++++----
 test/default/scalarmult.c   | 2 +-
 test/default/scalarmult2.c  | 2 +-
 test/default/scalarmult5.c  | 2 +-
 test/default/scalarmult6.c  | 2 +-
 test/default/secretbox.c    | 2 +-
 test/default/secretbox2.c   | 2 +-
 test/default/stream.c       | 2 +-
 test/default/stream3.c      | 2 +-
 test/default/stream4.c      | 2 +-
 18 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/test/default/auth.c b/test/default/auth.c
index 88c8207f..b424b52d 100644
--- a/test/default/auth.c
+++ b/test/default/auth.c
@@ -12,7 +12,7 @@ unsigned char a[32];
 int main(void)
 {
   int i;
-  crypto_auth_hmacsha512256(a,c,sizeof c - 1U,key);
+  crypto_auth(a,c,sizeof c - 1U,key);
   for (i = 0;i < 32;++i) {
     printf(",0x%02x",(unsigned int) a[i]);
     if (i % 8 == 7) printf("\n");
diff --git a/test/default/auth5.c b/test/default/auth5.c
index ded9489c..4f06ac0e 100644
--- a/test/default/auth5.c
+++ b/test/default/auth5.c
@@ -15,19 +15,19 @@ int main(void)
   for (clen = 0;clen < 10000;++clen) {
     randombytes(key,sizeof key);
     randombytes(c,clen);
-    crypto_auth_hmacsha512256(a,c,clen,key);
-    if (crypto_auth_hmacsha512256_verify(a,c,clen,key) != 0) {
+    crypto_auth(a,c,clen,key);
+    if (crypto_auth_verify(a,c,clen,key) != 0) {
       printf("fail %d\n",clen);
       return 100;
     }
     if (clen > 0) {
       c[rand() % clen] += 1 + (rand() % 255);
-      if (crypto_auth_hmacsha512256_verify(a,c,clen,key) == 0) {
+      if (crypto_auth_verify(a,c,clen,key) == 0) {
         printf("forgery %d\n",clen);
         return 100;
       }
       a[rand() % sizeof a] += 1 + (rand() % 255);
-      if (crypto_auth_hmacsha512256_verify(a,c,clen,key) == 0) {
+      if (crypto_auth_verify(a,c,clen,key) == 0) {
         printf("forgery %d\n",clen);
         return 100;
       }
diff --git a/test/default/box.c b/test/default/box.c
index d9f26292..567446eb 100644
--- a/test/default/box.c
+++ b/test/default/box.c
@@ -53,7 +53,7 @@ unsigned char c[163];
 int main(void)
 {
   int i;
-  crypto_box_curve25519xsalsa20poly1305(
+  crypto_box(
     c,m,163,nonce,bobpk,alicesk
   );
   for (i = 16;i < 163;++i) {
diff --git a/test/default/box2.c b/test/default/box2.c
index 7af2f581..c1a1a5f0 100644
--- a/test/default/box2.c
+++ b/test/default/box2.c
@@ -53,7 +53,7 @@ unsigned char m[163];
 int main(void)
 {
   int i;
-  if (crypto_box_curve25519xsalsa20poly1305_open(
+  if (crypto_box_open(
        m,c,163,nonce,alicepk,bobsk
      ) == 0) {
     for (i = 32;i < 163;++i) {
diff --git a/test/default/box_seed.c b/test/default/box_seed.c
index 6533d8cb..653f294a 100644
--- a/test/default/box_seed.c
+++ b/test/default/box_seed.c
@@ -15,7 +15,7 @@ int main(void)
   int i;
   unsigned char sk[32];
   unsigned char pk[32];
-  crypto_box_curve25519xsalsa20poly1305_seed_keypair(pk, sk, seed);
+  crypto_box_seed_keypair(pk, sk, seed);
   for (i = 0;i < 32;++i) {
     printf(",0x%02x",(unsigned int) pk[i]);
     if (i % 8 == 7) printf("\n");
diff --git a/test/default/hash3.c b/test/default/hash3.c
index a5461258..1ecf8973 100644
--- a/test/default/hash3.c
+++ b/test/default/hash3.c
@@ -4,13 +4,13 @@
 #include "cmptest.h"
 
 unsigned char x[] = "testing\n";
-unsigned char h[crypto_hash_sha512_BYTES];
+unsigned char h[crypto_hash_BYTES];
 
 int main(void)
 {
   size_t i;
-  crypto_hash_sha512(h,x,sizeof x - 1U);
-  for (i = 0;i < crypto_hash_sha512_BYTES;++i) printf("%02x",(unsigned int) h[i]);
+  crypto_hash(h,x,sizeof x - 1U);
+  for (i = 0;i < crypto_hash_BYTES;++i) printf("%02x",(unsigned int) h[i]);
   printf("\n");
   return 0;
 }
diff --git a/test/default/onetimeauth.c b/test/default/onetimeauth.c
index ddeb8eec..78ddf03b 100644
--- a/test/default/onetimeauth.c
+++ b/test/default/onetimeauth.c
@@ -35,7 +35,7 @@ unsigned char a[16];
 int main(void)
 {
   int i;
-  crypto_onetimeauth_poly1305(a,c,131,rs);
+  crypto_onetimeauth(a,c,131,rs);
   for (i = 0;i < 16;++i) {
     printf(",0x%02x",(unsigned int) a[i]);
     if (i % 8 == 7) printf("\n");
diff --git a/test/default/onetimeauth2.c b/test/default/onetimeauth2.c
index 2114e291..8c498dfd 100644
--- a/test/default/onetimeauth2.c
+++ b/test/default/onetimeauth2.c
@@ -37,6 +37,6 @@ unsigned char a[16] = {
 
 int main(void)
 {
-  printf("%d\n",crypto_onetimeauth_poly1305_verify(a,c,131,rs));
+  printf("%d\n",crypto_onetimeauth_verify(a,c,131,rs));
   return 0;
 }
diff --git a/test/default/onetimeauth7.c b/test/default/onetimeauth7.c
index 6d99134c..a38bbaf4 100644
--- a/test/default/onetimeauth7.c
+++ b/test/default/onetimeauth7.c
@@ -15,19 +15,19 @@ int main(void)
   for (clen = 0;clen < 10000;++clen) {
     randombytes(key,sizeof key);
     randombytes(c,clen);
-    crypto_onetimeauth_poly1305(a,c,clen,key);
-    if (crypto_onetimeauth_poly1305_verify(a,c,clen,key) != 0) {
+    crypto_onetimeauth(a,c,clen,key);
+    if (crypto_onetimeauth_verify(a,c,clen,key) != 0) {
       printf("fail %d\n",clen);
       return 100;
     }
     if (clen > 0) {
       c[rand() % clen] += 1 + (rand() % 255);
-      if (crypto_onetimeauth_poly1305_verify(a,c,clen,key) == 0) {
+      if (crypto_onetimeauth_verify(a,c,clen,key) == 0) {
         printf("forgery %d\n",clen);
         return 100;
       }
       a[rand() % sizeof a] += 1 + (rand() % 255);
-      if (crypto_onetimeauth_poly1305_verify(a,c,clen,key) == 0) {
+      if (crypto_onetimeauth_verify(a,c,clen,key) == 0) {
         printf("forgery %d\n",clen);
         return 100;
       }
diff --git a/test/default/scalarmult.c b/test/default/scalarmult.c
index 957bc9c1..9b12b638 100644
--- a/test/default/scalarmult.c
+++ b/test/default/scalarmult.c
@@ -15,7 +15,7 @@ unsigned char alicepk[32];
 int main(void)
 {
   int i;
-  crypto_scalarmult_curve25519_base(alicepk,alicesk);
+  crypto_scalarmult_base(alicepk,alicesk);
   for (i = 0;i < 32;++i) {
     if (i > 0) printf(","); else printf(" ");
     printf("0x%02x",(unsigned int) alicepk[i]);
diff --git a/test/default/scalarmult2.c b/test/default/scalarmult2.c
index 93a37d07..7660f670 100644
--- a/test/default/scalarmult2.c
+++ b/test/default/scalarmult2.c
@@ -15,7 +15,7 @@ unsigned char bobpk[32];
 int main(void)
 {
   int i;
-  crypto_scalarmult_curve25519_base(bobpk,bobsk);
+  crypto_scalarmult_base(bobpk,bobsk);
   for (i = 0;i < 32;++i) {
     if (i > 0) printf(","); else printf(" ");
     printf("0x%02x",(unsigned int) bobpk[i]);
diff --git a/test/default/scalarmult5.c b/test/default/scalarmult5.c
index b6852a91..99b2536e 100644
--- a/test/default/scalarmult5.c
+++ b/test/default/scalarmult5.c
@@ -22,7 +22,7 @@ unsigned char k[32];
 int main(void)
 {
   int i;
-  crypto_scalarmult_curve25519(k,alicesk,bobpk);
+  crypto_scalarmult(k,alicesk,bobpk);
   for (i = 0;i < 32;++i) {
     if (i > 0) printf(","); else printf(" ");
     printf("0x%02x",(unsigned int) k[i]);
diff --git a/test/default/scalarmult6.c b/test/default/scalarmult6.c
index c1ac8853..092f590f 100644
--- a/test/default/scalarmult6.c
+++ b/test/default/scalarmult6.c
@@ -22,7 +22,7 @@ unsigned char k[32];
 int main(void)
 {
   int i;
-  crypto_scalarmult_curve25519(k,bobsk,alicepk);
+  crypto_scalarmult(k,bobsk,alicepk);
   for (i = 0;i < 32;++i) {
     if (i > 0) printf(","); else printf(" ");
     printf("0x%02x",(unsigned int) k[i]);
diff --git a/test/default/secretbox.c b/test/default/secretbox.c
index 485a97a1..0a9290dc 100644
--- a/test/default/secretbox.c
+++ b/test/default/secretbox.c
@@ -46,7 +46,7 @@ unsigned char c[163];
 int main(void)
 {
   int i;
-  crypto_secretbox_xsalsa20poly1305(
+  crypto_secretbox(
     c,m,163,nonce,firstkey
   );
   for (i = 16;i < 163;++i) {
diff --git a/test/default/secretbox2.c b/test/default/secretbox2.c
index 5af6c41b..6f71f525 100644
--- a/test/default/secretbox2.c
+++ b/test/default/secretbox2.c
@@ -46,7 +46,7 @@ unsigned char m[163];
 int main(void)
 {
   int i;
-  if (crypto_secretbox_xsalsa20poly1305_open(
+  if (crypto_secretbox_open(
        m,c,163,nonce,firstkey
       ) == 0) {
     for (i = 32;i < 163;++i) {
diff --git a/test/default/stream.c b/test/default/stream.c
index cc6d4162..a74d4567 100644
--- a/test/default/stream.c
+++ b/test/default/stream.c
@@ -23,7 +23,7 @@ unsigned char h[32];
 int main(void)
 {
   int i;
-  crypto_stream_xsalsa20(output,4194304,nonce,firstkey);
+  crypto_stream(output,4194304,nonce,firstkey);
   crypto_hash_sha256(h,output,sizeof output);
   for (i = 0;i < 32;++i) printf("%02x",h[i]); printf("\n");
   return 0;
diff --git a/test/default/stream3.c b/test/default/stream3.c
index 3a1f559d..6e403d91 100644
--- a/test/default/stream3.c
+++ b/test/default/stream3.c
@@ -21,7 +21,7 @@ unsigned char rs[32];
 int main(void)
 {
   int i;
-  crypto_stream_xsalsa20(rs,32,nonce,firstkey);
+  crypto_stream(rs,32,nonce,firstkey);
   for (i = 0;i < 32;++i) {
     printf(",0x%02x",(unsigned int) rs[i]);
     if (i % 8 == 7) printf("\n");
diff --git a/test/default/stream4.c b/test/default/stream4.c
index 91c724f7..3ac9c86f 100644
--- a/test/default/stream4.c
+++ b/test/default/stream4.c
@@ -45,7 +45,7 @@ unsigned char c[163];
 int main(void)
 {
   int i;
-  crypto_stream_xsalsa20_xor(c,m,163,nonce,firstkey);
+  crypto_stream_xor(c,m,163,nonce,firstkey);
   for (i = 32;i < 163;++i) {
     printf(",0x%02x",(unsigned int) c[i]);
     if (i % 8 == 7) printf("\n");