commit 6061f5e2bd8272079e5b72e0d19aa2a6ca342e4e
Author: David Goulet <dgou...@torproject.org>
Date:   Thu Apr 20 10:04:28 2017 -0400

    test: Add test_hs_ntor unit tests
    
    Move the ntor test from test_hs_service.c to this file.
    
    Signed-off-by: David Goulet <dgou...@torproject.org>
---
 src/test/include.am        |   1 +
 src/test/test.c            |   1 +
 src/test/test.h            |   1 +
 src/test/test_hs_ntor.c    | 114 +++++++++++++++++++++++++++++++++++++++++++++
 src/test/test_hs_service.c |  99 +--------------------------------------
 5 files changed, 119 insertions(+), 97 deletions(-)

diff --git a/src/test/include.am b/src/test/include.am
index 53c723df8..5f6753230 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -116,6 +116,7 @@ src_test_test_SOURCES = \
        src/test/test_hs.c \
        src/test/test_hs_config.c \
        src/test/test_hs_cell.c \
+       src/test/test_hs_ntor.c \
        src/test/test_hs_service.c \
        src/test/test_hs_client.c  \
        src/test/test_hs_intropoint.c \
diff --git a/src/test/test.c b/src/test/test.c
index 2a2d5ba64..716902773 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -1217,6 +1217,7 @@ struct testgroup_t testgroups[] = {
   { "hs_cell/", hs_cell_tests },
   { "hs_config/", hs_config_tests },
   { "hs_descriptor/", hs_descriptor },
+  { "hs_ntor/", hs_ntor_tests },
   { "hs_service/", hs_service_tests },
   { "hs_client/", hs_client_tests },
   { "hs_intropoint/", hs_intropoint_tests },
diff --git a/src/test/test.h b/src/test/test.h
index b30301d06..f651dc0c2 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -210,6 +210,7 @@ extern struct testcase_t hs_cache[];
 extern struct testcase_t hs_cell_tests[];
 extern struct testcase_t hs_config_tests[];
 extern struct testcase_t hs_descriptor[];
+extern struct testcase_t hs_ntor_tests[];
 extern struct testcase_t hs_service_tests[];
 extern struct testcase_t hs_client_tests[];
 extern struct testcase_t hs_intropoint_tests[];
diff --git a/src/test/test_hs_ntor.c b/src/test/test_hs_ntor.c
new file mode 100644
index 000000000..254499710
--- /dev/null
+++ b/src/test/test_hs_ntor.c
@@ -0,0 +1,114 @@
+/* Copyright (c) 2017, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file test_hs_ntor.c
+ * \brief Test hidden service ntor functionality.
+ */
+
+#include "test.h"
+#include "test_helpers.h"
+#include "log_test_helpers.h"
+
+#include "hs_ntor.h"
+
+/* Test the HS ntor handshake. Simulate the sending of an encrypted INTRODUCE1
+ * cell, and verify the proper derivation of decryption keys on the other end.
+ * Then simulate the sending of an authenticated RENDEZVOUS1 cell and verify
+ * the proper verification on the other end. */
+static void
+test_hs_ntor(void *arg)
+{
+  int retval;
+
+  uint8_t subcredential[DIGEST256_LEN];
+
+  ed25519_keypair_t service_intro_auth_keypair;
+  curve25519_keypair_t service_intro_enc_keypair;
+  curve25519_keypair_t service_ephemeral_rend_keypair;
+
+  curve25519_keypair_t client_ephemeral_enc_keypair;
+
+  hs_ntor_intro_cell_keys_t client_hs_ntor_intro_cell_keys;
+  hs_ntor_intro_cell_keys_t service_hs_ntor_intro_cell_keys;
+
+  hs_ntor_rend_cell_keys_t service_hs_ntor_rend_cell_keys;
+  hs_ntor_rend_cell_keys_t client_hs_ntor_rend_cell_keys;
+
+  (void) arg;
+
+  /* Generate fake data for this unittest */
+  {
+    /* Generate fake subcredential */
+    memset(subcredential, 'Z', DIGEST256_LEN);
+
+    /* service */
+    curve25519_keypair_generate(&service_intro_enc_keypair, 0);
+    ed25519_keypair_generate(&service_intro_auth_keypair, 0);
+    curve25519_keypair_generate(&service_ephemeral_rend_keypair, 0);
+    /* client */
+    curve25519_keypair_generate(&client_ephemeral_enc_keypair, 0);
+  }
+
+  /* Client: Simulate the sending of an encrypted INTRODUCE1 cell */
+  retval =
+    hs_ntor_client_get_introduce1_keys(&service_intro_auth_keypair.pubkey,
+                                       &service_intro_enc_keypair.pubkey,
+                                       &client_ephemeral_enc_keypair,
+                                       subcredential,
+                                       &client_hs_ntor_intro_cell_keys);
+  tt_int_op(retval, ==, 0);
+
+  /* Service: Simulate the decryption of the received INTRODUCE1 */
+  retval =
+    hs_ntor_service_get_introduce1_keys(&service_intro_auth_keypair.pubkey,
+                                        &service_intro_enc_keypair,
+                                        &client_ephemeral_enc_keypair.pubkey,
+                                        subcredential,
+                                        &service_hs_ntor_intro_cell_keys);
+  tt_int_op(retval, ==, 0);
+
+  /* Test that the INTRODUCE1 encryption/mac keys match! */
+  tt_mem_op(client_hs_ntor_intro_cell_keys.enc_key, OP_EQ,
+            service_hs_ntor_intro_cell_keys.enc_key,
+            CIPHER256_KEY_LEN);
+  tt_mem_op(client_hs_ntor_intro_cell_keys.mac_key, OP_EQ,
+            service_hs_ntor_intro_cell_keys.mac_key,
+            DIGEST256_LEN);
+
+  /* Service: Simulate creation of RENDEZVOUS1 key material. */
+  retval =
+    hs_ntor_service_get_rendezvous1_keys(&service_intro_auth_keypair.pubkey,
+                                         &service_intro_enc_keypair,
+                                         &service_ephemeral_rend_keypair,
+                                         &client_ephemeral_enc_keypair.pubkey,
+                                         &service_hs_ntor_rend_cell_keys);
+  tt_int_op(retval, ==, 0);
+
+  /* Client: Simulate the verification of a received RENDEZVOUS1 cell */
+  retval =
+    hs_ntor_client_get_rendezvous1_keys(&service_intro_auth_keypair.pubkey,
+                                        &client_ephemeral_enc_keypair,
+                                        &service_intro_enc_keypair.pubkey,
+                                        &service_ephemeral_rend_keypair.pubkey,
+                                        &client_hs_ntor_rend_cell_keys);
+  tt_int_op(retval, ==, 0);
+
+  /* Test that the RENDEZVOUS1 key material match! */
+  tt_mem_op(client_hs_ntor_rend_cell_keys.rend_cell_auth_mac, OP_EQ,
+            service_hs_ntor_rend_cell_keys.rend_cell_auth_mac,
+            DIGEST256_LEN);
+  tt_mem_op(client_hs_ntor_rend_cell_keys.ntor_key_seed, OP_EQ,
+            service_hs_ntor_rend_cell_keys.ntor_key_seed,
+            DIGEST256_LEN);
+ done:
+  ;
+}
+
+struct testcase_t hs_ntor_tests[] = {
+  { "hs_ntor", test_hs_ntor, TT_FORK,
+    NULL, NULL },
+
+  END_OF_TESTCASES
+};
+
diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index 277855f75..b13239818 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -59,99 +59,6 @@ helper_config_service(const char *conf)
   return ret;
 }
 
