From 8197d9ec36c6fd373366066f7037fcc0b6e058ea Mon Sep 17 00:00:00 2001
From: Aaron Jense <aaron@wolfssl.com>
Date: Mon, 21 May 2018 10:59:02 -0600
Subject: [PATCH] Added unit-test for wc_curve25519_init and wc_curve25519_free
 in tests/api.c

---
 tests/api.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/tests/api.c b/tests/api.c
index 11bcbded3..1fa519767 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -265,6 +265,10 @@
     #include <wolfssl/wolfcrypt/ed25519.h>
 #endif
 
+#ifdef HAVE_CURVE25519
+    #include <wolfssl/wolfcrypt/curve25519.h>
+#endif
+
 #if (defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL))
     #include <wolfssl/openssl/ssl.h>
     #ifndef NO_ASN
@@ -12115,6 +12119,43 @@ static int test_wc_ed25519_exportKey (void)
 
 } /* END test_wc_ed25519_exportKey */
 
+/*
+ * Testing wc_curve25519_init and wc_curve25519_free.
+ */
+static int test_wc_curve25519_init (void)
+{
+    int             ret = 0;
+
+#if defined(HAVE_CURVE25519)
+
+    curve25519_key  key;
+
+    printf(testingFmt, "wc_curve25519_init()");
+
+    ret = wc_curve25519_init(&key);
+
+    /* Test bad args for wc_curve25519_init */
+    if (ret == 0) {
+        ret = wc_curve25519_init(NULL);
+        if (ret == BAD_FUNC_ARG) {
+            ret = 0;
+        } else if (ret == 0) {
+            ret = SSL_FATAL_ERROR;
+        }
+    }
+
+    printf(resultFmt, ret == 0 ? passed : failed);
+
+    /*  Test good args for wc_curve_25519_free */
+    wc_curve25519_free(&key);
+
+    wc_curve25519_free(NULL);
+
+#endif
+    return ret;
+
+} /* END test_wc_curve25519_init and wc_curve_25519_free*/
+
 /*
  * Testing wc_ecc_make_key.
  */
@@ -18690,6 +18731,9 @@ void ApiTest(void)
     test_wc_ecc_get_curve_id_from_name();
     test_wc_ecc_get_curve_id_from_params();
 
+    /* wolfCrypt curve25519 tests */
+    test_wc_curve25519_init();
+
 #ifdef WOLFSSL_TLS13
     /* TLS v1.3 API tests */
     test_tls13_apis();
@@ -18842,6 +18886,8 @@ void ApiTest(void)
     AssertIntEQ(test_wc_ed25519_size(), 0);
     AssertIntEQ(test_wc_ed25519_exportKey(), 0);
 
+    AssertIntEQ(test_wc_curve25519_init(), 0);
+
     AssertIntEQ(test_wc_ecc_make_key(), 0);
     AssertIntEQ(test_wc_ecc_init(), 0);
     AssertIntEQ(test_wc_ecc_check_key(), 0);