From 51d9b223aae3c8896f8e1dd823d06b5362daf45a Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Tue, 16 Sep 2014 20:01:58 -0700
Subject: [PATCH] Test crypto_box_(before|after)nm

---
 test/default/box.c    | 11 +++++++++++
 test/default/box.exp  | 19 +++++++++++++++++++
 test/default/box2.c   | 12 ++++++++++++
 test/default/box2.exp | 17 +++++++++++++++++
 4 files changed, 59 insertions(+)

diff --git a/test/default/box.c b/test/default/box.c
index d0690cc3..b9ba1cc8 100644
--- a/test/default/box.c
+++ b/test/default/box.c
@@ -37,6 +37,7 @@ unsigned char c[163];
 
 int main(void)
 {
+    unsigned char k[crypto_box_BEFORENMBYTES];
     int i;
 
     crypto_box(c, m, 163, nonce, bobpk, alicesk);
@@ -47,6 +48,16 @@ int main(void)
     }
     printf("\n");
 
+    memset(c, 0, sizeof c);
+    crypto_box_beforenm(k, bobpk, alicesk);
+    crypto_box_afternm(c, m, 163, nonce, k);
+    for (i = 16; i < 163; ++i) {
+        printf(",0x%02x", (unsigned int)c[i]);
+        if (i % 8 == 7)
+            printf("\n");
+    }
+    printf("\n");
+
     assert(crypto_box_seedbytes() > 0U);
     assert(crypto_box_publickeybytes() > 0U);
     assert(crypto_box_secretkeybytes() > 0U);
diff --git a/test/default/box.exp b/test/default/box.exp
index 2b6c51ea..25db669b 100644
--- a/test/default/box.exp
+++ b/test/default/box.exp
@@ -17,3 +17,22 @@
 ,0x79,0x73,0xf6,0x22,0xa4,0x3d,0x14,0xa6
 ,0x59,0x9b,0x1f,0x65,0x4c,0xb4,0x5a,0x74
 ,0xe3,0x55,0xa5
+,0xf3,0xff,0xc7,0x70,0x3f,0x94,0x00,0xe5
+,0x2a,0x7d,0xfb,0x4b,0x3d,0x33,0x05,0xd9
+,0x8e,0x99,0x3b,0x9f,0x48,0x68,0x12,0x73
+,0xc2,0x96,0x50,0xba,0x32,0xfc,0x76,0xce
+,0x48,0x33,0x2e,0xa7,0x16,0x4d,0x96,0xa4
+,0x47,0x6f,0xb8,0xc5,0x31,0xa1,0x18,0x6a
+,0xc0,0xdf,0xc1,0x7c,0x98,0xdc,0xe8,0x7b
+,0x4d,0xa7,0xf0,0x11,0xec,0x48,0xc9,0x72
+,0x71,0xd2,0xc2,0x0f,0x9b,0x92,0x8f,0xe2
+,0x27,0x0d,0x6f,0xb8,0x63,0xd5,0x17,0x38
+,0xb4,0x8e,0xee,0xe3,0x14,0xa7,0xcc,0x8a
+,0xb9,0x32,0x16,0x45,0x48,0xe5,0x26,0xae
+,0x90,0x22,0x43,0x68,0x51,0x7a,0xcf,0xea
+,0xbd,0x6b,0xb3,0x73,0x2b,0xc0,0xe9,0xda
+,0x99,0x83,0x2b,0x61,0xca,0x01,0xb6,0xde
+,0x56,0x24,0x4a,0x9e,0x88,0xd5,0xf9,0xb3
+,0x79,0x73,0xf6,0x22,0xa4,0x3d,0x14,0xa6
+,0x59,0x9b,0x1f,0x65,0x4c,0xb4,0x5a,0x74
+,0xe3,0x55,0xa5
diff --git a/test/default/box2.c b/test/default/box2.c
index f0d326e7..93785f83 100644
--- a/test/default/box2.c
+++ b/test/default/box2.c
@@ -37,6 +37,7 @@ unsigned char m[163];
 
 int main(void)
 {
+    unsigned char k[crypto_box_BEFORENMBYTES];
     int i;
 
     if (crypto_box_open(m, c, 163, nonce, alicepk, bobsk) == 0) {
@@ -47,5 +48,16 @@ int main(void)
         }
         printf("\n");
     }
+
+    memset(m, 0, sizeof m);
+    crypto_box_beforenm(k, alicepk, bobsk);
+    if (crypto_box_open_afternm(m, c, 163, nonce, k) == 0) {
+        for (i = 32; i < 163; ++i) {
+            printf(",0x%02x", (unsigned int)m[i]);
+            if (i % 8 == 7)
+                printf("\n");
+        }
+        printf("\n");
+    }
     return 0;
 }
diff --git a/test/default/box2.exp b/test/default/box2.exp
index c61d4557..51deccd9 100644
--- a/test/default/box2.exp
+++ b/test/default/box2.exp
@@ -15,3 +15,20 @@
 ,0xf0,0xa0,0x89,0xbc,0x76,0x89,0x70,0x40
 ,0xe0,0x82,0xf9,0x37,0x76,0x38,0x48,0x64
 ,0x5e,0x07,0x05
+,0xbe,0x07,0x5f,0xc5,0x3c,0x81,0xf2,0xd5
+,0xcf,0x14,0x13,0x16,0xeb,0xeb,0x0c,0x7b
+,0x52,0x28,0xc5,0x2a,0x4c,0x62,0xcb,0xd4
+,0x4b,0x66,0x84,0x9b,0x64,0x24,0x4f,0xfc
+,0xe5,0xec,0xba,0xaf,0x33,0xbd,0x75,0x1a
+,0x1a,0xc7,0x28,0xd4,0x5e,0x6c,0x61,0x29
+,0x6c,0xdc,0x3c,0x01,0x23,0x35,0x61,0xf4
+,0x1d,0xb6,0x6c,0xce,0x31,0x4a,0xdb,0x31
+,0x0e,0x3b,0xe8,0x25,0x0c,0x46,0xf0,0x6d
+,0xce,0xea,0x3a,0x7f,0xa1,0x34,0x80,0x57
+,0xe2,0xf6,0x55,0x6a,0xd6,0xb1,0x31,0x8a
+,0x02,0x4a,0x83,0x8f,0x21,0xaf,0x1f,0xde
+,0x04,0x89,0x77,0xeb,0x48,0xf5,0x9f,0xfd
+,0x49,0x24,0xca,0x1c,0x60,0x90,0x2e,0x52
+,0xf0,0xa0,0x89,0xbc,0x76,0x89,0x70,0x40
+,0xe0,0x82,0xf9,0x37,0x76,0x38,0x48,0x64
+,0x5e,0x07,0x05