-/** Test the HS ntor handshake. Simulate the sending of an encrypted INTRODUCE1
- *  cell, and verify the proper derivation of decryption keys on the other end.
- *  Then simulate the sending of an authenticated RENDEZVOUS1 cell and verify
- *  the proper verification on the other end. */
-static void
-test_hs_ntor(void *arg)
-{
-  int retval;
-
-  uint8_t subcredential[DIGEST256_LEN];
-
-  ed25519_keypair_t service_intro_auth_keypair;
-  curve25519_keypair_t service_intro_enc_keypair;
-  curve25519_keypair_t service_ephemeral_rend_keypair;
-
-  curve25519_keypair_t client_ephemeral_enc_keypair;
-
-  hs_ntor_intro_cell_keys_t client_hs_ntor_intro_cell_keys;
-  hs_ntor_intro_cell_keys_t service_hs_ntor_intro_cell_keys;
-
-  hs_ntor_rend_cell_keys_t service_hs_ntor_rend_cell_keys;
-  hs_ntor_rend_cell_keys_t client_hs_ntor_rend_cell_keys;
-
-  (void) arg;
-
-  /* Generate fake data for this unittest */
-  {
-    /* Generate fake subcredential */
-    memset(subcredential, 'Z', DIGEST256_LEN);
-
-    /* service */
-    curve25519_keypair_generate(&service_intro_enc_keypair, 0);
-    ed25519_keypair_generate(&service_intro_auth_keypair, 0);
-    curve25519_keypair_generate(&service_ephemeral_rend_keypair, 0);
-    /* client */
-    curve25519_keypair_generate(&client_ephemeral_enc_keypair, 0);
-  }
-
-  /* Client: Simulate the sending of an encrypted INTRODUCE1 cell */
-  retval =
-    hs_ntor_client_get_introduce1_keys(&service_intro_auth_keypair.pubkey,
-                                       &service_intro_enc_keypair.pubkey,
-                                       &client_ephemeral_enc_keypair,
-                                       subcredential,
-                                       &client_hs_ntor_intro_cell_keys);
-  tt_int_op(retval, ==, 0);
-
-  /* Service: Simulate the decryption of the received INTRODUCE1 */
-  retval =
-    hs_ntor_service_get_introduce1_keys(&service_intro_auth_keypair.pubkey,
-                                        &service_intro_enc_keypair,
-                                        &client_ephemeral_enc_keypair.pubkey,
-                                        subcredential,
-                                        &service_hs_ntor_intro_cell_keys);
-  tt_int_op(retval, ==, 0);
-
-  /* Test that the INTRODUCE1 encryption/mac keys match! */
-  tt_mem_op(client_hs_ntor_intro_cell_keys.enc_key, OP_EQ,
-            service_hs_ntor_intro_cell_keys.enc_key,
-            CIPHER256_KEY_LEN);
-  tt_mem_op(client_hs_ntor_intro_cell_keys.mac_key, OP_EQ,
-            service_hs_ntor_intro_cell_keys.mac_key,
-            DIGEST256_LEN);
-
-  /* Service: Simulate creation of RENDEZVOUS1 key material. */
-  retval =
-    hs_ntor_service_get_rendezvous1_keys(&service_intro_auth_keypair.pubkey,
-                                         &service_intro_enc_keypair,
-                                         &service_ephemeral_rend_keypair,
-                                         &client_ephemeral_enc_keypair.pubkey,
-                                         &service_hs_ntor_rend_cell_keys);
-  tt_int_op(retval, ==, 0);
-
-  /* Client: Simulate the verification of a received RENDEZVOUS1 cell */
-  retval =
-    hs_ntor_client_get_rendezvous1_keys(&service_intro_auth_keypair.pubkey,
-                                        &client_ephemeral_enc_keypair,
-                                        &service_intro_enc_keypair.pubkey,
-                                        &service_ephemeral_rend_keypair.pubkey,
-                                        &client_hs_ntor_rend_cell_keys);
-  tt_int_op(retval, ==, 0);
-
-  /* Test that the RENDEZVOUS1 key material match! */
-  tt_mem_op(client_hs_ntor_rend_cell_keys.rend_cell_auth_mac, OP_EQ,
-            service_hs_ntor_rend_cell_keys.rend_cell_auth_mac,
-            DIGEST256_LEN);
-  tt_mem_op(client_hs_ntor_rend_cell_keys.ntor_key_seed, OP_EQ,
-            service_hs_ntor_rend_cell_keys.ntor_key_seed,
-            DIGEST256_LEN);
- done:
-  ;
-}
-
 static void
 test_validate_address(void *arg)
 {
@@ -518,10 +425,6 @@ test_desc_overlap_period(void *arg)
 }
 
 struct testcase_t hs_service_tests[] = {
-  { "hs_ntor", test_hs_ntor, TT_FORK,
-    NULL, NULL },
-  { "time_period", test_time_period, TT_FORK,
-    NULL, NULL },
   { "e2e_rend_circuit_setup", test_e2e_rend_circuit_setup, TT_FORK,
     NULL, NULL },
   { "build_address", test_build_address, TT_FORK,
@@ -534,6 +437,8 @@ struct testcase_t hs_service_tests[] = {
     NULL, NULL },
   { "desc_overlap_period", test_desc_overlap_period, TT_FORK,
     NULL, NULL },
+  { "time_period", test_time_period, TT_FORK,
+    NULL, NULL },
 
   END_OF_TESTCASES
 };



_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Reply via email to