Remove unneeded hal_internal.h

3 files changed, 38 insertions, 14 deletions

diff --git a/tests/test-rpc_get_version.c b/tests/test-rpc_get_version.c
index 84869c3..ae1b745 100644
--- a/tests/test-rpc_get_version.c
+++ b/tests/test-rpc_get_version.c
@@ -1,12 +1,43 @@
+/*
+ * test-rpc_get_version.c
+ * ----------------------
+ * Test code for RPC interface to Cryptech hash cores.
+ *
+ * Copyright (c) 2016, NORDUnet A/S
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * - Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the NORDUnet nor the names of its contributors may
+ *   be used to endorse or promote products derived from this software
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <assert.h>
 
 #include <hal.h>
-#include <hal_internal.h>
 
-int main (int argc, char *argv[])
+int main(int argc, char *argv[])
 {
     uint32_t version;
 
diff --git a/tests/test-rpc_hash.c b/tests/test-rpc_hash.c
index 22bc589..a0c571c 100644
--- a/tests/test-rpc_hash.c
+++ b/tests/test-rpc_hash.c
@@ -41,9 +41,6 @@
 
 #include <hal.h>
 
-#warning This is wrong, nothing outside libhal itself should include hal_internal.h
-#include <hal_internal.h>
-
 /* Usual NIST sample messages. */
 
 /* "abc" */
diff --git a/tests/test-rpc_pkey.c b/tests/test-rpc_pkey.c
index 03404a4..f5374b3 100644
--- a/tests/test-rpc_pkey.c
+++ b/tests/test-rpc_pkey.c
@@ -41,9 +41,6 @@
 
 #include <hal.h>
 
-#warning This is wrong, nothing outside libhal itself should include hal_internal.h
-#include <hal_internal.h>
-
 #include "test-rsa.h"
 #include "test-ecdsa.h"
 
@@ -321,11 +318,10 @@ static int test_ecdsa_generate(const ecdsa_tc_t * const tc)
 
 int main (int argc, char *argv[])
 {
-  rpc_client_init(RPC_LOCAL);
-  // rpc_client_init(RPC_REMOTE);
-
   int ok = 1;
 
+  hal_rpc_client_init();
+
   for (int i = 0; i < (sizeof(rsa_tc)/sizeof(*rsa_tc)); i++)
     ok &= test_rsa_testvec(&rsa_tc[i]);