Use _ instead of - in file names

Makefile

@@ -59,21 +59,20 @@ $(ENGINE_DIR)/$(SERVER): $(SERVER)
 	ln -sf ${CURDIR}/$(SERVER) $(ENGINE_DIR)/$(SERVER)
 
 test: all
-	./stop-server.sh
-	./start-tshark.sh
+	./stop_server.sh
+	./start_tshark.sh
 	sleep 2
-	./start-server.sh
-	./run-client.sh
+	./start_server.sh
+	./run_client.sh
 	sleep 1
-	./stop-server.sh
+	./stop_server.sh
 	sleep 1
-	./stop-tshark.sh
+	./stop_tshark.sh
 # TODO: Kill lingering openssl process (lsof -nP -i4TCP:8080 | grep LISTEN)
 	./check_tshark.py
 
 clean: clean-test
-	# TODO: Use run-test (run-mock-test run-simulaqron-test) script
-	# TODO: Add pass/fail to test, based on observing encrypted user data in tshark decode
+	# TODO: Use run_test (run_mock_test run_simulaqron_test) script
 	rm -f $(CLIENT) $(SERVER)
 	rm -rf $(ENGINE_DIR)/$(CLIENT) $(ENGINE_DIR)/$(SERVER)
 	rm -f key.pem cert.pem
@@ -83,8 +82,8 @@ clean: clean-test
 	rm -rf *.dSYM
 
 clean-test:
-	./stop-server.sh
-	./stop-tshark.sh
+	./stop_server.sh
+	./stop_tshark.sh
 	rm -f *.out
 	rm -f *.pid
 	rm -f *.pcap

run-client.sh → run_client.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 #
-# run-client.sh
+# run_client.sh
 #
 # A bash script for running OpenSSL demonstration client to get a web page from the OpenSSL
 # demonstration server, using the ETSI QKD API for QKD key agreement. The output of the client is
@@ -10,7 +10,7 @@
 # See LICENSE for licensing information.
 #
 echo -n "Running client... "
-source set-platform-dependent-variables.sh
+source set_platform_dependent_variables.sh
 rm -f client.out
 echo "client started on $(date +'%Y-%m-%dT%H:%M:%S.%s')" >client.out
 export OPENSSL_CONF=client_openssl.cnf

set-platform-dependent-variables.sh → set_platform_dependent_variables.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 #
-# set-platform-dependent-variables.sh
+# set_platform_dependent_variables.sh
 #
 # A bash script that sets environment variables to account for the differences between the two
 # supported development environments: Apple MacOS and Ubuntu Linux.

start-server.sh → start_server.sh

@@ -1,16 +1,16 @@
 #! /bin/bash
 #
-# start-server.sh
+# start_server.sh
 #
 # A bash script for starting the OpenSSL demonstration web server using the ETSI QKD API for QKD
 # key agreement. The server servers HTTP GET requests from the OpenSSL demonstration web client
-# (see run-client.sh). The output of the server is written to server.out.
+# (see run_client.sh). The output of the server is written to server.out.
 # 
 # (c) 2019 Bruno Rijsman, All Rights Reserved.
 # See LICENSE for licensing information.
 #
 echo -n "Starting server in background... "
-source set-platform-dependent-variables.sh
+source set_platform_dependent_variables.sh
 rm -f server.out
 echo "server started on $(date +'%Y-%m-%dT%H:%M:%S.%s')" >server.out
 export OPENSSL_CONF=server_openssl.cnf

start-tshark.sh → start_tshark.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 #
-# start-tshark.sh
+# start_tshark.sh
 #
 # Start tshark (WireShark for the Terminal) running in the background and capture TLS traffic
 # on port 44330 into a text file (tshark.out) and into a pcap file (tshark.pcap) that can be viewed

stop-server.sh → stop_server.sh

@@ -1,9 +1,9 @@
 #! /bin/bash
 #
-# stop-server.sh
+# stop_server.sh
 #
 # A bash script for stopping the OpenSSL demonstration web server that was started using script
-# start-server.sh.
+# start_server.sh.
 # 
 # (c) 2019 Bruno Rijsman, All Rights Reserved.
 # See LICENSE for licensing information.

stop-tshark.sh → stop_tshark.sh

@@ -1,8 +1,8 @@
 #! /bin/bash
 #
-# stop-tshark.sh
+# stop_tshark.sh
 #
-# Stop tshark (WireShark for the Terminal) which was started using script start-tshark.sh.
+# Stop tshark (WireShark for the Terminal) which was started using script start_tshark.sh.
 # 
 # (c) 2019 Bruno Rijsman, All Rights Reserved.
 # See LICENSE for licensing information.