From 7baeec83e7295d3286fb74a8c1d4f8b442158317 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Mon, 20 Jul 2020 20:58:07 -0400 Subject: Rename package and executable to wolfutil --- diff --git a/.gitignore b/.gitignore index 649b098..b0c7746 100644 --- a/.gitignore +++ b/.gitignore @@ -27,9 +27,9 @@ Makefile .dirstamp *.o /version.c -/wolfssl -/wolfssl-util-*.tar* -/wolfssl-util-*/ +/wolfutil +/wolfutil-*.tar* +/wolfutil-*/ /test-suite.log /MD5SUMS /SHA256SUMS diff --git a/Makefile.am b/Makefile.am index 532fa97..c8f8d24 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,20 +2,20 @@ # # Copyright (C) 2014, 2017, 2018 Patrick McDermott # -# This file is part of wolfssl-util. +# This file is part of wolfutil. # -# wolfssl-util is free software: you can redistribute it and/or modify +# wolfutil is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # -# wolfssl-util is distributed in the hope that it will be useful, +# wolfutil is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with wolfssl-util. If not, see . +# along with wolfutil. If not, see . KEY = '2250 31F0 47FF E516 63ED 516F 1A45 9ECD E4D6 04BE' @@ -40,28 +40,28 @@ endif # * Our release target PACKAGE_STRING = $(PACKAGE_NAME) $(PACKAGE_VERSION)$(PACKAGE_VERSION_GIT) -bin_PROGRAMS = wolfssl +bin_PROGRAMS = wolfutil -wolfssl_SOURCES = -wolfssl_CFLAGS = \ +wolfutil_SOURCES = +wolfutil_CFLAGS = \ $(WARN_CFLAGS) \ $(ASAN_CFLAGS) -wolfssl_CPPFLAGS = \ +wolfutil_CPPFLAGS = \ -DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\" \ -DBINDIR=\"$(bindir)\" \ -DPKGDATADIR=\"$(pkgdatadir)\" \ -DLOCALEDIR=\"$(localedir)\" \ - -DPROGRAM_NAME=\"wolfssl-util\" \ + -DPROGRAM_NAME=\"wolfutil\" \ $(LIBPNG_CFLAGS) -wolfssl_LDADD = \ +wolfutil_LDADD = \ $(WOLFSSL_LIBS) \ $(ASAN_CFLAGS) -wolfssl_LINK = $(LINK) version.c -EXTRA_wolfssl_DEPENDENCIES = version.c +wolfutil_LINK = $(LINK) version.c +EXTRA_wolfutil_DEPENDENCIES = version.c EXTRA_DIST = CLEANFILES = version.c -version.c: $(wolfssl_OBJECTS) $(wolfssl_DEPENDENCIES) +version.c: $(wolfutil_OBJECTS) $(wolfutil_DEPENDENCIES) $(AM_V_GEN)printf 'const char *PACKAGE_VERSION_GIT = "%s";\n' \ "$(PACKAGE_VERSION_GIT)" >version.c diff --git a/README b/README index c7bfd94..e94892d 100644 --- a/README +++ b/README @@ -1,16 +1,16 @@ Unofficial wolfSSL Utility -------------------------- -wolfssl-util is a command-line tool for the wolfSSL embedded (SSL/)TLS +wolfutil is a command-line tool for the wolfSSL embedded (SSL/)TLS library. It is similar to the OpenSSL command-line tool, providing only a limited `s_client` TLS client command. The primary goal is to provide enough 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 following command: +wolfutil'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 following command: - $ wolfssl s_client -quiet -connect ${host}:${port} \ + $ wolfutil s_client -quiet -connect ${host}:${port} \ > -servername ${servername} is roughly equivalent to the more complicated: @@ -26,8 +26,8 @@ Recommended wolfSSL Configuration --------------------------------- Building wolfSSL with the following configuration options (keeping other -defaults) is recommended for wolfssl-util to perform as a strong modern -TLS implementation: +defaults) is recommended for wolfutil to perform as a strong modern TLS +implementation: --enable-maxstrength --disable-aescbc @@ -38,7 +38,7 @@ TLS implementation: --enable-ocspstapling2 --enable-sni -The test suite is written to verify the strength of wolfssl-util linked +The test suite is written to verify the strength of wolfutil linked against wolfSSL configured with these options. Copyright diff --git a/configure.ac b/configure.ac index 2c55b08..7bc0515 100644 --- a/configure.ac +++ b/configure.ac @@ -3,23 +3,23 @@ # Copyright (C) 2017 Patrick McDermott # Copyright (C) 2019 Libiquity LLC # -# This file is part of wolfssl-util. +# This file is part of wolfutil. # -# wolfssl-util is free software: you can redistribute it and/or modify +# wolfutil is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # -# wolfssl-util is distributed in the hope that it will be useful, +# wolfutil is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with wolfssl-util. If not, see . +# along with wolfutil. If not, see . AC_INIT([Unofficial wolfSSL Utility], [0.1.0], - [mailto:patrick.mcdermott@libiquity.com], [wolfssl-util]) + [mailto:patrick.mcdermott@libiquity.com], [wolfutil]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/main.c]) diff --git a/src/commands.h b/src/commands.h index 34dd64f..697bb24 100644 --- a/src/commands.h +++ b/src/commands.h @@ -3,20 +3,20 @@ * * Copyright (C) 2019 Libiquity LLC * - * This file is part of wolfssl-util. + * This file is part of wolfutil. * - * wolfssl-util is free software; you can redistribute it and/or modify + * wolfutil is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * wolfssl-util is distributed in the hope that it will be useful, + * wolfutil is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with wolfssl-util. If not, see . + * along with wolfutil. If not, see . */ #ifndef COMMANDS_H_ diff --git a/src/local.mk b/src/local.mk index aff860f..86376d7 100644 --- a/src/local.mk +++ b/src/local.mk @@ -1,4 +1,4 @@ -wolfssl_SOURCES += \ +wolfutil_SOURCES += \ %reldir%/commands.h \ %reldir%/main.c \ %reldir%/s_client.c diff --git a/src/main.c b/src/main.c index 0f4023c..f89cb74 100644 --- a/src/main.c +++ b/src/main.c @@ -3,20 +3,20 @@ * * Copyright (C) 2019 Libiquity LLC * - * This file is part of wolfssl-util. + * This file is part of wolfutil. * - * wolfssl-util is free software; you can redistribute it and/or modify + * wolfutil is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * wolfssl-util is distributed in the hope that it will be useful, + * wolfutil is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with wolfssl-util. If not, see . + * along with wolfutil. If not, see . */ #include diff --git a/src/s_client.c b/src/s_client.c index 631f7a2..4ada587 100644 --- a/src/s_client.c +++ b/src/s_client.c @@ -3,20 +3,20 @@ * * Copyright (C) 2019 Libiquity LLC * - * This file is part of wolfssl-util. + * This file is part of wolfutil. * - * wolfssl-util is free software; you can redistribute it and/or modify + * wolfutil is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * wolfssl-util is distributed in the hope that it will be useful, + * wolfutil is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with wolfssl-util. If not, see . + * along with wolfutil. If not, see . */ #ifdef HAVE_CONFIG_H diff --git a/tests/badssl.sh b/tests/badssl.sh index 552bc2c..809a9f1 100755 --- a/tests/badssl.sh +++ b/tests/badssl.sh @@ -2,20 +2,20 @@ # # Copyright (C) 2019 Libiquity LLC # -# This file is part of wolfssl-util. +# This file is part of wolfutil. # -# wolfssl-util is free software: you can redistribute it and/or modify +# wolfutil is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # -# wolfssl-util is distributed in the hope that it will be useful, +# wolfutil is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with wolfssl-util. If not, see . +# along with wolfutil. If not, see . set -eu @@ -30,7 +30,7 @@ do_test() shift 4 local result= - if ${ok} "${TOP_BUILDDIR}/wolfssl" s_client \ + if ${ok} "${TOP_BUILDDIR}/wolfutil" s_client \ -connect "${host}.badssl.com:${port}" \ -servername "${host}.badssl.com" \ <<-EOF diff --git a/tests/howsmyssl.sh b/tests/howsmyssl.sh index aba65b3..d9ee89e 100755 --- a/tests/howsmyssl.sh +++ b/tests/howsmyssl.sh @@ -2,20 +2,20 @@ # # Copyright (C) 2019 Libiquity LLC # -# This file is part of wolfssl-util. +# This file is part of wolfutil. # -# wolfssl-util is free software: you can redistribute it and/or modify +# wolfutil is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # -# wolfssl-util is distributed in the hope that it will be useful, +# wolfutil is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with wolfssl-util. If not, see . +# along with wolfutil. If not, see . set -eu @@ -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" s_client \ + "${TOP_BUILDDIR}/wolfutil" s_client \ -connect www.howsmyssl.com:443 \ -servername www.howsmyssl.com | \ sed -n 's/\r$//; /^{/,$p')" -- cgit v0.9.1