From f54ceecf092f4cbd54d80b835def11f7357dcb02 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sat, 03 Aug 2019 19:25:53 -0400
Subject: Rename executable to wolfssl

---
diff --git a/.gitignore b/.gitignore
index ad6e2fc..649b098 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,7 @@ Makefile
 .dirstamp
 *.o
 /version.c
-/wolfssl-util
+/wolfssl
 /wolfssl-util-*.tar*
 /wolfssl-util-*/
 /test-suite.log
diff --git a/Makefile.am b/Makefile.am
index 9579fc3..69d5d90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,28 +40,28 @@ endif
 #   * Our release target
 PACKAGE_STRING = $(PACKAGE_NAME) $(PACKAGE_VERSION)$(PACKAGE_VERSION_GIT)
 
-bin_PROGRAMS = wolfssl-util
+bin_PROGRAMS = wolfssl
 
-wolfssl_util_SOURCES =
-wolfssl_util_CFLAGS = \
+wolfssl_SOURCES =
+wolfssl_CFLAGS = \
 	$(WARN_CFLAGS) \
 	$(ASAN_CFLAGS)
-wolfssl_util_CPPFLAGS = \
+wolfssl_CPPFLAGS = \
 	-DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\" \
 	-DBINDIR=\"$(bindir)\" \
 	-DPKGDATADIR=\"$(pkgdatadir)\" \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DPROGRAM_NAME=\"wolfssl-util\" \
 	$(LIBPNG_CFLAGS)
-wolfssl_util_LDADD = \
+wolfssl_LDADD = \
 	$(WOLFSSL_LIBS) \
 	$(ASAN_CFLAGS)
-wolfssl_util_LINK = $(LINK) version.c
-EXTRA_wolfssl_util_DEPENDENCIES = version.c
+wolfssl_LINK = $(LINK) version.c
+EXTRA_wolfssl_DEPENDENCIES = version.c
 EXTRA_DIST =
 CLEANFILES = version.c
 
-version.c: $(wolfssl_util_OBJECTS) $(wolfssl_util_DEPENDENCIES)
+version.c: $(wolfssl_OBJECTS) $(wolfssl_DEPENDENCIES)
 	$(AM_V_GEN)printf 'const char *PACKAGE_VERSION_GIT = "%s";\n' \
 		"$(PACKAGE_VERSION_GIT)" >version.c
 
diff --git a/README b/README
index 4438cd4..4f7f1ca 100644
--- a/README
+++ b/README
@@ -7,10 +7,10 @@ It is similar to the OpenSSL command-line tool, providing only a limited
 functionality for use by BusyBox's wget applet.
 
 wolfssl-util's `s_client` command is designed to be stronger by default than
-openssl's, as the latter is only meant to be a "diagnostic tool".  That is, the
+OpenSSL's, as the latter is only meant to be a "diagnostic tool".  That is, the
 following command:
 
-    $ wolfssl-util s_client -quiet -connect ${host}:${port} \
+    $ wolfssl s_client -quiet -connect ${host}:${port} \
     > -servername ${servername}
 
 is roughly equivalent to the more complicated:
diff --git a/src/local.mk b/src/local.mk
index 6ac396b..aff860f 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -1,4 +1,4 @@
-wolfssl_util_SOURCES += \
+wolfssl_SOURCES += \
 	%reldir%/commands.h \
 	%reldir%/main.c \
 	%reldir%/s_client.c
diff --git a/tests/badssl.sh b/tests/badssl.sh
index 6b9a332..5322898 100755
--- a/tests/badssl.sh
+++ b/tests/badssl.sh
@@ -30,7 +30,7 @@ do_test()
 	shift 4
 	local result=
 
-	if ${ok} "${TOP_BUILDDIR}/wolfssl-util" s_client \
+	if ${ok} "${TOP_BUILDDIR}/wolfssl" s_client \
 		-connect "${host}.badssl.com:${port}" \
 		-servername "${host}.badssl.com" \
 		<<-EOF
diff --git a/tests/howsmyssl.sh b/tests/howsmyssl.sh
index 2f7296d..8dd4e2f 100755
--- a/tests/howsmyssl.sh
+++ b/tests/howsmyssl.sh
@@ -31,7 +31,7 @@ plan_ 7
 
 json="$(printf 'GET /a/check HTTP/1.1\r\n'$(: \
 	)'Host: www.howsmyssl.com:443\r\nConnection: close\r\n\r\n' | \
-	"${TOP_BUILDDIR}/wolfssl-util" s_client \
+	"${TOP_BUILDDIR}/wolfssl" s_client \
 		-connect www.howsmyssl.com:443 \
 		-servername www.howsmyssl.com | \
 	sed -n 's/\r$//; /^{/,$p')"
--
cgit v0.9.1