diff options
| author | Tim Rühsen <tim.ruehsen@gmx.de> | 2018-11-10 19:13:44 +0000 |
|---|---|---|
| committer | Tim Rühsen <tim.ruehsen@gmx.de> | 2018-11-10 19:13:44 +0000 |
| commit | 907086568631afa552baf198496f364307de1220 (patch) | |
| tree | 69ce2783b22c0c46771a67ab49a96b40c1174d58 | |
| parent | 10e13830a87e080c0cceb6b7c9d012026aaaa5df (diff) | |
| parent | cc9238644f465e3ecf423009f113a1c7f70623ae (diff) | |
| download | gnutls-907086568631afa552baf198496f364307de1220.tar.gz | |
Merge branch 'args-std-def' into 'master'
src: args-std.def: substitute variables using configure
Closes #567
See merge request gnutls/gnutls!793
31 files changed, 2643 insertions, 2787 deletions
diff --git a/Makefile.am b/Makefile.am index f4f7e3b43f..828a2b4e8f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -166,23 +166,9 @@ dist-hook: libopts-check symbol-check $(MAKE) -C doc/ compare-makefile $(MAKE) -C doc/ compare-exported $(MAKE) -C doc/manpages compare-makefile + $(MAKE) -C src/ files-update $(MAKE) ChangeLog mv ChangeLog $(distdir) - $(SED) 's/\@VERSION\@/$(VERSION)/g' -i $(distdir)/src/args-std.def - $(SED) 's/\@YEAR\@/$(YEAR)/g' -i $(distdir)/src/args-std.def - $(SED) 's/\@PACKAGE_BUGREPORT\@/$(PACKAGE_BUGREPORT)/g' -i $(distdir)/src/args-std.def - cd $(distdir)/src/ && for i in *.def;do \ - if test x"$$i" = x"args-std.def";then continue; fi; \ - autogen $$i; \ - cp $$i $$i.tmp; \ - $(SED) -i 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $$i.tmp; \ - autogen -Tagman-cmd.tpl $$i.tmp; \ - rm -f $$i.tmp; \ - mv -f *.1 ../doc/manpages/; \ - done - cd $(distdir)/src/ && for i in *-args.c *-args.h;do \ - mv $$i $$i.bak; \ - done touch $(distdir)/doc/*.html $(distdir)/doc/*.pdf $(distdir)/doc/*.info .PHONY: abi-check abi-dump pic-check symbol-check local-code-coverage-output files-update libopts-check @@ -104,7 +104,7 @@ clang-copy: # ChangeLog must be PHONY, else it isn't generated on 'make distcheck' .PHONY: ChangeLog ChangeLog: - git log --no-merges --no-decorate --pretty --since="2014 November 07"|grep -v ^'commit' > ChangeLog + (cd "$(srcdir)" ; if test -d .git ; then git log --no-merges --no-decorate --pretty --since="2014 November 07"|grep -v ^'commit' ; else echo "Empty" ; fi) > ChangeLog tag = $(PACKAGE)_`echo $(VERSION) | sed 's/\./_/g'` diff --git a/configure.ac b/configure.ac index 3f87907516..2a36a6ed83 100644 --- a/configure.ac +++ b/configure.ac @@ -80,18 +80,6 @@ AC_ARG_ENABLE(tools, enable_tools=$enableval, enable_tools=yes) AM_CONDITIONAL(ENABLE_TOOLS, test "$enable_tools" != "no") -if test "$enable_tools" != "no" || test "$enable_doc" != "no"; then - AC_CHECK_PROG([AUTOGEN], [autogen], [autogen], [:]) - - if test x"$AUTOGEN" = "x:"; then - AC_MSG_WARN([[ -*** -*** autogen not found. Will not link against libopts. -*** ]]) - included_libopts=yes - fi -fi - # For includes/gnutls/gnutls.h.in. AC_SUBST(MAJOR_VERSION, `echo $PACKAGE_VERSION | sed 's/\(.*\)\..*\..*/\1/g'`) AC_SUBST(MINOR_VERSION, `echo $PACKAGE_VERSION | sed 's/.*\.\(.*\)\..*/\1/g'`) @@ -720,6 +708,16 @@ AC_SUBST(TROUSERS_LIB) included_libopts=no create_libopts_links=no if test "$enable_tools" != "no" || test "$enable_doc" != "no"; then + AC_CHECK_PROG([AUTOGEN], [autogen], [autogen], [:]) + + if test x"$AUTOGEN" = "x:"; then + AC_MSG_WARN([[ +*** +*** autogen not found. Will not link against system libopts. +*** ]]) + dnl simulate specifying option on the command line + enable_local_libopts=yes + fi LIBOPTS_CHECK([src/libopts]) if test "$NEED_LIBOPTS_DIR" = "true";then dnl replace libopts-generated files with distributed backups, if present @@ -730,9 +728,8 @@ if test "$enable_tools" != "no" || test "$enable_doc" != "no"; then else # Need to ensure the relevant conditionals get set gl_STDNORETURN_H + AC_SUBST([AUTOGEN], [/bin/true]) AM_CONDITIONAL([INSTALL_LIBOPTS],[false]) - AM_CONDITIONAL([NEED_LIBOPTS], [false]) - included_libopts=yes fi AM_CONDITIONAL(NEED_LIBOPTS, test "$included_libopts" = "yes") @@ -997,6 +994,7 @@ AC_CONFIG_FILES([ lib/unistring/Makefile po/Makefile.in src/Makefile + src/args-std.def src/gl/Makefile tests/Makefile tests/windows/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index 1e72f63adb..130617fa74 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -40,7 +40,7 @@ endif -include $(top_srcdir)/doc/doc.mk invoke-gnutls-cli.texi: $(top_srcdir)/src/cli-args.def - PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -L$(top_srcdir)/src -Tagtexi-cmd.tpl $<; \ + PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -L$(top_builddir)/src -Tagtexi-cmd.tpl $<; \ if [ ! -e $@ ]; then \ cp $(srcdir)/$@ .; \ fi; \ @@ -48,7 +48,7 @@ invoke-gnutls-cli.texi: $(top_srcdir)/src/cli-args.def mv -f $@.tmp $@ invoke-gnutls-cli-debug.texi: $(top_srcdir)/src/cli-debug-args.def invoke-gnutls-cli.texi - PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -Tagtexi-cmd.tpl $<; \ + PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -L$(top_builddir)/src -Tagtexi-cmd.tpl $<; \ if [ ! -e $@ ]; then \ cp $(srcdir)/$@ .; \ fi; \ @@ -56,7 +56,7 @@ invoke-gnutls-cli-debug.texi: $(top_srcdir)/src/cli-debug-args.def invoke-gnutls mv -f $@.tmp $@ invoke-gnutls-serv.texi: $(top_srcdir)/src/serv-args.def invoke-gnutls-cli-debug.texi - PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -Tagtexi-cmd.tpl $<; \ + PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -L$(top_builddir)/src -Tagtexi-cmd.tpl $<; \ if [ ! -e $@ ]; then \ cp $(srcdir)/$@ .; \ fi; \ @@ -64,7 +64,7 @@ invoke-gnutls-serv.texi: $(top_srcdir)/src/serv-args.def invoke-gnutls-cli-debug mv -f $@.tmp $@ invoke-certtool.texi: $(top_srcdir)/src/certtool-args.def invoke-gnutls-serv.texi - PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -Tagtexi-cmd.tpl $<; \ + PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -L$(top_builddir)/src -Tagtexi-cmd.tpl $<; \ if [ ! -e $@ ]; then \ cp $(srcdir)/$@ .; \ fi; \ @@ -75,7 +75,7 @@ invoke-certtool.texi: $(top_srcdir)/src/certtool-args.def invoke-gnutls-serv.tex rm -f $@.tmp invoke-ocsptool.texi: $(top_srcdir)/src/ocsptool-args.def invoke-certtool.texi - PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -Tagtexi-cmd.tpl $<; \ + PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -L$(top_builddir)/src -Tagtexi-cmd.tpl $<; \ if [ ! -e $@ ]; then \ cp $(srcdir)/$@ .; \ fi; \ @@ -86,7 +86,7 @@ invoke-ocsptool.texi: $(top_srcdir)/src/ocsptool-args.def invoke-certtool.texi rm -f $@.tmp invoke-danetool.texi: $(top_srcdir)/src/danetool-args.def invoke-ocsptool.texi - PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -Tagtexi-cmd.tpl $<; \ + PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -L$(top_builddir)/src -Tagtexi-cmd.tpl $<; \ if [ ! -e $@ ]; then \ cp $(srcdir)/$@ .; \ fi; \ @@ -97,7 +97,7 @@ invoke-danetool.texi: $(top_srcdir)/src/danetool-args.def invoke-ocsptool.texi rm -f $@.tmp invoke-srptool.texi: $(top_srcdir)/src/srptool-args.def invoke-danetool.texi - PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -Tagtexi-cmd.tpl $<; \ + PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -L$(top_builddir)/src -Tagtexi-cmd.tpl $<; \ if [ ! -e $@ ]; then \ cp $(srcdir)/$@ .; \ fi; \ @@ -108,7 +108,7 @@ invoke-srptool.texi: $(top_srcdir)/src/srptool-args.def invoke-danetool.texi rm -f $@.tmp invoke-psktool.texi: $(top_srcdir)/src/psktool-args.def invoke-srptool.texi - PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -Tagtexi-cmd.tpl $<; \ + PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -L$(top_builddir)/src -Tagtexi-cmd.tpl $<; \ if [ ! -e $@ ]; then \ cp $(srcdir)/$@ .; \ fi; \ @@ -119,7 +119,7 @@ invoke-psktool.texi: $(top_srcdir)/src/psktool-args.def invoke-srptool.texi rm -f $@.tmp invoke-p11tool.texi: $(top_srcdir)/src/p11tool-args.def invoke-psktool.texi - PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -Tagtexi-cmd.tpl $<; \ + PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -L$(top_builddir)/src -Tagtexi-cmd.tpl $<; \ if [ ! -e $@ ]; then \ cp $(srcdir)/$@ .; \ fi; \ @@ -131,7 +131,7 @@ invoke-p11tool.texi: $(top_srcdir)/src/p11tool-args.def invoke-psktool.texi rm -f $@.tmp invoke-tpmtool.texi: $(top_srcdir)/src/tpmtool-args.def invoke-p11tool.texi - PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -Tagtexi-cmd.tpl $<; \ + PATH="$(top_builddir)/src/$(PATH_SEPARATOR)$${PATH}$(PATH_SEPARATOR)" $(AUTOGEN) -L$(top_builddir)/src -Tagtexi-cmd.tpl $<; \ if [ ! -e $@ ]; then \ cp $(srcdir)/$@ .; \ fi; \ diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am index 5e8d4d7c96..d0544a14d4 100644 --- a/doc/manpages/Makefile.am +++ b/doc/manpages/Makefile.am @@ -19,77 +19,84 @@ # along with this file; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +man_MANS = EXTRA_DIST = stamp_mans - -dist_man_MANS = +MAINTAINERCLEANFILES = stamp_mans -include $(top_srcdir)/doc/doc.mk -if ENABLE_TOOLS -dist_man_MANS += gnutls-cli.1 gnutls-cli-debug.1 gnutls-serv.1 \ +TOOLS_MANS = gnutls-cli.1 gnutls-cli-debug.1 gnutls-serv.1 \ certtool.1 psktool.1 p11tool.1 ocsptool.1 tpmtool.1 +SRP_MANS = srptool.1 +DANE_MANS = danetool.1 + +if ENABLE_TOOLS +man_MANS += $(TOOLS_MANS) if ENABLE_SRP -dist_man_MANS += srptool.1 +man_MANS += $(SRP_MANS) endif if ENABLE_DANE -dist_man_MANS += danetool.1 +man_MANS += $(DANE_MANS) endif endif +EXTRA_DIST += $(TOOLS_MANS) $(SRP_MANS) $(DANE_MANS) +MAINTAINERCLEANFILES += $(TOOLS_MANS) $(SRP_MANS) $(DANE_MANS) + # Note that our .def files depend on autogen # supporting the @subheading texi keyword. This # is not currently the case so we do remove it # before processing. Once the new version of autogen # is out, replace the sed and tmp files with a simple -# autogen -DMAN_SECTION=1 -Tagman-cmd.tpl $< +# autogen -L ../../src -DMAN_SECTION=1 -Tagman-cmd.tpl $< certtool.1: ../../src/certtool-args.def -sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \ - autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ + autogen -L ../../src -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ rm -f "$<".tmp ocsptool.1: ../../src/ocsptool-args.def -sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \ - autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ + autogen -L ../../src -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ rm -f "$<".tmp danetool.1: ../../src/danetool-args.def -sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \ - autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ + autogen -L ../../src -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ rm -f "$<".tmp gnutls-cli.1: ../../src/cli-args.def -sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \ - autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ + autogen -L ../../src -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ rm -f "$<".tmp gnutls-serv.1: ../../src/serv-args.def -sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \ - autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ + autogen -L ../../src -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ rm -f "$<".tmp gnutls-cli-debug.1: ../../src/cli-debug-args.def -sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \ - autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ + autogen -L ../../src -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ rm -f "$<".tmp srptool.1: ../../src/srptool-args.def -sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \ - autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ + autogen -L ../../src -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ rm -f "$<".tmp p11tool.1: ../../src/p11tool-args.def -sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \ - autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ + autogen -L ../../src -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ rm -f "$<".tmp tpmtool.1: ../../src/tpmtool-args.def -sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \ - autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ + autogen -L ../../src -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ rm -f "$<".tmp psktool.1: ../../src/psktool-args.def -sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \ - autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ + autogen -L ../../src -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \ rm -f "$<".tmp APIMANS = @@ -1205,9 +1212,12 @@ APIMANS += gnutls_x509_trust_list_verify_crt2.3 APIMANS += gnutls_x509_trust_list_verify_named_crt.3 if ENABLE_DOC -dist_man_MANS += $(APIMANS) +man_MANS += $(APIMANS) endif +EXTRA_DIST += $(APIMANS) +MAINTAINERCLEANFILES += $(APIMANS) + $(APIMANS): stamp_mans compare-makefile: @@ -1225,230 +1235,22 @@ compare-makefile: rm -f tmp-$@ stamp_mans: $(HEADER_FILES) - @echo $(ECHO_N) "Creating man pages for gnutls.h..." && \ - for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/gnutls.h.in`; do \ - $(top_srcdir)/doc/scripts/gdoc -man \ - -module $(PACKAGE) -sourceversion $(VERSION) \ - -bugsto $(PACKAGE_BUGREPORT) \ - -pkg-site "http://www.gnutls.org" \ - -include "gnutls/gnutls.h" \ - -seeinfo $(PACKAGE) -verbatimcopying \ - -copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \ - -function $$i \ - $(C_SOURCE_FILES) > $$i.3 && \ - echo $(ECHO_N) "."; \ - done - @echo "" - @echo $(ECHO_N) "Creating man pages for compat.h..." && \ - for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/compat.h`; do \ - $(top_srcdir)/doc/scripts/gdoc -man \ - -module $(PACKAGE) -sourceversion $(VERSION) \ - -bugsto $(PACKAGE_BUGREPORT) \ - -pkg-site "http://www.gnutls.org" \ - -include "gnutls/compat.h" \ - -seeinfo $(PACKAGE) -verbatimcopying \ - -copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \ - -function $$i \ - $(C_SOURCE_FILES) > $$i.3 && \ - echo $(ECHO_N) "."; \ - done - @echo "" - @echo $(ECHO_N) "Creating man pages for socket.h..." && \ - for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/socket.h`; do \ + @for header in $(HEADER_FILES); do \ + echo $(ECHO_N) "Creating man pages for `basename $$header .in`..." && \ + for i in `$(top_srcdir)/doc/scripts/getfuncs.pl < $$header`; do \ $(top_srcdir)/doc/scripts/gdoc -man \ -module $(PACKAGE) -sourceversion $(VERSION) \ -bugsto $(PACKAGE_BUGREPORT) \ -pkg-site "http://www.gnutls.org" \ - -include "gnutls/socket.h" \ + -include "gnutls/`basename $$header .in`" \ -seeinfo $(PACKAGE) -verbatimcopying \ -copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \ -function $$i \ $(C_SOURCE_FILES) > $$i.3 && \ echo $(ECHO_N) "."; \ + done ; \ + echo "" ; \ done - @echo "" - @echo $(ECHO_N) "Creating man pages for dane.h..." && \ - for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/libdane/includes/gnutls/dane.h`; do \ - $(top_srcdir)/doc/scripts/gdoc -man \ - -module $(PACKAGE) -sourceversion $(VERSION) \ - -bugsto $(PACKAGE_BUGREPORT) \ - -pkg-site "http://www.gnutls.org" \ - -include "gnutls/dane.h" \ - -seeinfo $(PACKAGE) -verbatimcopying \ - -copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \ - -function $$i \ - $(C_SOURCE_FILES) > $$i.3 && \ - echo $(ECHO_N) "."; \ - done - @echo "" - @echo $(ECHO_N) "Creating man pages for x509.h..." && \ - for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/x509.h`; do \ - $(top_srcdir)/doc/scripts/gdoc -man \ - -module $(PACKAGE) -sourceversion $(VERSION) \ - -bugsto $(PACKAGE_BUGREPORT) \ - -pkg-site "http://www.gnutls.org" \ - -include "gnutls/x509.h" \ - -seeinfo $(PACKAGE) -verbatimcopying \ - -copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \ - -function $$i \ - $(C_X509_SOURCE_FILES) > $$i.3 && \ - echo $(ECHO_N) "."; \ - done - @echo "" - @echo $(ECHO_N) "Creating man pages for x509-ext.h..." && \ - for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/x509-ext.h`; do \ - $(top_srcdir)/doc/scripts/gdoc -man \ - -module $(PACKAGE) -sourceversion $(VERSION) \ - -bugsto $(PACKAGE_BUGREPORT) \ - -pkg-site "http://www.gnutls.org" \ - -include "gnutls/x509-ext.h" \ - -seeinfo $(PACKAGE) -verbatimcopying \ - -copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \ - -function $$i \ - $(C_X509_SOURCE_FILES) > $$i.3 && \ - echo $(ECHO_N) "."; \ - done - @echo "" - @echo $(ECHO_N) "Creating man pages for pkcs7.h..." && \ - for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/pkcs7.h`; do \ - $(top_srcdir)/doc/scripts/gdoc -man \ - -module $(PACKAGE) -sourceversion $(VERSION) \ - -bugsto $(PACKAGE_BUGREPORT) \ - -pkg-site "http://www.gnutls.org" \ - -include "gnutls/pkcs7.h" \ - -seeinfo $(PACKAGE) -verbatimcopying \ - -copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \ - -function $$i \ - $(C_X509_SOURCE_FILES) > $$i.3 && \ - echo $(ECHO_N) "."; \ - done - @echo "" - @echo $(ECHO_N) "Creating man pages for ocsp.h..." && \ - for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/ocsp.h`; do \ - $(top_srcdir)/doc/scripts/gdoc -man \ - -module $(PACKAGE) -sourceversion $(VERSION) \ - -bugsto $(PACKAGE_BUGREPORT) \ - -pkg-site "http://www.gnutls.org" \ - -include "gnutls/ocsp.h" \ - -seeinfo $(PACKAGE) -verbatimcopying \ - -copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \ - -function $$i \ - $(C_X509_SOURCE_FILES) > $$i.3 && \ - echo $(ECHO_N) "."; \ - done - @echo "" - @echo $(ECHO_N) "Creating man pages for abstract.h..." && \ - for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/abstract.h`; do \ - $(top_srcdir)/doc/scripts/gdoc -man \ - -module $(PACKAGE) -sourceversion $(VERSION) \ - -bugsto $(PACKAGE_BUGREPORT) \ - -pkg-site "http://www.gnutls.org" \ - -include "gnutls/abstract.h" \ - -seeinfo $(PACKAGE) -verbatimcopying \ - -copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \ - -function $$i \ - $(C_SOURCE_FILES) > $$i.3 && \ - echo $(ECHO_N) "."; \ - done - @echo "" - @echo $(ECHO_N) "Creating man pages for pkcs12.h..." && \ - for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/pkcs12.h`; do \ - $(top_srcdir)/doc/scripts/gdoc -man \ - -module $(PACKAGE) -sourceversion $(VERSION) \ - -bugsto $(PACKAGE_BUGREPORT) \ - -pkg-site "http://www.gnutls.org" \ - -include "gnutls/pkcs12.h" \ - -seeinfo $(PACKAGE) -verbatimcopying \ - -copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \ - -function $$i \ - $(C_X509_SOURCE_FILES) > $$i.3 && \ - echo $(ECHO_N) "."; \ - done - @echo "" - @echo $(ECHO_N) "Creating man pages for pkcs11.h..." && \ - for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/pkcs11.h`; do \ - $(top_srcdir)/doc/scripts/gdoc -man \ - -module $(PACKAGE) -sourceversion $(VERSION) \ - -bugsto $(PACKAGE_BUGREPORT) \ - -pkg-site "http://www.gnutls.org" \ - -include "gnutls/pkcs11.h" \ - -seeinfo $(PACKAGE) -verbatimcopying \ - -copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \ - -function $$i \ - $(C_SOURCE_FILES) > $$i.3 && \ - echo $(ECHO_N) "."; \ - done - @echo "" - @echo $(ECHO_N) "Creating man pages for dtls.h..." && \ - for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/dtls.h`; do \ - $(top_srcdir)/doc/scripts/gdoc -man \ - -module $(PACKAGE) -sourceversion $(VERSION) \ - -bugsto $(PACKAGE_BUGREPORT) \ - -pkg-site "http://www.gnutls.org" \ - -include "gnutls/dtls.h" \ - -seeinfo $(PACKAGE) -verbatimcopying \ - -copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \ - -function $$i \ - $(C_SOURCE_FILES) > $$i.3 && \ - echo $(ECHO_N) "."; \ - done - @echo "" - @echo $(ECHO_N) "Creating man pages for crypto.h..." && \ - for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/crypto.h`; do \ - $(top_srcdir)/doc/scripts/gdoc -man \ - -module $(PACKAGE) -sourceversion $(VERSION) \ - -bugsto $(PACKAGE_BUGREPORT) \ - -pkg-site "http://www.gnutls.org" \ - -include "gnutls/crypto.h" \ - -seeinfo $(PACKAGE) -verbatimcopying \ - -copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \ - -function $$i \ - $(C_SOURCE_FILES) > $$i.3 && \ - echo $(ECHO_N) "."; \ - done - @echo "" - @echo $(ECHO_N) "Creating man pages for tpm.h..." && \ - for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/tpm.h`; do \ - $(top_srcdir)/doc/scripts/gdoc -man \ - -module $(PACKAGE) -sourceversion $(VERSION) \ - -bugsto $(PACKAGE_BUGREPORT) \ - -pkg-site "http://www.gnutls.org" \ - -include "gnutls/tpm.h" \ - -seeinfo $(PACKAGE) -verbatimcopying \ - -copyright "2001-$(YEAR) Free Software Foundation, Inc., and others" \ - -function $$i \ - $(C_SOURCE_FILES) > $$i.3 && \ - echo $(ECHO_N) "."; \ - done - @echo "" - @echo $(ECHO_N) "Creating man pages for urls.h..." && \ - for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/urls.h`; do \ - $(top_srcdir)/doc/scripts/gdoc -man \ - -module $(PACKAGE) -sourceversion $(VERSION) \ - -bugsto $(PACKAGE_BUGREPORT) \ - -pkg-site "http://www.gnutls.org" \ - -include "gnutls/urls.h" \ - -seeinfo $(PACKAGE) -verbatimcopying \ - -copyright "2014-$(YEAR) Free Software Foundation, Inc., and others" \ - -function $$i \ - $(C_SOURCE_FILES) > $$i.3 && \ - echo $(ECHO_N) "."; \ - done - @echo "" - @echo $(ECHO_N) "Creating man pages for system-keys.h..." && \ - for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/system-keys.h`; do \ - $(top_srcdir)/doc/scripts/gdoc -man \ - -module $(PACKAGE) -sourceversion $(VERSION) \ - -bugsto $(PACKAGE_BUGREPORT) \ - -pkg-site "http://www.gnutls.org" \ - -include "gnutls/system-keys.h" \ - -seeinfo $(PACKAGE) -verbatimcopying \ - -copyright "2014-$(YEAR) Free Software Foundation, Inc., and others" \ - -function $$i \ - $(C_SOURCE_FILES) > $$i.3 && \ - echo $(ECHO_N) "."; \ - done - @echo "" echo $@ > $@ .PHONY: update-makefile diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index f62b6762ec..8cd1430b32 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -16,7 +16,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml # gtk-doc will search all .c and .h files beneath these paths # for inline comments documenting functions and macros. # e.g. DOC_SOURCE_DIR=$(top_srcdir)/gtk $(top_srcdir)/gdk -DOC_SOURCE_DIR=$(top_srcdir)/lib $(top_srcdir)/libdane/ +DOC_SOURCE_DIR=$(top_srcdir)/lib $(top_srcdir)/libdane/ $(top_builddir)/lib/includes/ # Extra options to pass to gtkdoc-scangobj. Normally not needed. SCANGOBJ_OPTIONS= diff --git a/src/Makefile.am b/src/Makefile.am index 75fef1d556..8d5804ccaf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,20 +20,42 @@ # src/gl is being added by the top level makefile SUBDIRS = -BUILT_SOURCES = srptool-args.c srptool-args.h \ - psktool-args.c psktool-args.h ocsptool-args.h ocsptool-args.c \ - serv-args.c serv-args.h cli-args.c cli-args.h \ - cli-debug-args.c cli-debug-args.h certtool-args.c certtool-args.h \ - danetool-args.c danetool-args.h p11tool-args.c p11tool-args.h \ - tpmtool-args.c tpmtool-args.h systemkey-args.c systemkey-args.h \ - mech-list.h - -DISTCLEANFILES =$(BUILT_SOURCES) \ +ARGS_BUILT = \ + srptool-args.c srptool-args.h \ + psktool-args.c psktool-args.h \ + ocsptool-args.h ocsptool-args.c \ + serv-args.c serv-args.h \ + cli-args.c cli-args.h \ + cli-debug-args.c cli-debug-args.h \ + certtool-args.c certtool-args.h \ + danetool-args.c danetool-args.h \ + p11tool-args.c p11tool-args.h \ + tpmtool-args.c tpmtool-args.h \ + systemkey-args.c systemkey-args.h + +ARGS_BAK = \ + srptool-args.c.bak srptool-args.h.bak \ + psktool-args.c.bak psktool-args.h.bak \ + ocsptool-args.h.bak ocsptool-args.c.bak \ + serv-args.c.bak serv-args.h.bak \ + cli-args.c.bak cli-args.h.bak \ + cli-debug-args.c.bak cli-debug-args.h.bak \ + certtool-args.c.bak certtool-args.h.bak \ + danetool-args.c.bak danetool-args.h.bak \ + p11tool-args.c.bak p11tool-args.h.bak \ + tpmtool-args.c.bak tpmtool-args.h.bak \ + systemkey-args.c.bak systemkey-args.h.bak + +ARGS_STAMPS = \ certtool-args.stamp cli-debug-args.stamp cli-args.stamp tpmtool-args.stamp \ systemkey-args.stamp srptool-args.stamp ocsptool-args.stamp p11tool-args.stamp \ danetool-args.stamp serv-args.stamp psktool-args.stamp -EXTRA_DIST = args-std.def gen-mech-list.sh +BUILT_SOURCES = $(ARGS_BUILT) mech-list.h + +DISTCLEANFILES = $(BUILT_SOURCES) $(ARGS_STAMPS) + +EXTRA_DIST = gen-mech-list.sh args-bak-upd.sh $(ARGS_BAK) AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) AM_CPPFLAGS = \ @@ -89,14 +111,16 @@ srptool_SOURCES = srptool.c srptool_LDADD = ../lib/libgnutls.la libcmd-srp.la $(LIBOPTS) ../gl/libgnu.la srptool_LDADD += $(LTLIBINTL) gl/libgnu_gpl.la noinst_LTLIBRARIES += libcmd-srp.la -libcmd_srp_la_SOURCES = srptool-args.def srptool-args.c srptool-args.h +libcmd_srp_la_SOURCES = srptool-args.def +nodist_libcmd_srp_la_SOURCES = srptool-args.c srptool-args.h endif psktool_SOURCES = psk.c psktool_LDADD = ../lib/libgnutls.la libcmd-psk.la $(LIBOPTS) ../gl/libgnu.la psktool_LDADD += $(LTLIBINTL) gl/libgnu_gpl.la noinst_LTLIBRARIES += libcmd-psk.la -libcmd_psk_la_SOURCES = psktool-args.def psktool-args.c psktool-args.h +libcmd_psk_la_SOURCES = psktool-args.def +nodist_libcmd_psk_la_SOURCES = psktool-args.c psktool-args.h if ENABLE_OCSP @@ -106,7 +130,8 @@ ocsptool_SOURCES = ocsptool.c ocsptool-common.h ocsptool-common.c certtool-commo ocsptool_LDADD = ../lib/libgnutls.la libcmd-ocsp.la $(LIBOPTS) ../gl/libgnu.la ocsptool_LDADD += $(LTLIBINTL) $(GETADDRINFO_LIB) gl/libgnu_gpl.la $(LIBIDN_LIBS) noinst_LTLIBRARIES += libcmd-ocsp.la -libcmd_ocsp_la_SOURCES = ocsptool-args.def ocsptool-args.h ocsptool-args.c +libcmd_ocsp_la_SOURCES = ocsptool-args.def +nodist_libcmd_ocsp_la_SOURCES = ocsptool-args.h ocsptool-args.c gnutls_serv_SOURCES = \ list.h serv.c \ @@ -118,7 +143,8 @@ gnutls_serv_LDADD += libcmd-serv.la $(LIBOPTS) ../gl/libgnu.la gnutls_serv_LDADD += $(LTLIBINTL) gl/libgnu_gpl.la gnutls_serv_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB) $(LIBIDN_LIBS) noinst_LTLIBRARIES += libcmd-serv.la -libcmd_serv_la_SOURCES = serv-args.def serv-args.c serv-args.h +libcmd_serv_la_SOURCES = serv-args.def +nodist_libcmd_serv_la_SOURCES = serv-args.c serv-args.h if ENABLE_ANON @@ -135,7 +161,8 @@ gnutls_cli_LDADD += libcmd-cli.la $(LIBOPTS) ../gl/libgnu.la $(LTLIBINTL) $(LIBI gnutls_cli_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB) $(LIB_CLOCK_GETTIME) \ $(SERVENT_LIB) gl/libgnu_gpl.la noinst_LTLIBRARIES += libcmd-cli.la -libcmd_cli_la_SOURCES = cli-args.def cli-args.c cli-args.h +libcmd_cli_la_SOURCES = cli-args.def +nodist_libcmd_cli_la_SOURCES = cli-args.c cli-args.h endif endif @@ -146,7 +173,8 @@ gnutls_cli_debug_LDADD += $(LIBOPTS) ../gl/libgnu.la gl/libgnu_gpl.la gnutls_cli_debug_LDADD += $(LTLIBINTL) $(LIBIDN_LIBS) gnutls_cli_debug_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB) noinst_LTLIBRARIES += libcmd-cli-debug.la -libcmd_cli_debug_la_SOURCES = cli-debug-args.def cli-debug-args.c cli-debug-args.h +libcmd_cli_debug_la_SOURCES = cli-debug-args.def +nodist_libcmd_cli_debug_la_SOURCES = cli-debug-args.c cli-debug-args.h #certtool COMMON_LIBS = $(LIBOPTS) $(LTLIBINTL) @@ -163,8 +191,9 @@ certtool_LDADD = ../lib/libgnutls.la certtool_LDADD += libcmd-certtool.la ../gl/libgnu.la gl/libgnu_gpl.la noinst_LTLIBRARIES += libcmd-certtool.la -libcmd_certtool_la_SOURCES = certtool-args.c certtool-args.def certtool-args.h \ +libcmd_certtool_la_SOURCES = certtool-args.def \ certtool-cfg.h certtool-cfg.c +nodist_libcmd_certtool_la_SOURCES = certtool-args.c certtool-args.h libcmd_certtool_la_LIBADD = ../lib/libgnutls.la gl/libgnu_gpl.la ../gl/libgnu.la libcmd_certtool_la_LIBADD += $(COMMON_LIBS) libcmd_certtool_la_LIBADD += $(LTLIBREADLINE) gl/libgnu_gpl.la @@ -179,8 +208,9 @@ danetool_LDADD += ../libdane/libgnutls-dane.la endif noinst_LTLIBRARIES += libcmd-danetool.la -libcmd_danetool_la_SOURCES = danetool-args.c danetool-args.def danetool-args.h \ +libcmd_danetool_la_SOURCES = danetool-args.def \ certtool-cfg.h certtool-cfg.c +nodist_libcmd_danetool_la_SOURCES = danetool-args.c danetool-args.h libcmd_danetool_la_LIBADD = ../lib/libgnutls.la gl/libgnu_gpl.la ../gl/libgnu.la libcmd_danetool_la_LIBADD += $(COMMON_LIBS) libcmd_danetool_la_LIBADD += $(LTLIBREADLINE) @@ -196,8 +226,9 @@ p11tool_LDADD += libcmd-p11tool.la ../gl/libgnu.la gl/libgnu_gpl.la p11tool_LDADD += $(COMMON_LIBS) noinst_LTLIBRARIES += libcmd-p11tool.la -libcmd_p11tool_la_SOURCES = p11tool-args.def p11tool-args.c p11tool-args.h \ +libcmd_p11tool_la_SOURCES = p11tool-args.def \ certtool-cfg.h certtool-cfg.c +nodist_libcmd_p11tool_la_SOURCES = p11tool-args.c p11tool-args.h libcmd_p11tool_la_LIBADD = ../lib/libgnutls.la gl/libgnu_gpl.la ../gl/libgnu.la libcmd_p11tool_la_LIBADD += $(LTLIBREADLINE) $(INET_PTON_LIB) $(LIB_CLOCK_GETTIME) @@ -211,8 +242,9 @@ tpmtool_LDADD += libcmd-tpmtool.la ../gl/libgnu.la gl/libgnu_gpl.la tpmtool_LDADD += $(COMMON_LIBS) noinst_LTLIBRARIES += libcmd-tpmtool.la -libcmd_tpmtool_la_SOURCES = tpmtool-args.def tpmtool-args.c tpmtool-args.h \ +libcmd_tpmtool_la_SOURCES = tpmtool-args.def \ certtool-cfg.h certtool-cfg.c +nodist_libcmd_tpmtool_la_SOURCES = tpmtool-args.c tpmtool-args.h libcmd_tpmtool_la_LIBADD = ../lib/libgnutls.la gl/libgnu_gpl.la ../gl/libgnu.la libcmd_tpmtool_la_LIBADD += $(LTLIBREADLINE) $(INET_PTON_LIB) $(LIB_CLOCK_GETTIME) @@ -224,75 +256,85 @@ systemkey_LDADD += libcmd-systemkey.la ../gl/libgnu.la gl/libgnu_gpl.la systemkey_LDADD += $(COMMON_LIBS) noinst_LTLIBRARIES += libcmd-systemkey.la -libcmd_systemkey_la_SOURCES = systemkey-args.def systemkey-args.c systemkey-args.h \ +libcmd_systemkey_la_SOURCES = systemkey-args.def \ certtool-cfg.h certtool-cfg.c +nodist_libcmd_systemkey_la_SOURCES = systemkey-args.c systemkey-args.h libcmd_systemkey_la_LIBADD = ../lib/libgnutls.la gl/libgnu_gpl.la ../gl/libgnu.la libcmd_systemkey_la_LIBADD += $(LTLIBREADLINE) $(INET_PTON_LIB) $(LIB_CLOCK_GETTIME) danetool-args.h: danetool-args.stamp danetool-args.c: danetool-args.stamp -danetool-args.stamp: $(srcdir)/danetool-args.def $(srcdir)/args-std.def +danetool-args.stamp: $(srcdir)/danetool-args.def args-std.def -$(AUTOGEN) $< touch $@ ocsptool-args.h: ocsptool-args.stamp ocsptool-args.c: ocsptool-args.stamp -ocsptool-args.stamp: $(srcdir)/ocsptool-args.def $(srcdir)/args-std.def +ocsptool-args.stamp: $(srcdir)/ocsptool-args.def args-std.def -$(AUTOGEN) $< + -$(srcdir)/args-bak-upd.sh $@ $(srcdir) touch $@ tpmtool-args.h: tpmtool-args.stamp tpmtool-args.c: tpmtool-args.stamp -tpmtool-args.stamp: $(srcdir)/tpmtool-args.def $(srcdir)/args-std.def +tpmtool-args.stamp: $(srcdir)/tpmtool-args.def args-std.def -$(AUTOGEN) $< + -$(srcdir)/args-bak-upd.sh $@ $(srcdir) touch $@ p11tool-args.h: p11tool-args.stamp p11tool-args.c: p11tool-args.stamp -p11tool-args.stamp: $(srcdir)/p11tool-args.def $(srcdir)/args-std.def +p11tool-args.stamp: $(srcdir)/p11tool-args.def args-std.def -$(AUTOGEN) $< + -$(srcdir)/args-bak-upd.sh $@ $(srcdir) touch $@ psktool-args.h: psktool-args.stamp psktool-args.c: psktool-args.stamp -psktool-args.stamp: $(srcdir)/psktool-args.def $(srcdir)/args-std.def +psktool-args.stamp: $(srcdir)/psktool-args.def args-std.def -$(AUTOGEN) $< + -$(srcdir)/args-bak-upd.sh $@ $(srcdir) touch $@ cli-debug-args.h: cli-debug-args.stamp cli-debug-args.c: cli-debug-args.stamp -cli-debug-args.stamp: $(srcdir)/cli-debug-args.def $(srcdir)/args-std.def +cli-debug-args.stamp: $(srcdir)/cli-debug-args.def args-std.def -$(AUTOGEN) $< + -$(srcdir)/args-bak-upd.sh $@ $(srcdir) touch $@ cli-args.h: cli-args.stamp cli-args.c: cli-args.stamp -cli-args.stamp: $(srcdir)/cli-args.def $(srcdir)/args-std.def +cli-args.stamp: $(srcdir)/cli-args.def args-std.def -$(AUTOGEN) $< + -$(srcdir)/args-bak-upd.sh $@ $(srcdir) touch $@ serv-args.h: serv-args.stamp serv-args.c: serv-args.stamp -serv-args.stamp: $(srcdir)/serv-args.def $(srcdir)/args-std.def +serv-args.stamp: $(srcdir)/serv-args.def args-std.def -$(AUTOGEN) $< touch $@ srptool-args.h: srptool-args.stamp srptool-args.c: srptool-args.stamp -srptool-args.stamp: $(srcdir)/srptool-args.def $(srcdir)/args-std.def +srptool-args.stamp: $(srcdir)/srptool-args.def args-std.def -$(AUTOGEN) $< + -$(srcdir)/args-bak-upd.sh $@ $(srcdir) touch $@ certtool-args.h: certtool-args.stamp certtool-args.c: certtool-args.stamp -certtool-args.stamp: $(srcdir)/certtool-args.def $(srcdir)/args-std.def +certtool-args.stamp: $(srcdir)/certtool-args.def args-std.def -$(AUTOGEN) $< + -$(srcdir)/args-bak-upd.sh $@ $(srcdir) touch $@ systemkey-args.h: systemkey-args.stamp systemkey-args.c: systemkey-args.stamp -systemkey-args.stamp: $(srcdir)/systemkey-args.def $(srcdir)/args-std.def +systemkey-args.stamp: $(srcdir)/systemkey-args.def args-std.def -$(AUTOGEN) $< + -$(srcdir)/args-bak-upd.sh $@ $(srcdir) touch $@ mech-list.h: gen-mech-list.sh @@ -302,16 +344,7 @@ mech-list.h: gen-mech-list.sh maintainer-clean-local: rm -f *.stamp mech-list.h -files-update: +files-update: $(ARGS_STAMPS) @echo "******************************************************************************************" - @echo "updating autogen files in src/" + @echo "updated autogen files in src/" @echo "******************************************************************************************" - for i in *-args.c *-args.h;do \ - if ! test -h "$$i" ; then \ - if test "$(srcdir)" = "." ; then \ - cp "$$i" "$$i.bak" ; \ - else \ - sed -e "s!$(srcdir)/!!g" "$$i" > $(srcdir)/`basename "$$i"`.bak ; \ - fi; \ - fi; \ - done diff --git a/src/args-bak-upd.sh b/src/args-bak-upd.sh new file mode 100755 index 0000000000..2da5eb5b93 --- /dev/null +++ b/src/args-bak-upd.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +# Copyright (C) 2018 Dmitry Eremin-Solenikov +# +# This file is part of GnuTLS. +# +# GnuTLS 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 3 of the License, or (at +# your option) any later version. +# +# GnuTLS 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 this program. If not, see <http://www.gnu.org/licenses/>. + +# Usage: args-bak-upd.sh file.stamp srcdir + +# update_file file srcdir +update_file() { + if ! test -h "$1" + then + if test "$2" = "." + then + cp "$1" "$1".bak + else + sed -e "s!$2/!!g" "$1" > "$2"/"$1".bak + fi + fi +} + +BASENAME="`basename "$1" .stamp`" +update_file "${BASENAME}.c" "$2" +update_file "${BASENAME}.c" "$2" diff --git a/src/args-std.def b/src/args-std.def.in index 93634a1857..93634a1857 100644 --- a/src/args-std.def +++ b/src/args-std.def.in diff --git a/src/certtool-args.c.bak b/src/certtool-args.c.bak index a18b1c182a..08065d003d 100644 --- a/src/certtool-args.c.bak +++ b/src/certtool-args.c.bak @@ -19,7 +19,7 @@ * The certtool program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -53,7 +53,7 @@ extern "C" { #endif extern FILE * option_usage_fp; #define zCopyright (certtool_opt_strs+0) -#define zLicenseDescrip (certtool_opt_strs+289) +#define zLicenseDescrip (certtool_opt_strs+283) #ifndef NULL @@ -63,13 +63,13 @@ extern FILE * option_usage_fp; /** * static const strings for certtool options */ -static char const certtool_opt_strs[7235] = -/* 0 */ "certtool @VERSION@\n" - "Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n" +static char const certtool_opt_strs[7221] = +/* 0 */ "certtool 3.6.4\n" + "Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the GNU General Public License,\n" "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0" -/* 289 */ "certtool is free software: you can redistribute it and/or modify it under\n" +/* 283 */ "certtool is free software: you can redistribute it and/or modify it under\n" "the terms of the GNU General Public License as published by the Free\n" "Software Foundation, either version 3 of the License, or (at your option)\n" "any later version.\n\n" @@ -79,294 +79,294 @@ static char const certtool_opt_strs[7235] = "details.\n\n" "You should have received a copy of the GNU General Public License along\n" "with this program. If not, see <http://www.gnu.org/licenses/>.\n\0" -/* 894 */ "Enable debugging\0" -/* 911 */ "DEBUG\0" -/* 917 */ "debug\0" -/* 923 */ "More verbose output\0" -/* 943 */ "VERBOSE\0" -/* 951 */ "verbose\0" -/* 959 */ "Input file\0" -/* 970 */ "INFILE\0" -/* 977 */ "infile\0" -/* 984 */ "Output file\0" -/* 996 */ "OUTFILE\0" -/* 1004 */ "outfile\0" -/* 1012 */ "Certificate related options:\0" -/* 1041 */ "Print information on the given certificate\0" -/* 1084 */ "CERTIFICATE_INFO\0" -/* 1101 */ "certificate-info\0" -/* 1118 */ "Print information on a public key\0" -/* 1152 */ "PUBKEY_INFO\0" -/* 1164 */ "pubkey-info\0" -/* 1176 */ "Generate a self-signed certificate\0" -/* 1211 */ "GENERATE_SELF_SIGNED\0" -/* 1232 */ "generate-self-signed\0" -/* 1253 */ "Generate a signed certificate\0" -/* 1283 */ "GENERATE_CERTIFICATE\0" -/* 1304 */ "generate-certificate\0" -/* 1325 */ "Generates a proxy certificate\0" -/* 1355 */ "GENERATE_PROXY\0" -/* 1370 */ "generate-proxy\0" -/* 1385 */ "Update a signed certificate\0" -/* 1413 */ "UPDATE_CERTIFICATE\0" -/* 1432 */ "update-certificate\0" -/* 1451 */ "Print the fingerprint of the given certificate\0" -/* 1498 */ "FINGERPRINT\0" -/* 1510 */ "fingerprint\0" -/* 1522 */ "Print the key ID of the given certificate\0" -/* 1564 */ "KEY_ID\0" -/* 1571 */ "key-id\0" -/* 1578 */ "Print certificate's public key (deprecated)\0" -/* 1622 */ "CERTIFICATE_PUBKEY\0" -/* 1641 */ "certificate-pubkey\0" -/* 1660 */ "Generate an X.509 version 1 certificate (with no extensions)\0" -/* 1721 */ "V1\0" -/* 1724 */ "v1\0" -/* 1727 */ "Sign a certificate with a specific signature algorithm\0" -/* 1782 */ "SIGN_PARAMS\0" -/* 1794 */ "sign-params\0" -/* 1806 */ "Certificate request related options:\0" -/* 1843 */ "Print information on the given certificate request\0" -/* 1894 */ "CRQ_INFO\0" -/* 1903 */ "crq-info\0" -/* 1912 */ "Generate a PKCS #10 certificate request\0" -/* 1952 */ "GENERATE_REQUEST\0" -/* 1969 */ "generate-request\0" -/* 1986 */ "Do not use extensions in certificate requests\0" -/* 2032 */ "NO_CRQ_EXTENSIONS\0" -/* 2050 */ "no-crq-extensions\0" -/* 2068 */ "PKCS#12 file related options:\0" -/* 2098 */ "Print information on a PKCS #12 structure\0" -/* 2140 */ "P12_INFO\0" -/* 2149 */ "p12-info\0" -/* 2158 */ "The PKCS #12 friendly name to use\0" -/* 2192 */ "P12_NAME\0" -/* 2201 */ "p12-name\0" -/* 2210 */ "Generate a PKCS #12 structure\0" -/* 2240 */ "TO_P12\0" -/* 2247 */ "to-p12\0" -/* 2254 */ "Private key related options:\0" -/* 2283 */ "Print information on a private key\0" -/* 2318 */ "KEY_INFO\0" -/* 2327 */ "key-info\0" -/* 2336 */ "Print information on a PKCS #8 structure\0" -/* 2377 */ "P8_INFO\0" -/* 2385 */ "p8-info\0" -/* 2393 */ "Convert an RSA-PSS key to raw RSA format\0" -/* 2434 */ "TO_RSA\0" -/* 2441 */ "to-rsa\0" -/* 2448 */ "Generate a private key\0" -/* 2471 */ "GENERATE_PRIVKEY\0" -/* 2488 */ "generate-privkey\0" -/* 2505 */ "Specify the key type to use on key generation\0" -/* 2551 */ "KEY_TYPE\0" -/* 2560 */ "key-type\0" -/* 2569 */ "Specify the number of bits for key generation\0" -/* 2615 */ "BITS\0" -/* 2620 */ "bits\0" -/* 2625 */ "Specify the curve used for EC key generation\0" -/* 2670 */ "CURVE\0" -/* 2676 */ "curve\0" -/* 2682 */ "Specify the security level [low, legacy, medium, high, ultra]\0" -/* 2744 */ "SEC_PARAM\0" -/* 2754 */ "sec-param\0" -/* 2764 */ "Convert a given key to a PKCS #8 structure\0" -/* 2807 */ "TO_P8\0" -/* 2813 */ "to-p8\0" -/* 2819 */ "Use PKCS #8 format for private keys\0" -/* 2855 */ "PKCS8\0" -/* 2861 */ "pkcs8\0" -/* 2867 */ "Generate a private key or parameters from a seed using a provable method\0" -/* 2940 */ "PROVABLE\0" -/* 2949 */ "provable\0" -/* 2958 */ "Verify a private key generated from a seed using a provable method\0" -/* 3025 */ "VERIFY_PROVABLE_PRIVKEY\0" -/* 3049 */ "verify-provable-privkey\0" -/* 3073 */ "When generating a private key use the given hex-encoded seed\0" -/* 3134 */ "SEED\0" -/* 3139 */ "seed\0" -/* 3144 */ "CRL related options:\0" -/* 3165 */ "Print information on the given CRL structure\0" -/* 3210 */ "CRL_INFO\0" -/* 3219 */ "crl-info\0" -/* 3228 */ "Generate a CRL\0" -/* 3243 */ "GENERATE_CRL\0" -/* 3256 */ "generate-crl\0" -/* 3269 */ "Verify a Certificate Revocation List using a trusted list\0" -/* 3327 */ "VERIFY_CRL\0" -/* 3338 */ "verify-crl\0" -/* 3349 */ "Certificate verification related options:\0" -/* 3391 */ "Verify a PEM encoded certificate chain\0" -/* 3430 */ "VERIFY_CHAIN\0" -/* 3443 */ "verify-chain\0" -/* 3456 */ "Verify a PEM encoded certificate (chain) against a trusted set\0" -/* 3519 */ "VERIFY\0" -/* 3526 */ "verify\0" -/* 3533 */ "Specify a hostname to be used for certificate chain verification\0" -/* 3598 */ "VERIFY_HOSTNAME\0" -/* 3614 */ "verify-hostname\0" -/* 3630 */ "Specify a email to be used for certificate chain verification\0" -/* 3692 */ "VERIFY_EMAIL\0" -/* 3705 */ "verify-email\0" -/* 3718 */ "Specify a purpose OID to be used for certificate chain verification\0" -/* 3786 */ "VERIFY_PURPOSE\0" -/* 3801 */ "verify-purpose\0" -/* 3816 */ "Allow broken algorithms, such as MD5 for verification\0" -/* 3870 */ "VERIFY_ALLOW_BROKEN\0" -/* 3890 */ "verify-allow-broken\0" -/* 3910 */ "PKCS#7 structure options:\0" -/* 3936 */ "Generate a PKCS #7 structure\0" -/* 3965 */ "P7_GENERATE\0" -/* 3977 */ "p7-generate\0" -/* 3989 */ "Signs using a PKCS #7 structure\0" -/* 4021 */ "P7_SIGN\0" -/* 4029 */ "p7-sign\0" -/* 4037 */ "Signs using a detached PKCS #7 structure\0" -/* 4078 */ "P7_DETACHED_SIGN\0" -/* 4095 */ "p7-detached-sign\0" -/* 4112 */ "The signer's certificate will be included in the cert list.\0" -/* 4172 */ "P7_INCLUDE_CERT\0" -/* 4188 */ "no-p7-include-cert\0" -/* 4207 */ "no\0" -/* 4210 */ "Will include a timestamp in the PKCS #7 structure\0" -/* 4260 */ "P7_TIME\0" -/* 4268 */ "no-p7-time\0" -/* 4279 */ "Will show the embedded data in the PKCS #7 structure\0" -/* 4332 */ "P7_SHOW_DATA\0" -/* 4345 */ "no-p7-show-data\0" -/* 4361 */ "Print information on a PKCS #7 structure\0" -/* 4402 */ "P7_INFO\0" -/* 4410 */ "p7-info\0" -/* 4418 */ "Verify the provided PKCS #7 structure\0" -/* 4456 */ "P7_VERIFY\0" -/* 4466 */ "p7-verify\0" -/* 4476 */ "Convert S/MIME to PKCS #7 structure\0" -/* 4512 */ "SMIME_TO_P7\0" -/* 4524 */ "smime-to-p7\0" -/* 4536 */ "Other options:\0" -/* 4551 */ "Generate PKCS #3 encoded Diffie-Hellman parameters (deprecated)\0" -/* 4615 */ "GENERATE_DH_PARAMS\0" -/* 4634 */ "generate-dh-params\0" -/* 4653 */ "List the included PKCS #3 encoded Diffie-Hellman parameters\0" -/* 4713 */ "GET_DH_PARAMS\0" -/* 4727 */ "get-dh-params\0" -/* 4741 */ "Print information PKCS #3 encoded Diffie-Hellman parameters\0" -/* 4801 */ "DH_INFO\0" -/* 4809 */ "dh-info\0" -/* 4817 */ "Loads a private key file\0" -/* 4842 */ "LOAD_PRIVKEY\0" -/* 4855 */ "load-privkey\0" -/* 4868 */ "Loads a public key file\0" -/* 4892 */ "LOAD_PUBKEY\0" -/* 4904 */ "load-pubkey\0" -/* 4916 */ "Loads a certificate request file\0" -/* 4949 */ "LOAD_REQUEST\0" -/* 4962 */ "load-request\0" -/* 4975 */ "Loads a certificate file\0" -/* 5000 */ "LOAD_CERTIFICATE\0" -/* 5017 */ "load-certificate\0" -/* 5034 */ "Loads the certificate authority's private key file\0" -/* 5085 */ "LOAD_CA_PRIVKEY\0" -/* 5101 */ "load-ca-privkey\0" -/* 5117 */ "Loads the certificate authority's certificate file\0" -/* 5168 */ "LOAD_CA_CERTIFICATE\0" -/* 5188 */ "load-ca-certificate\0" -/* 5208 */ "Loads the provided CRL\0" -/* 5231 */ "LOAD_CRL\0" -/* 5240 */ "load-crl\0" -/* 5249 */ "Loads auxiliary data\0" -/* 5270 */ "LOAD_DATA\0" -/* 5280 */ "load-data\0" -/* 5290 */ "Password to use\0" -/* 5306 */ "PASSWORD\0" -/* 5315 */ "password\0" -/* 5324 */ "Enforce a NULL password\0" -/* 5348 */ "NULL_PASSWORD\0" -/* 5362 */ "null-password\0" -/* 5376 */ "Enforce an empty password\0" -/* 5402 */ "EMPTY_PASSWORD\0" -/* 5417 */ "empty-password\0" -/* 5432 */ "Print big number in an easier format to parse\0" -/* 5478 */ "HEX_NUMBERS\0" -/* 5490 */ "hex-numbers\0" -/* 5502 */ "In certain operations it prints the information in C-friendly format\0" -/* 5571 */ "CPRINT\0" -/* 5578 */ "cprint\0" -/* 5585 */ "Generate RSA key (deprecated)\0" -/* 5615 */ "RSA\0" -/* 5619 */ "rsa\0" -/* 5623 */ "Generate DSA key (deprecated)\0" -/* 5653 */ "DSA\0" -/* 5657 */ "dsa\0" -/* 5661 */ "Generate ECC (ECDSA) key (deprecated)\0" -/* 5699 */ "ECC\0" -/* 5703 */ "ecc\0" -/* 5707 */ "an alias for the 'ecc' option (deprecated)\0" -/* 5750 */ "ecdsa\0" -/* 5756 */ "Hash algorithm to use for signing\0" -/* 5790 */ "HASH\0" -/* 5795 */ "hash\0" -/* 5800 */ "Specify the RSA-PSS key default salt size\0" -/* 5842 */ "SALT_SIZE\0" -/* 5852 */ "salt-size\0" -/* 5862 */ "Use DER format for input certificates, private keys, and DH parameters\0" -/* 5933 */ "INDER\0" -/* 5939 */ "no-inder\0" -/* 5948 */ "an alias for the 'inder' option\0" -/* 5980 */ "inraw\0" -/* 5986 */ "Use DER format for output certificates, private keys, and DH parameters\0" -/* 6058 */ "OUTDER\0" -/* 6065 */ "no-outder\0" -/* 6075 */ "an alias for the 'outder' option\0" -/* 6108 */ "outraw\0" -/* 6115 */ "No effect (deprecated)\0" -/* 6138 */ "DISABLE_QUICK_RANDOM\0" -/* 6159 */ "disable-quick-random\0" -/* 6180 */ "Template file to use for non-interactive operation\0" -/* 6231 */ "TEMPLATE\0" -/* 6240 */ "template\0" -/* 6249 */ "Print information to stdout instead of stderr\0" -/* 6295 */ "STDOUT_INFO\0" -/* 6307 */ "stdout-info\0" -/* 6319 */ "Enable interaction for entering password when in batch mode.\0" -/* 6380 */ "ASK_PASS\0" -/* 6389 */ "ask-pass\0" -/* 6398 */ "Cipher to use for PKCS #8 and #12 operations\0" -/* 6443 */ "PKCS_CIPHER\0" -/* 6455 */ "pkcs-cipher\0" -/* 6467 */ "Specify the PKCS #11 provider library\0" -/* 6505 */ "PROVIDER\0" -/* 6514 */ "provider\0" -/* 6523 */ "display extended usage information and exit\0" -/* 6567 */ "help\0" -/* 6572 */ "extended usage information passed thru pager\0" -/* 6617 */ "more-help\0" -/* 6627 */ "output version information and exit\0" -/* 6663 */ "version\0" -/* 6671 */ "CERTTOOL\0" -/* 6680 */ "certtool - GnuTLS certificate tool\n" +/* 888 */ "Enable debugging\0" +/* 905 */ "DEBUG\0" +/* 911 */ "debug\0" +/* 917 */ "More verbose output\0" +/* 937 */ "VERBOSE\0" +/* 945 */ "verbose\0" +/* 953 */ "Input file\0" +/* 964 */ "INFILE\0" +/* 971 */ "infile\0" +/* 978 */ "Output file\0" +/* 990 */ "OUTFILE\0" +/* 998 */ "outfile\0" +/* 1006 */ "Certificate related options:\0" +/* 1035 */ "Print information on the given certificate\0" +/* 1078 */ "CERTIFICATE_INFO\0" +/* 1095 */ "certificate-info\0" +/* 1112 */ "Print information on a public key\0" +/* 1146 */ "PUBKEY_INFO\0" +/* 1158 */ "pubkey-info\0" +/* 1170 */ "Generate a self-signed certificate\0" +/* 1205 */ "GENERATE_SELF_SIGNED\0" +/* 1226 */ "generate-self-signed\0" +/* 1247 */ "Generate a signed certificate\0" +/* 1277 */ "GENERATE_CERTIFICATE\0" +/* 1298 */ "generate-certificate\0" +/* 1319 */ "Generates a proxy certificate\0" +/* 1349 */ "GENERATE_PROXY\0" +/* 1364 */ "generate-proxy\0" +/* 1379 */ "Update a signed certificate\0" +/* 1407 */ "UPDATE_CERTIFICATE\0" +/* 1426 */ "update-certificate\0" +/* 1445 */ "Print the fingerprint of the given certificate\0" +/* 1492 */ "FINGERPRINT\0" +/* 1504 */ "fingerprint\0" +/* 1516 */ "Print the key ID of the given certificate\0" +/* 1558 */ "KEY_ID\0" +/* 1565 */ "key-id\0" +/* 1572 */ "Print certificate's public key (deprecated)\0" +/* 1616 */ "CERTIFICATE_PUBKEY\0" +/* 1635 */ "certificate-pubkey\0" +/* 1654 */ "Generate an X.509 version 1 certificate (with no extensions)\0" +/* 1715 */ "V1\0" +/* 1718 */ "v1\0" +/* 1721 */ "Sign a certificate with a specific signature algorithm\0" +/* 1776 */ "SIGN_PARAMS\0" +/* 1788 */ "sign-params\0" +/* 1800 */ "Certificate request related options:\0" +/* 1837 */ "Print information on the given certificate request\0" +/* 1888 */ "CRQ_INFO\0" +/* 1897 */ "crq-info\0" +/* 1906 */ "Generate a PKCS #10 certificate request\0" +/* 1946 */ "GENERATE_REQUEST\0" +/* 1963 */ "generate-request\0" +/* 1980 */ "Do not use extensions in certificate requests\0" +/* 2026 */ "NO_CRQ_EXTENSIONS\0" +/* 2044 */ "no-crq-extensions\0" +/* 2062 */ "PKCS#12 file related options:\0" +/* 2092 */ "Print information on a PKCS #12 structure\0" +/* 2134 */ "P12_INFO\0" +/* 2143 */ "p12-info\0" +/* 2152 */ "The PKCS #12 friendly name to use\0" +/* 2186 */ "P12_NAME\0" +/* 2195 */ "p12-name\0" +/* 2204 */ "Generate a PKCS #12 structure\0" +/* 2234 */ "TO_P12\0" +/* 2241 */ "to-p12\0" +/* 2248 */ "Private key related options:\0" +/* 2277 */ "Print information on a private key\0" +/* 2312 */ "KEY_INFO\0" +/* 2321 */ "key-info\0" +/* 2330 */ "Print information on a PKCS #8 structure\0" +/* 2371 */ "P8_INFO\0" +/* 2379 */ "p8-info\0" +/* 2387 */ "Convert an RSA-PSS key to raw RSA format\0" +/* 2428 */ "TO_RSA\0" +/* 2435 */ "to-rsa\0" +/* 2442 */ "Generate a private key\0" +/* 2465 */ "GENERATE_PRIVKEY\0" +/* 2482 */ "generate-privkey\0" +/* 2499 */ "Specify the key type to use on key generation\0" +/* 2545 */ "KEY_TYPE\0" +/* 2554 */ "key-type\0" +/* 2563 */ "Specify the number of bits for key generation\0" +/* 2609 */ "BITS\0" +/* 2614 */ "bits\0" +/* 2619 */ "Specify the curve used for EC key generation\0" +/* 2664 */ "CURVE\0" +/* 2670 */ "curve\0" +/* 2676 */ "Specify the security level [low, legacy, medium, high, ultra]\0" +/* 2738 */ "SEC_PARAM\0" +/* 2748 */ "sec-param\0" +/* 2758 */ "Convert a given key to a PKCS #8 structure\0" +/* 2801 */ "TO_P8\0" +/* 2807 */ "to-p8\0" +/* 2813 */ "Use PKCS #8 format for private keys\0" +/* 2849 */ "PKCS8\0" +/* 2855 */ "pkcs8\0" +/* 2861 */ "Generate a private key or parameters from a seed using a provable method\0" +/* 2934 */ "PROVABLE\0" +/* 2943 */ "provable\0" +/* 2952 */ "Verify a private key generated from a seed using a provable method\0" +/* 3019 */ "VERIFY_PROVABLE_PRIVKEY\0" +/* 3043 */ "verify-provable-privkey\0" +/* 3067 */ "When generating a private key use the given hex-encoded seed\0" +/* 3128 */ "SEED\0" +/* 3133 */ "seed\0" +/* 3138 */ "CRL related options:\0" +/* 3159 */ "Print information on the given CRL structure\0" +/* 3204 */ "CRL_INFO\0" +/* 3213 */ "crl-info\0" +/* 3222 */ "Generate a CRL\0" +/* 3237 */ "GENERATE_CRL\0" +/* 3250 */ "generate-crl\0" +/* 3263 */ "Verify a Certificate Revocation List using a trusted list\0" +/* 3321 */ "VERIFY_CRL\0" +/* 3332 */ "verify-crl\0" +/* 3343 */ "Certificate verification related options:\0" +/* 3385 */ "Verify a PEM encoded certificate chain\0" +/* 3424 */ "VERIFY_CHAIN\0" +/* 3437 */ "verify-chain\0" +/* 3450 */ "Verify a PEM encoded certificate (chain) against a trusted set\0" +/* 3513 */ "VERIFY\0" +/* 3520 */ "verify\0" +/* 3527 */ "Specify a hostname to be used for certificate chain verification\0" +/* 3592 */ "VERIFY_HOSTNAME\0" +/* 3608 */ "verify-hostname\0" +/* 3624 */ "Specify a email to be used for certificate chain verification\0" +/* 3686 */ "VERIFY_EMAIL\0" +/* 3699 */ "verify-email\0" +/* 3712 */ "Specify a purpose OID to be used for certificate chain verification\0" +/* 3780 */ "VERIFY_PURPOSE\0" +/* 3795 */ "verify-purpose\0" +/* 3810 */ "Allow broken algorithms, such as MD5 for verification\0" +/* 3864 */ "VERIFY_ALLOW_BROKEN\0" +/* 3884 */ "verify-allow-broken\0" +/* 3904 */ "PKCS#7 structure options:\0" +/* 3930 */ "Generate a PKCS #7 structure\0" +/* 3959 */ "P7_GENERATE\0" +/* 3971 */ "p7-generate\0" +/* 3983 */ "Signs using a PKCS #7 structure\0" +/* 4015 */ "P7_SIGN\0" +/* 4023 */ "p7-sign\0" +/* 4031 */ "Signs using a detached PKCS #7 structure\0" +/* 4072 */ "P7_DETACHED_SIGN\0" +/* 4089 */ "p7-detached-sign\0" +/* 4106 */ "The signer's certificate will be included in the cert list.\0" +/* 4166 */ "P7_INCLUDE_CERT\0" +/* 4182 */ "no-p7-include-cert\0" +/* 4201 */ "no\0" +/* 4204 */ "Will include a timestamp in the PKCS #7 structure\0" +/* 4254 */ "P7_TIME\0" +/* 4262 */ "no-p7-time\0" +/* 4273 */ "Will show the embedded data in the PKCS #7 structure\0" +/* 4326 */ "P7_SHOW_DATA\0" +/* 4339 */ "no-p7-show-data\0" +/* 4355 */ "Print information on a PKCS #7 structure\0" +/* 4396 */ "P7_INFO\0" +/* 4404 */ "p7-info\0" +/* 4412 */ "Verify the provided PKCS #7 structure\0" +/* 4450 */ "P7_VERIFY\0" +/* 4460 */ "p7-verify\0" +/* 4470 */ "Convert S/MIME to PKCS #7 structure\0" +/* 4506 */ "SMIME_TO_P7\0" +/* 4518 */ "smime-to-p7\0" +/* 4530 */ "Other options:\0" +/* 4545 */ "Generate PKCS #3 encoded Diffie-Hellman parameters (deprecated)\0" +/* 4609 */ "GENERATE_DH_PARAMS\0" +/* 4628 */ "generate-dh-params\0" +/* 4647 */ "List the included PKCS #3 encoded Diffie-Hellman parameters\0" +/* 4707 */ "GET_DH_PARAMS\0" +/* 4721 */ "get-dh-params\0" +/* 4735 */ "Print information PKCS #3 encoded Diffie-Hellman parameters\0" +/* 4795 */ "DH_INFO\0" +/* 4803 */ "dh-info\0" +/* 4811 */ "Loads a private key file\0" +/* 4836 */ "LOAD_PRIVKEY\0" +/* 4849 */ "load-privkey\0" +/* 4862 */ "Loads a public key file\0" +/* 4886 */ "LOAD_PUBKEY\0" +/* 4898 */ "load-pubkey\0" +/* 4910 */ "Loads a certificate request file\0" +/* 4943 */ "LOAD_REQUEST\0" +/* 4956 */ "load-request\0" +/* 4969 */ "Loads a certificate file\0" +/* 4994 */ "LOAD_CERTIFICATE\0" +/* 5011 */ "load-certificate\0" +/* 5028 */ "Loads the certificate authority's private key file\0" +/* 5079 */ "LOAD_CA_PRIVKEY\0" +/* 5095 */ "load-ca-privkey\0" +/* 5111 */ "Loads the certificate authority's certificate file\0" +/* 5162 */ "LOAD_CA_CERTIFICATE\0" +/* 5182 */ "load-ca-certificate\0" +/* 5202 */ "Loads the provided CRL\0" +/* 5225 */ "LOAD_CRL\0" +/* 5234 */ "load-crl\0" +/* 5243 */ "Loads auxiliary data\0" +/* 5264 */ "LOAD_DATA\0" +/* 5274 */ "load-data\0" +/* 5284 */ "Password to use\0" +/* 5300 */ "PASSWORD\0" +/* 5309 */ "password\0" +/* 5318 */ "Enforce a NULL password\0" +/* 5342 */ "NULL_PASSWORD\0" +/* 5356 */ "null-password\0" +/* 5370 */ "Enforce an empty password\0" +/* 5396 */ "EMPTY_PASSWORD\0" +/* 5411 */ "empty-password\0" +/* 5426 */ "Print big number in an easier format to parse\0" +/* 5472 */ "HEX_NUMBERS\0" +/* 5484 */ "hex-numbers\0" +/* 5496 */ "In certain operations it prints the information in C-friendly format\0" +/* 5565 */ "CPRINT\0" +/* 5572 */ "cprint\0" +/* 5579 */ "Generate RSA key (deprecated)\0" +/* 5609 */ "RSA\0" +/* 5613 */ "rsa\0" +/* 5617 */ "Generate DSA key (deprecated)\0" +/* 5647 */ "DSA\0" +/* 5651 */ "dsa\0" +/* 5655 */ "Generate ECC (ECDSA) key (deprecated)\0" +/* 5693 */ "ECC\0" +/* 5697 */ "ecc\0" +/* 5701 */ "an alias for the 'ecc' option (deprecated)\0" +/* 5744 */ "ecdsa\0" +/* 5750 */ "Hash algorithm to use for signing\0" +/* 5784 */ "HASH\0" +/* 5789 */ "hash\0" +/* 5794 */ "Specify the RSA-PSS key default salt size\0" +/* 5836 */ "SALT_SIZE\0" +/* 5846 */ "salt-size\0" +/* 5856 */ "Use DER format for input certificates, private keys, and DH parameters\0" +/* 5927 */ "INDER\0" +/* 5933 */ "no-inder\0" +/* 5942 */ "an alias for the 'inder' option\0" +/* 5974 */ "inraw\0" +/* 5980 */ "Use DER format for output certificates, private keys, and DH parameters\0" +/* 6052 */ "OUTDER\0" +/* 6059 */ "no-outder\0" +/* 6069 */ "an alias for the 'outder' option\0" +/* 6102 */ "outraw\0" +/* 6109 */ "No effect (deprecated)\0" +/* 6132 */ "DISABLE_QUICK_RANDOM\0" +/* 6153 */ "disable-quick-random\0" +/* 6174 */ "Template file to use for non-interactive operation\0" +/* 6225 */ "TEMPLATE\0" +/* 6234 */ "template\0" +/* 6243 */ "Print information to stdout instead of stderr\0" +/* 6289 */ "STDOUT_INFO\0" +/* 6301 */ "stdout-info\0" +/* 6313 */ "Enable interaction for entering password when in batch mode.\0" +/* 6374 */ "ASK_PASS\0" +/* 6383 */ "ask-pass\0" +/* 6392 */ "Cipher to use for PKCS #8 and #12 operations\0" +/* 6437 */ "PKCS_CIPHER\0" +/* 6449 */ "pkcs-cipher\0" +/* 6461 */ "Specify the PKCS #11 provider library\0" +/* 6499 */ "PROVIDER\0" +/* 6508 */ "provider\0" +/* 6517 */ "display extended usage information and exit\0" +/* 6561 */ "help\0" +/* 6566 */ "extended usage information passed thru pager\0" +/* 6611 */ "more-help\0" +/* 6621 */ "output version information and exit\0" +/* 6657 */ "version\0" +/* 6665 */ "CERTTOOL\0" +/* 6674 */ "certtool - GnuTLS certificate tool\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0" -/* 6773 */ "@PACKAGE_BUGREPORT@\0" -/* 6793 */ "\n\0" -/* 6795 */ "Tool to parse and generate X.509 certificates, requests and private keys.\n" +/* 6767 */ "bugs@gnutls.org\0" +/* 6783 */ "\n\0" +/* 6785 */ "Tool to parse and generate X.509 certificates, requests and private keys.\n" "It can be used interactively or non interactively by specifying the\n" "template command line option.\n\n" "The tool accepts files or supported URIs via the --infile option. In case\n" "PIN is required for URI access you can provide it using the environment\n" "variables GNUTLS_PIN and GNUTLS_SO_PIN.\n\0" -/* 7156 */ "certtool @VERSION@\0" -/* 7175 */ "certtool [options]\n" +/* 7146 */ "certtool 3.6.4\0" +/* 7161 */ "certtool [options]\n" "certtool --help for usage instructions.\n"; /** * debug option description: */ /** Descriptive text for the debug option */ -#define DEBUG_DESC (certtool_opt_strs+894) +#define DEBUG_DESC (certtool_opt_strs+888) /** Upper-cased name for the debug option */ -#define DEBUG_NAME (certtool_opt_strs+911) +#define DEBUG_NAME (certtool_opt_strs+905) /** Name string for the debug option */ -#define DEBUG_name (certtool_opt_strs+917) +#define DEBUG_name (certtool_opt_strs+911) /** Compiled in flag settings for the debug option */ #define DEBUG_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -375,11 +375,11 @@ static char const certtool_opt_strs[7235] = * verbose option description: */ /** Descriptive text for the verbose option */ -#define VERBOSE_DESC (certtool_opt_strs+923) +#define VERBOSE_DESC (certtool_opt_strs+917) /** Upper-cased name for the verbose option */ -#define VERBOSE_NAME (certtool_opt_strs+943) +#define VERBOSE_NAME (certtool_opt_strs+937) /** Name string for the verbose option */ -#define VERBOSE_name (certtool_opt_strs+951) +#define VERBOSE_name (certtool_opt_strs+945) /** Compiled in flag settings for the verbose option */ #define VERBOSE_FLAGS (OPTST_DISABLED) @@ -387,11 +387,11 @@ static char const certtool_opt_strs[7235] = * infile option description: */ /** Descriptive text for the infile option */ -#define INFILE_DESC (certtool_opt_strs+959) +#define INFILE_DESC (certtool_opt_strs+953) /** Upper-cased name for the infile option */ -#define INFILE_NAME (certtool_opt_strs+970) +#define INFILE_NAME (certtool_opt_strs+964) /** Name string for the infile option */ -#define INFILE_name (certtool_opt_strs+977) +#define INFILE_name (certtool_opt_strs+971) /** Compiled in flag settings for the infile option */ #define INFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -400,11 +400,11 @@ static char const certtool_opt_strs[7235] = * outfile option description: */ /** Descriptive text for the outfile option */ -#define OUTFILE_DESC (certtool_opt_strs+984) +#define OUTFILE_DESC (certtool_opt_strs+978) /** Upper-cased name for the outfile option */ -#define OUTFILE_NAME (certtool_opt_strs+996) +#define OUTFILE_NAME (certtool_opt_strs+990) /** Name string for the outfile option */ -#define OUTFILE_name (certtool_opt_strs+1004) +#define OUTFILE_name (certtool_opt_strs+998) /** Compiled in flag settings for the outfile option */ #define OUTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -413,18 +413,18 @@ static char const certtool_opt_strs[7235] = * cert_options option description: */ /** cert_options option separation text */ -#define CERT_OPTIONS_DESC (certtool_opt_strs+1012) +#define CERT_OPTIONS_DESC (certtool_opt_strs+1006) #define CERT_OPTIONS_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** * certificate-info option description: */ /** Descriptive text for the certificate-info option */ -#define CERTIFICATE_INFO_DESC (certtool_opt_strs+1041) +#define CERTIFICATE_INFO_DESC (certtool_opt_strs+1035) /** Upper-cased name for the certificate-info option */ -#define CERTIFICATE_INFO_NAME (certtool_opt_strs+1084) +#define CERTIFICATE_INFO_NAME (certtool_opt_strs+1078) /** Name string for the certificate-info option */ -#define CERTIFICATE_INFO_name (certtool_opt_strs+1101) +#define CERTIFICATE_INFO_name (certtool_opt_strs+1095) /** Compiled in flag settings for the certificate-info option */ #define CERTIFICATE_INFO_FLAGS (OPTST_DISABLED) @@ -432,11 +432,11 @@ static char const certtool_opt_strs[7235] = * pubkey-info option description: */ /** Descriptive text for the pubkey-info option */ -#define PUBKEY_INFO_DESC (certtool_opt_strs+1118) +#define PUBKEY_INFO_DESC (certtool_opt_strs+1112) /** Upper-cased name for the pubkey-info option */ -#define PUBKEY_INFO_NAME (certtool_opt_strs+1152) +#define PUBKEY_INFO_NAME (certtool_opt_strs+1146) /** Name string for the pubkey-info option */ -#define PUBKEY_INFO_name (certtool_opt_strs+1164) +#define PUBKEY_INFO_name (certtool_opt_strs+1158) /** Compiled in flag settings for the pubkey-info option */ #define PUBKEY_INFO_FLAGS (OPTST_DISABLED) @@ -444,11 +444,11 @@ static char const certtool_opt_strs[7235] = * generate-self-signed option description: */ /** Descriptive text for the generate-self-signed option */ -#define GENERATE_SELF_SIGNED_DESC (certtool_opt_strs+1176) +#define GENERATE_SELF_SIGNED_DESC (certtool_opt_strs+1170) /** Upper-cased name for the generate-self-signed option */ -#define GENERATE_SELF_SIGNED_NAME (certtool_opt_strs+1211) +#define GENERATE_SELF_SIGNED_NAME (certtool_opt_strs+1205) /** Name string for the generate-self-signed option */ -#define GENERATE_SELF_SIGNED_name (certtool_opt_strs+1232) +#define GENERATE_SELF_SIGNED_name (certtool_opt_strs+1226) /** Compiled in flag settings for the generate-self-signed option */ #define GENERATE_SELF_SIGNED_FLAGS (OPTST_DISABLED) @@ -456,11 +456,11 @@ static char const certtool_opt_strs[7235] = * generate-certificate option description: */ /** Descriptive text for the generate-certificate option */ -#define GENERATE_CERTIFICATE_DESC (certtool_opt_strs+1253) +#define GENERATE_CERTIFICATE_DESC (certtool_opt_strs+1247) /** Upper-cased name for the generate-certificate option */ -#define GENERATE_CERTIFICATE_NAME (certtool_opt_strs+1283) +#define GENERATE_CERTIFICATE_NAME (certtool_opt_strs+1277) /** Name string for the generate-certificate option */ -#define GENERATE_CERTIFICATE_name (certtool_opt_strs+1304) +#define GENERATE_CERTIFICATE_name (certtool_opt_strs+1298) /** Compiled in flag settings for the generate-certificate option */ #define GENERATE_CERTIFICATE_FLAGS (OPTST_DISABLED) @@ -468,11 +468,11 @@ static char const certtool_opt_strs[7235] = * generate-proxy option description: */ /** Descriptive text for the generate-proxy option */ -#define GENERATE_PROXY_DESC (certtool_opt_strs+1325) +#define GENERATE_PROXY_DESC (certtool_opt_strs+1319) /** Upper-cased name for the generate-proxy option */ -#define GENERATE_PROXY_NAME (certtool_opt_strs+1355) +#define GENERATE_PROXY_NAME (certtool_opt_strs+1349) /** Name string for the generate-proxy option */ -#define GENERATE_PROXY_name (certtool_opt_strs+1370) +#define GENERATE_PROXY_name (certtool_opt_strs+1364) /** Compiled in flag settings for the generate-proxy option */ #define GENERATE_PROXY_FLAGS (OPTST_DISABLED) @@ -480,11 +480,11 @@ static char const certtool_opt_strs[7235] = * update-certificate option description: */ /** Descriptive text for the update-certificate option */ -#define UPDATE_CERTIFICATE_DESC (certtool_opt_strs+1385) +#define UPDATE_CERTIFICATE_DESC (certtool_opt_strs+1379) /** Upper-cased name for the update-certificate option */ -#define UPDATE_CERTIFICATE_NAME (certtool_opt_strs+1413) +#define UPDATE_CERTIFICATE_NAME (certtool_opt_strs+1407) /** Name string for the update-certificate option */ -#define UPDATE_CERTIFICATE_name (certtool_opt_strs+1432) +#define UPDATE_CERTIFICATE_name (certtool_opt_strs+1426) /** Compiled in flag settings for the update-certificate option */ #define UPDATE_CERTIFICATE_FLAGS (OPTST_DISABLED) @@ -492,11 +492,11 @@ static char const certtool_opt_strs[7235] = * fingerprint option description: */ /** Descriptive text for the fingerprint option */ -#define FINGERPRINT_DESC (certtool_opt_strs+1451) +#define FINGERPRINT_DESC (certtool_opt_strs+1445) /** Upper-cased name for the fingerprint option */ -#define FINGERPRINT_NAME (certtool_opt_strs+1498) +#define FINGERPRINT_NAME (certtool_opt_strs+1492) /** Name string for the fingerprint option */ -#define FINGERPRINT_name (certtool_opt_strs+1510) +#define FINGERPRINT_name (certtool_opt_strs+1504) /** Compiled in flag settings for the fingerprint option */ #define FINGERPRINT_FLAGS (OPTST_DISABLED) @@ -504,11 +504,11 @@ static char const certtool_opt_strs[7235] = * key-id option description: */ /** Descriptive text for the key-id option */ -#define KEY_ID_DESC (certtool_opt_strs+1522) +#define KEY_ID_DESC (certtool_opt_strs+1516) /** Upper-cased name for the key-id option */ -#define KEY_ID_NAME (certtool_opt_strs+1564) +#define KEY_ID_NAME (certtool_opt_strs+1558) /** Name string for the key-id option */ -#define KEY_ID_name (certtool_opt_strs+1571) +#define KEY_ID_name (certtool_opt_strs+1565) /** Compiled in flag settings for the key-id option */ #define KEY_ID_FLAGS (OPTST_DISABLED) @@ -516,11 +516,11 @@ static char const certtool_opt_strs[7235] = * certificate-pubkey option description: */ /** Descriptive text for the certificate-pubkey option */ -#define CERTIFICATE_PUBKEY_DESC (certtool_opt_strs+1578) +#define CERTIFICATE_PUBKEY_DESC (certtool_opt_strs+1572) /** Upper-cased name for the certificate-pubkey option */ -#define CERTIFICATE_PUBKEY_NAME (certtool_opt_strs+1622) +#define CERTIFICATE_PUBKEY_NAME (certtool_opt_strs+1616) /** Name string for the certificate-pubkey option */ -#define CERTIFICATE_PUBKEY_name (certtool_opt_strs+1641) +#define CERTIFICATE_PUBKEY_name (certtool_opt_strs+1635) /** Compiled in flag settings for the certificate-pubkey option */ #define CERTIFICATE_PUBKEY_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED) @@ -528,11 +528,11 @@ static char const certtool_opt_strs[7235] = * v1 option description: */ /** Descriptive text for the v1 option */ -#define V1_DESC (certtool_opt_strs+1660) +#define V1_DESC (certtool_opt_strs+1654) /** Upper-cased name for the v1 option */ -#define V1_NAME (certtool_opt_strs+1721) +#define V1_NAME (certtool_opt_strs+1715) /** Name string for the v1 option */ -#define V1_name (certtool_opt_strs+1724) +#define V1_name (certtool_opt_strs+1718) /** Compiled in flag settings for the v1 option */ #define V1_FLAGS (OPTST_DISABLED) @@ -540,11 +540,11 @@ static char const certtool_opt_strs[7235] = * sign-params option description: */ /** Descriptive text for the sign-params option */ -#define SIGN_PARAMS_DESC (certtool_opt_strs+1727) +#define SIGN_PARAMS_DESC (certtool_opt_strs+1721) /** Upper-cased name for the sign-params option */ -#define SIGN_PARAMS_NAME (certtool_opt_strs+1782) +#define SIGN_PARAMS_NAME (certtool_opt_strs+1776) /** Name string for the sign-params option */ -#define SIGN_PARAMS_name (certtool_opt_strs+1794) +#define SIGN_PARAMS_name (certtool_opt_strs+1788) /** Compiled in flag settings for the sign-params option */ #define SIGN_PARAMS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -553,18 +553,18 @@ static char const certtool_opt_strs[7235] = * crq_options option description: */ /** crq_options option separation text */ -#define CRQ_OPTIONS_DESC (certtool_opt_strs+1806) +#define CRQ_OPTIONS_DESC (certtool_opt_strs+1800) #define CRQ_OPTIONS_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** * crq-info option description: */ /** Descriptive text for the crq-info option */ -#define CRQ_INFO_DESC (certtool_opt_strs+1843) +#define CRQ_INFO_DESC (certtool_opt_strs+1837) /** Upper-cased name for the crq-info option */ -#define CRQ_INFO_NAME (certtool_opt_strs+1894) +#define CRQ_INFO_NAME (certtool_opt_strs+1888) /** Name string for the crq-info option */ -#define CRQ_INFO_name (certtool_opt_strs+1903) +#define CRQ_INFO_name (certtool_opt_strs+1897) /** Compiled in flag settings for the crq-info option */ #define CRQ_INFO_FLAGS (OPTST_DISABLED) @@ -573,11 +573,11 @@ static char const certtool_opt_strs[7235] = * "Must also have options" and "Incompatible options": */ /** Descriptive text for the generate-request option */ -#define GENERATE_REQUEST_DESC (certtool_opt_strs+1912) +#define GENERATE_REQUEST_DESC (certtool_opt_strs+1906) /** Upper-cased name for the generate-request option */ -#define GENERATE_REQUEST_NAME (certtool_opt_strs+1952) +#define GENERATE_REQUEST_NAME (certtool_opt_strs+1946) /** Name string for the generate-request option */ -#define GENERATE_REQUEST_name (certtool_opt_strs+1969) +#define GENERATE_REQUEST_name (certtool_opt_strs+1963) /** Other options that appear in conjunction with the generate-request option */ static int const aGenerate_RequestCantList[] = { INDEX_OPT_INFILE, NO_EQUIVALENT }; @@ -588,11 +588,11 @@ static int const aGenerate_RequestCantList[] = { * no-crq-extensions option description: */ /** Descriptive text for the no-crq-extensions option */ -#define NO_CRQ_EXTENSIONS_DESC (certtool_opt_strs+1986) +#define NO_CRQ_EXTENSIONS_DESC (certtool_opt_strs+1980) /** Upper-cased name for the no-crq-extensions option */ -#define NO_CRQ_EXTENSIONS_NAME (certtool_opt_strs+2032) +#define NO_CRQ_EXTENSIONS_NAME (certtool_opt_strs+2026) /** Name string for the no-crq-extensions option */ -#define NO_CRQ_EXTENSIONS_name (certtool_opt_strs+2050) +#define NO_CRQ_EXTENSIONS_name (certtool_opt_strs+2044) /** Compiled in flag settings for the no-crq-extensions option */ #define NO_CRQ_EXTENSIONS_FLAGS (OPTST_DISABLED) @@ -600,18 +600,18 @@ static int const aGenerate_RequestCantList[] = { * pkcs12_options option description: */ /** pkcs12_options option separation text */ -#define PKCS12_OPTIONS_DESC (certtool_opt_strs+2068) +#define PKCS12_OPTIONS_DESC (certtool_opt_strs+2062) #define PKCS12_OPTIONS_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** * p12-info option description: */ /** Descriptive text for the p12-info option */ -#define P12_INFO_DESC (certtool_opt_strs+2098) +#define P12_INFO_DESC (certtool_opt_strs+2092) /** Upper-cased name for the p12-info option */ -#define P12_INFO_NAME (certtool_opt_strs+2140) +#define P12_INFO_NAME (certtool_opt_strs+2134) /** Name string for the p12-info option */ -#define P12_INFO_name (certtool_opt_strs+2149) +#define P12_INFO_name (certtool_opt_strs+2143) /** Compiled in flag settings for the p12-info option */ #define P12_INFO_FLAGS (OPTST_DISABLED) @@ -619,11 +619,11 @@ static int const aGenerate_RequestCantList[] = { * p12-name option description: */ /** Descriptive text for the p12-name option */ -#define P12_NAME_DESC (certtool_opt_strs+2158) +#define P12_NAME_DESC (certtool_opt_strs+2152) /** Upper-cased name for the p12-name option */ -#define P12_NAME_NAME (certtool_opt_strs+2192) +#define P12_NAME_NAME (certtool_opt_strs+2186) /** Name string for the p12-name option */ -#define P12_NAME_name (certtool_opt_strs+2201) +#define P12_NAME_name (certtool_opt_strs+2195) /** Compiled in flag settings for the p12-name option */ #define P12_NAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -632,11 +632,11 @@ static int const aGenerate_RequestCantList[] = { * to-p12 option description: */ /** Descriptive text for the to-p12 option */ -#define TO_P12_DESC (certtool_opt_strs+2210) +#define TO_P12_DESC (certtool_opt_strs+2204) /** Upper-cased name for the to-p12 option */ -#define TO_P12_NAME (certtool_opt_strs+2240) +#define TO_P12_NAME (certtool_opt_strs+2234) /** Name string for the to-p12 option */ -#define TO_P12_name (certtool_opt_strs+2247) +#define TO_P12_name (certtool_opt_strs+2241) /** Compiled in flag settings for the to-p12 option */ #define TO_P12_FLAGS (OPTST_DISABLED) @@ -644,18 +644,18 @@ static int const aGenerate_RequestCantList[] = { * key_options option description: */ /** key_options option separation text */ -#define KEY_OPTIONS_DESC (certtool_opt_strs+2254) +#define KEY_OPTIONS_DESC (certtool_opt_strs+2248) #define KEY_OPTIONS_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** * key-info option description: */ /** Descriptive text for the key-info option */ -#define KEY_INFO_DESC (certtool_opt_strs+2283) +#define KEY_INFO_DESC (certtool_opt_strs+2277) /** Upper-cased name for the key-info option */ -#define KEY_INFO_NAME (certtool_opt_strs+2318) +#define KEY_INFO_NAME (certtool_opt_strs+2312) /** Name string for the key-info option */ -#define KEY_INFO_name (certtool_opt_strs+2327) +#define KEY_INFO_name (certtool_opt_strs+2321) /** Compiled in flag settings for the key-info option */ #define KEY_INFO_FLAGS (OPTST_DISABLED) @@ -663,11 +663,11 @@ static int const aGenerate_RequestCantList[] = { * p8-info option description: */ /** Descriptive text for the p8-info option */ -#define P8_INFO_DESC (certtool_opt_strs+2336) +#define P8_INFO_DESC (certtool_opt_strs+2330) /** Upper-cased name for the p8-info option */ -#define P8_INFO_NAME (certtool_opt_strs+2377) +#define P8_INFO_NAME (certtool_opt_strs+2371) /** Name string for the p8-info option */ -#define P8_INFO_name (certtool_opt_strs+2385) +#define P8_INFO_name (certtool_opt_strs+2379) /** Compiled in flag settings for the p8-info option */ #define P8_INFO_FLAGS (OPTST_DISABLED) @@ -675,11 +675,11 @@ static int const aGenerate_RequestCantList[] = { * to-rsa option description: */ /** Descriptive text for the to-rsa option */ -#define TO_RSA_DESC (certtool_opt_strs+2393) +#define TO_RSA_DESC (certtool_opt_strs+2387) /** Upper-cased name for the to-rsa option */ -#define TO_RSA_NAME (certtool_opt_strs+2434) +#define TO_RSA_NAME (certtool_opt_strs+2428) /** Name string for the to-rsa option */ -#define TO_RSA_name (certtool_opt_strs+2441) +#define TO_RSA_name (certtool_opt_strs+2435) /** Compiled in flag settings for the to-rsa option */ #define TO_RSA_FLAGS (OPTST_DISABLED) @@ -687,11 +687,11 @@ static int const aGenerate_RequestCantList[] = { * generate-privkey option description: */ /** Descriptive text for the generate-privkey option */ -#define GENERATE_PRIVKEY_DESC (certtool_opt_strs+2448) +#define GENERATE_PRIVKEY_DESC (certtool_opt_strs+2442) /** Upper-cased name for the generate-privkey option */ -#define GENERATE_PRIVKEY_NAME (certtool_opt_strs+2471) +#define GENERATE_PRIVKEY_NAME (certtool_opt_strs+2465) /** Name string for the generate-privkey option */ -#define GENERATE_PRIVKEY_name (certtool_opt_strs+2488) +#define GENERATE_PRIVKEY_name (certtool_opt_strs+2482) /** Compiled in flag settings for the generate-privkey option */ #define GENERATE_PRIVKEY_FLAGS (OPTST_DISABLED) @@ -699,11 +699,11 @@ static int const aGenerate_RequestCantList[] = { * key-type option description: */ /** Descriptive text for the key-type option */ -#define KEY_TYPE_DESC (certtool_opt_strs+2505) +#define KEY_TYPE_DESC (certtool_opt_strs+2499) /** Upper-cased name for the key-type option */ -#define KEY_TYPE_NAME (certtool_opt_strs+2551) +#define KEY_TYPE_NAME (certtool_opt_strs+2545) /** Name string for the key-type option */ -#define KEY_TYPE_name (certtool_opt_strs+2560) +#define KEY_TYPE_name (certtool_opt_strs+2554) /** Compiled in flag settings for the key-type option */ #define KEY_TYPE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -712,11 +712,11 @@ static int const aGenerate_RequestCantList[] = { * bits option description: */ /** Descriptive text for the bits option */ -#define BITS_DESC (certtool_opt_strs+2569) +#define BITS_DESC (certtool_opt_strs+2563) /** Upper-cased name for the bits option */ -#define BITS_NAME (certtool_opt_strs+2615) +#define BITS_NAME (certtool_opt_strs+2609) /** Name string for the bits option */ -#define BITS_name (certtool_opt_strs+2620) +#define BITS_name (certtool_opt_strs+2614) /** Compiled in flag settings for the bits option */ #define BITS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -725,11 +725,11 @@ static int const aGenerate_RequestCantList[] = { * curve option description: */ /** Descriptive text for the curve option */ -#define CURVE_DESC (certtool_opt_strs+2625) +#define CURVE_DESC (certtool_opt_strs+2619) /** Upper-cased name for the curve option */ -#define CURVE_NAME (certtool_opt_strs+2670) +#define CURVE_NAME (certtool_opt_strs+2664) /** Name string for the curve option */ -#define CURVE_name (certtool_opt_strs+2676) +#define CURVE_name (certtool_opt_strs+2670) /** Compiled in flag settings for the curve option */ #define CURVE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -738,11 +738,11 @@ static int const aGenerate_RequestCantList[] = { * sec-param option description: */ /** Descriptive text for the sec-param option */ -#define SEC_PARAM_DESC (certtool_opt_strs+2682) +#define SEC_PARAM_DESC (certtool_opt_strs+2676) /** Upper-cased name for the sec-param option */ -#define SEC_PARAM_NAME (certtool_opt_strs+2744) +#define SEC_PARAM_NAME (certtool_opt_strs+2738) /** Name string for the sec-param option */ -#define SEC_PARAM_name (certtool_opt_strs+2754) +#define SEC_PARAM_name (certtool_opt_strs+2748) /** Compiled in flag settings for the sec-param option */ #define SEC_PARAM_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -751,11 +751,11 @@ static int const aGenerate_RequestCantList[] = { * to-p8 option description: */ /** Descriptive text for the to-p8 option */ -#define TO_P8_DESC (certtool_opt_strs+2764) +#define TO_P8_DESC (certtool_opt_strs+2758) /** Upper-cased name for the to-p8 option */ -#define TO_P8_NAME (certtool_opt_strs+2807) +#define TO_P8_NAME (certtool_opt_strs+2801) /** Name string for the to-p8 option */ -#define TO_P8_name (certtool_opt_strs+2813) +#define TO_P8_name (certtool_opt_strs+2807) /** Compiled in flag settings for the to-p8 option */ #define TO_P8_FLAGS (OPTST_DISABLED) @@ -763,11 +763,11 @@ static int const aGenerate_RequestCantList[] = { * pkcs8 option description: */ /** Descriptive text for the pkcs8 option */ -#define PKCS8_DESC (certtool_opt_strs+2819) +#define PKCS8_DESC (certtool_opt_strs+2813) /** Upper-cased name for the pkcs8 option */ -#define PKCS8_NAME (certtool_opt_strs+2855) +#define PKCS8_NAME (certtool_opt_strs+2849) /** Name string for the pkcs8 option */ -#define PKCS8_name (certtool_opt_strs+2861) +#define PKCS8_name (certtool_opt_strs+2855) /** Compiled in flag settings for the pkcs8 option */ #define PKCS8_FLAGS (OPTST_DISABLED) @@ -775,11 +775,11 @@ static int const aGenerate_RequestCantList[] = { * provable option description: */ /** Descriptive text for the provable option */ -#define PROVABLE_DESC (certtool_opt_strs+2867) +#define PROVABLE_DESC (certtool_opt_strs+2861) /** Upper-cased name for the provable option */ -#define PROVABLE_NAME (certtool_opt_strs+2940) +#define PROVABLE_NAME (certtool_opt_strs+2934) /** Name string for the provable option */ -#define PROVABLE_name (certtool_opt_strs+2949) +#define PROVABLE_name (certtool_opt_strs+2943) /** Compiled in flag settings for the provable option */ #define PROVABLE_FLAGS (OPTST_DISABLED) @@ -787,11 +787,11 @@ static int const aGenerate_RequestCantList[] = { * verify-provable-privkey option description: */ /** Descriptive text for the verify-provable-privkey option */ -#define VERIFY_PROVABLE_PRIVKEY_DESC (certtool_opt_strs+2958) +#define VERIFY_PROVABLE_PRIVKEY_DESC (certtool_opt_strs+2952) /** Upper-cased name for the verify-provable-privkey option */ -#define VERIFY_PROVABLE_PRIVKEY_NAME (certtool_opt_strs+3025) +#define VERIFY_PROVABLE_PRIVKEY_NAME (certtool_opt_strs+3019) /** Name string for the verify-provable-privkey option */ -#define VERIFY_PROVABLE_PRIVKEY_name (certtool_opt_strs+3049) +#define VERIFY_PROVABLE_PRIVKEY_name (certtool_opt_strs+3043) /** Compiled in flag settings for the verify-provable-privkey option */ #define VERIFY_PROVABLE_PRIVKEY_FLAGS (OPTST_DISABLED) @@ -799,11 +799,11 @@ static int const aGenerate_RequestCantList[] = { * seed option description: */ /** Descriptive text for the seed option */ -#define SEED_DESC (certtool_opt_strs+3073) +#define SEED_DESC (certtool_opt_strs+3067) /** Upper-cased name for the seed option */ -#define SEED_NAME (certtool_opt_strs+3134) +#define SEED_NAME (certtool_opt_strs+3128) /** Name string for the seed option */ -#define SEED_name (certtool_opt_strs+3139) +#define SEED_name (certtool_opt_strs+3133) /** Compiled in flag settings for the seed option */ #define SEED_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -812,18 +812,18 @@ static int const aGenerate_RequestCantList[] = { * crl_options option description: */ /** crl_options option separation text */ -#define CRL_OPTIONS_DESC (certtool_opt_strs+3144) +#define CRL_OPTIONS_DESC (certtool_opt_strs+3138) #define CRL_OPTIONS_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** * crl-info option description: */ /** Descriptive text for the crl-info option */ -#define CRL_INFO_DESC (certtool_opt_strs+3165) +#define CRL_INFO_DESC (certtool_opt_strs+3159) /** Upper-cased name for the crl-info option */ -#define CRL_INFO_NAME (certtool_opt_strs+3210) +#define CRL_INFO_NAME (certtool_opt_strs+3204) /** Name string for the crl-info option */ -#define CRL_INFO_name (certtool_opt_strs+3219) +#define CRL_INFO_name (certtool_opt_strs+3213) /** Compiled in flag settings for the crl-info option */ #define CRL_INFO_FLAGS (OPTST_DISABLED) @@ -831,11 +831,11 @@ static int const aGenerate_RequestCantList[] = { * generate-crl option description: */ /** Descriptive text for the generate-crl option */ -#define GENERATE_CRL_DESC (certtool_opt_strs+3228) +#define GENERATE_CRL_DESC (certtool_opt_strs+3222) /** Upper-cased name for the generate-crl option */ -#define GENERATE_CRL_NAME (certtool_opt_strs+3243) +#define GENERATE_CRL_NAME (certtool_opt_strs+3237) /** Name string for the generate-crl option */ -#define GENERATE_CRL_name (certtool_opt_strs+3256) +#define GENERATE_CRL_name (certtool_opt_strs+3250) /** Compiled in flag settings for the generate-crl option */ #define GENERATE_CRL_FLAGS (OPTST_DISABLED) @@ -844,11 +844,11 @@ static int const aGenerate_RequestCantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the verify-crl option */ -#define VERIFY_CRL_DESC (certtool_opt_strs+3269) +#define VERIFY_CRL_DESC (certtool_opt_strs+3263) /** Upper-cased name for the verify-crl option */ -#define VERIFY_CRL_NAME (certtool_opt_strs+3327) +#define VERIFY_CRL_NAME (certtool_opt_strs+3321) /** Name string for the verify-crl option */ -#define VERIFY_CRL_name (certtool_opt_strs+3338) +#define VERIFY_CRL_name (certtool_opt_strs+3332) /** Other options that are required by the verify-crl option */ static int const aVerify_CrlMustList[] = { INDEX_OPT_LOAD_CA_CERTIFICATE, NO_EQUIVALENT }; @@ -859,18 +859,18 @@ static int const aVerify_CrlMustList[] = { * cert_verify_options option description: */ /** cert_verify_options option separation text */ -#define CERT_VERIFY_OPTIONS_DESC (certtool_opt_strs+3349) +#define CERT_VERIFY_OPTIONS_DESC (certtool_opt_strs+3343) #define CERT_VERIFY_OPTIONS_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** * verify-chain option description: */ /** Descriptive text for the verify-chain option */ -#define VERIFY_CHAIN_DESC (certtool_opt_strs+3391) +#define VERIFY_CHAIN_DESC (certtool_opt_strs+3385) /** Upper-cased name for the verify-chain option */ -#define VERIFY_CHAIN_NAME (certtool_opt_strs+3430) +#define VERIFY_CHAIN_NAME (certtool_opt_strs+3424) /** Name string for the verify-chain option */ -#define VERIFY_CHAIN_name (certtool_opt_strs+3443) +#define VERIFY_CHAIN_name (certtool_opt_strs+3437) /** Compiled in flag settings for the verify-chain option */ #define VERIFY_CHAIN_FLAGS (OPTST_DISABLED) @@ -878,11 +878,11 @@ static int const aVerify_CrlMustList[] = { * verify option description: */ /** Descriptive text for the verify option */ -#define VERIFY_DESC (certtool_opt_strs+3456) +#define VERIFY_DESC (certtool_opt_strs+3450) /** Upper-cased name for the verify option */ -#define VERIFY_NAME (certtool_opt_strs+3519) +#define VERIFY_NAME (certtool_opt_strs+3513) /** Name string for the verify option */ -#define VERIFY_name (certtool_opt_strs+3526) +#define VERIFY_name (certtool_opt_strs+3520) /** Compiled in flag settings for the verify option */ #define VERIFY_FLAGS (OPTST_DISABLED) @@ -890,11 +890,11 @@ static int const aVerify_CrlMustList[] = { * verify-hostname option description: */ /** Descriptive text for the verify-hostname option */ -#define VERIFY_HOSTNAME_DESC (certtool_opt_strs+3533) +#define VERIFY_HOSTNAME_DESC (certtool_opt_strs+3527) /** Upper-cased name for the verify-hostname option */ -#define VERIFY_HOSTNAME_NAME (certtool_opt_strs+3598) +#define VERIFY_HOSTNAME_NAME (certtool_opt_strs+3592) /** Name string for the verify-hostname option */ -#define VERIFY_HOSTNAME_name (certtool_opt_strs+3614) +#define VERIFY_HOSTNAME_name (certtool_opt_strs+3608) /** Compiled in flag settings for the verify-hostname option */ #define VERIFY_HOSTNAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -904,11 +904,11 @@ static int const aVerify_CrlMustList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the verify-email option */ -#define VERIFY_EMAIL_DESC (certtool_opt_strs+3630) +#define VERIFY_EMAIL_DESC (certtool_opt_strs+3624) /** Upper-cased name for the verify-email option */ -#define VERIFY_EMAIL_NAME (certtool_opt_strs+3692) +#define VERIFY_EMAIL_NAME (certtool_opt_strs+3686) /** Name string for the verify-email option */ -#define VERIFY_EMAIL_name (certtool_opt_strs+3705) +#define VERIFY_EMAIL_name (certtool_opt_strs+3699) /** Other options that appear in conjunction with the verify-email option */ static int const aVerify_EmailCantList[] = { INDEX_OPT_VERIFY_HOSTNAME, NO_EQUIVALENT }; @@ -920,11 +920,11 @@ static int const aVerify_EmailCantList[] = { * verify-purpose option description: */ /** Descriptive text for the verify-purpose option */ -#define VERIFY_PURPOSE_DESC (certtool_opt_strs+3718) +#define VERIFY_PURPOSE_DESC (certtool_opt_strs+3712) /** Upper-cased name for the verify-purpose option */ -#define VERIFY_PURPOSE_NAME (certtool_opt_strs+3786) +#define VERIFY_PURPOSE_NAME (certtool_opt_strs+3780) /** Name string for the verify-purpose option */ -#define VERIFY_PURPOSE_name (certtool_opt_strs+3801) +#define VERIFY_PURPOSE_name (certtool_opt_strs+3795) /** Compiled in flag settings for the verify-purpose option */ #define VERIFY_PURPOSE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -933,11 +933,11 @@ static int const aVerify_EmailCantList[] = { * verify-allow-broken option description: */ /** Descriptive text for the verify-allow-broken option */ -#define VERIFY_ALLOW_BROKEN_DESC (certtool_opt_strs+3816) +#define VERIFY_ALLOW_BROKEN_DESC (certtool_opt_strs+3810) /** Upper-cased name for the verify-allow-broken option */ -#define VERIFY_ALLOW_BROKEN_NAME (certtool_opt_strs+3870) +#define VERIFY_ALLOW_BROKEN_NAME (certtool_opt_strs+3864) /** Name string for the verify-allow-broken option */ -#define VERIFY_ALLOW_BROKEN_name (certtool_opt_strs+3890) +#define VERIFY_ALLOW_BROKEN_name (certtool_opt_strs+3884) /** Compiled in flag settings for the verify-allow-broken option */ #define VERIFY_ALLOW_BROKEN_FLAGS (OPTST_DISABLED) @@ -945,18 +945,18 @@ static int const aVerify_EmailCantList[] = { * pkcs7_options option description: */ /** pkcs7_options option separation text */ -#define PKCS7_OPTIONS_DESC (certtool_opt_strs+3910) +#define PKCS7_OPTIONS_DESC (certtool_opt_strs+3904) #define PKCS7_OPTIONS_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** * p7-generate option description: */ /** Descriptive text for the p7-generate option */ -#define P7_GENERATE_DESC (certtool_opt_strs+3936) +#define P7_GENERATE_DESC (certtool_opt_strs+3930) /** Upper-cased name for the p7-generate option */ -#define P7_GENERATE_NAME (certtool_opt_strs+3965) +#define P7_GENERATE_NAME (certtool_opt_strs+3959) /** Name string for the p7-generate option */ -#define P7_GENERATE_name (certtool_opt_strs+3977) +#define P7_GENERATE_name (certtool_opt_strs+3971) /** Compiled in flag settings for the p7-generate option */ #define P7_GENERATE_FLAGS (OPTST_DISABLED) @@ -964,11 +964,11 @@ static int const aVerify_EmailCantList[] = { * p7-sign option description: */ /** Descriptive text for the p7-sign option */ -#define P7_SIGN_DESC (certtool_opt_strs+3989) +#define P7_SIGN_DESC (certtool_opt_strs+3983) /** Upper-cased name for the p7-sign option */ -#define P7_SIGN_NAME (certtool_opt_strs+4021) +#define P7_SIGN_NAME (certtool_opt_strs+4015) /** Name string for the p7-sign option */ -#define P7_SIGN_name (certtool_opt_strs+4029) +#define P7_SIGN_name (certtool_opt_strs+4023) /** Compiled in flag settings for the p7-sign option */ #define P7_SIGN_FLAGS (OPTST_DISABLED) @@ -976,11 +976,11 @@ static int const aVerify_EmailCantList[] = { * p7-detached-sign option description: */ /** Descriptive text for the p7-detached-sign option */ -#define P7_DETACHED_SIGN_DESC (certtool_opt_strs+4037) +#define P7_DETACHED_SIGN_DESC (certtool_opt_strs+4031) /** Upper-cased name for the p7-detached-sign option */ -#define P7_DETACHED_SIGN_NAME (certtool_opt_strs+4078) +#define P7_DETACHED_SIGN_NAME (certtool_opt_strs+4072) /** Name string for the p7-detached-sign option */ -#define P7_DETACHED_SIGN_name (certtool_opt_strs+4095) +#define P7_DETACHED_SIGN_name (certtool_opt_strs+4089) /** Compiled in flag settings for the p7-detached-sign option */ #define P7_DETACHED_SIGN_FLAGS (OPTST_DISABLED) @@ -988,13 +988,13 @@ static int const aVerify_EmailCantList[] = { * p7-include-cert option description: */ /** Descriptive text for the p7-include-cert option */ -#define P7_INCLUDE_CERT_DESC (certtool_opt_strs+4112) +#define P7_INCLUDE_CERT_DESC (certtool_opt_strs+4106) /** Upper-cased name for the p7-include-cert option */ -#define P7_INCLUDE_CERT_NAME (certtool_opt_strs+4172) +#define P7_INCLUDE_CERT_NAME (certtool_opt_strs+4166) /** disablement name for the p7-include-cert option */ -#define NOT_P7_INCLUDE_CERT_name (certtool_opt_strs+4188) +#define NOT_P7_INCLUDE_CERT_name (certtool_opt_strs+4182) /** disablement prefix for the p7-include-cert option */ -#define NOT_P7_INCLUDE_CERT_PFX (certtool_opt_strs+4207) +#define NOT_P7_INCLUDE_CERT_PFX (certtool_opt_strs+4201) /** Name string for the p7-include-cert option */ #define P7_INCLUDE_CERT_name (NOT_P7_INCLUDE_CERT_name + 3) /** Compiled in flag settings for the p7-include-cert option */ @@ -1004,13 +1004,13 @@ static int const aVerify_EmailCantList[] = { * p7-time option description: */ /** Descriptive text for the p7-time option */ -#define P7_TIME_DESC (certtool_opt_strs+4210) +#define P7_TIME_DESC (certtool_opt_strs+4204) /** Upper-cased name for the p7-time option */ -#define P7_TIME_NAME (certtool_opt_strs+4260) +#define P7_TIME_NAME (certtool_opt_strs+4254) /** disablement name for the p7-time option */ -#define NOT_P7_TIME_name (certtool_opt_strs+4268) +#define NOT_P7_TIME_name (certtool_opt_strs+4262) /** disablement prefix for the p7-time option */ -#define NOT_P7_TIME_PFX (certtool_opt_strs+4207) +#define NOT_P7_TIME_PFX (certtool_opt_strs+4201) /** Name string for the p7-time option */ #define P7_TIME_name (NOT_P7_TIME_name + 3) /** Compiled in flag settings for the p7-time option */ @@ -1020,13 +1020,13 @@ static int const aVerify_EmailCantList[] = { * p7-show-data option description: */ /** Descriptive text for the p7-show-data option */ -#define P7_SHOW_DATA_DESC (certtool_opt_strs+4279) +#define P7_SHOW_DATA_DESC (certtool_opt_strs+4273) /** Upper-cased name for the p7-show-data option */ -#define P7_SHOW_DATA_NAME (certtool_opt_strs+4332) +#define P7_SHOW_DATA_NAME (certtool_opt_strs+4326) /** disablement name for the p7-show-data option */ -#define NOT_P7_SHOW_DATA_name (certtool_opt_strs+4345) +#define NOT_P7_SHOW_DATA_name (certtool_opt_strs+4339) /** disablement prefix for the p7-show-data option */ -#define NOT_P7_SHOW_DATA_PFX (certtool_opt_strs+4207) +#define NOT_P7_SHOW_DATA_PFX (certtool_opt_strs+4201) /** Name string for the p7-show-data option */ #define P7_SHOW_DATA_name (NOT_P7_SHOW_DATA_name + 3) /** Compiled in flag settings for the p7-show-data option */ @@ -1036,11 +1036,11 @@ static int const aVerify_EmailCantList[] = { * p7-info option description: */ /** Descriptive text for the p7-info option */ -#define P7_INFO_DESC (certtool_opt_strs+4361) +#define P7_INFO_DESC (certtool_opt_strs+4355) /** Upper-cased name for the p7-info option */ -#define P7_INFO_NAME (certtool_opt_strs+4402) +#define P7_INFO_NAME (certtool_opt_strs+4396) /** Name string for the p7-info option */ -#define P7_INFO_name (certtool_opt_strs+4410) +#define P7_INFO_name (certtool_opt_strs+4404) /** Compiled in flag settings for the p7-info option */ #define P7_INFO_FLAGS (OPTST_DISABLED) @@ -1048,11 +1048,11 @@ static int const aVerify_EmailCantList[] = { * p7-verify option description: */ /** Descriptive text for the p7-verify option */ -#define P7_VERIFY_DESC (certtool_opt_strs+4418) +#define P7_VERIFY_DESC (certtool_opt_strs+4412) /** Upper-cased name for the p7-verify option */ -#define P7_VERIFY_NAME (certtool_opt_strs+4456) +#define P7_VERIFY_NAME (certtool_opt_strs+4450) /** Name string for the p7-verify option */ -#define P7_VERIFY_name (certtool_opt_strs+4466) +#define P7_VERIFY_name (certtool_opt_strs+4460) /** Compiled in flag settings for the p7-verify option */ #define P7_VERIFY_FLAGS (OPTST_DISABLED) @@ -1060,11 +1060,11 @@ static int const aVerify_EmailCantList[] = { * smime-to-p7 option description: */ /** Descriptive text for the smime-to-p7 option */ -#define SMIME_TO_P7_DESC (certtool_opt_strs+4476) +#define SMIME_TO_P7_DESC (certtool_opt_strs+4470) /** Upper-cased name for the smime-to-p7 option */ -#define SMIME_TO_P7_NAME (certtool_opt_strs+4512) +#define SMIME_TO_P7_NAME (certtool_opt_strs+4506) /** Name string for the smime-to-p7 option */ -#define SMIME_TO_P7_name (certtool_opt_strs+4524) +#define SMIME_TO_P7_name (certtool_opt_strs+4518) /** Compiled in flag settings for the smime-to-p7 option */ #define SMIME_TO_P7_FLAGS (OPTST_DISABLED) @@ -1072,18 +1072,18 @@ static int const aVerify_EmailCantList[] = { * other_options option description: */ /** other_options option separation text */ -#define OTHER_OPTIONS_DESC (certtool_opt_strs+4536) +#define OTHER_OPTIONS_DESC (certtool_opt_strs+4530) #define OTHER_OPTIONS_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** * generate-dh-params option description: */ /** Descriptive text for the generate-dh-params option */ -#define GENERATE_DH_PARAMS_DESC (certtool_opt_strs+4551) +#define GENERATE_DH_PARAMS_DESC (certtool_opt_strs+4545) /** Upper-cased name for the generate-dh-params option */ -#define GENERATE_DH_PARAMS_NAME (certtool_opt_strs+4615) +#define GENERATE_DH_PARAMS_NAME (certtool_opt_strs+4609) /** Name string for the generate-dh-params option */ -#define GENERATE_DH_PARAMS_name (certtool_opt_strs+4634) +#define GENERATE_DH_PARAMS_name (certtool_opt_strs+4628) /** Compiled in flag settings for the generate-dh-params option */ #define GENERATE_DH_PARAMS_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED) @@ -1091,11 +1091,11 @@ static int const aVerify_EmailCantList[] = { * get-dh-params option description: */ /** Descriptive text for the get-dh-params option */ -#define GET_DH_PARAMS_DESC (certtool_opt_strs+4653) +#define GET_DH_PARAMS_DESC (certtool_opt_strs+4647) /** Upper-cased name for the get-dh-params option */ -#define GET_DH_PARAMS_NAME (certtool_opt_strs+4713) +#define GET_DH_PARAMS_NAME (certtool_opt_strs+4707) /** Name string for the get-dh-params option */ -#define GET_DH_PARAMS_name (certtool_opt_strs+4727) +#define GET_DH_PARAMS_name (certtool_opt_strs+4721) /** Compiled in flag settings for the get-dh-params option */ #define GET_DH_PARAMS_FLAGS (OPTST_DISABLED) @@ -1103,11 +1103,11 @@ static int const aVerify_EmailCantList[] = { * dh-info option description: */ /** Descriptive text for the dh-info option */ -#define DH_INFO_DESC (certtool_opt_strs+4741) +#define DH_INFO_DESC (certtool_opt_strs+4735) /** Upper-cased name for the dh-info option */ -#define DH_INFO_NAME (certtool_opt_strs+4801) +#define DH_INFO_NAME (certtool_opt_strs+4795) /** Name string for the dh-info option */ -#define DH_INFO_name (certtool_opt_strs+4809) +#define DH_INFO_name (certtool_opt_strs+4803) /** Compiled in flag settings for the dh-info option */ #define DH_INFO_FLAGS (OPTST_DISABLED) @@ -1115,11 +1115,11 @@ static int const aVerify_EmailCantList[] = { * load-privkey option description: */ /** Descriptive text for the load-privkey option */ -#define LOAD_PRIVKEY_DESC (certtool_opt_strs+4817) +#define LOAD_PRIVKEY_DESC (certtool_opt_strs+4811) /** Upper-cased name for the load-privkey option */ -#define LOAD_PRIVKEY_NAME (certtool_opt_strs+4842) +#define LOAD_PRIVKEY_NAME (certtool_opt_strs+4836) /** Name string for the load-privkey option */ -#define LOAD_PRIVKEY_name (certtool_opt_strs+4855) +#define LOAD_PRIVKEY_name (certtool_opt_strs+4849) /** Compiled in flag settings for the load-privkey option */ #define LOAD_PRIVKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1128,11 +1128,11 @@ static int const aVerify_EmailCantList[] = { * load-pubkey option description: */ /** Descriptive text for the load-pubkey option */ -#define LOAD_PUBKEY_DESC (certtool_opt_strs+4868) +#define LOAD_PUBKEY_DESC (certtool_opt_strs+4862) /** Upper-cased name for the load-pubkey option */ -#define LOAD_PUBKEY_NAME (certtool_opt_strs+4892) +#define LOAD_PUBKEY_NAME (certtool_opt_strs+4886) /** Name string for the load-pubkey option */ -#define LOAD_PUBKEY_name (certtool_opt_strs+4904) +#define LOAD_PUBKEY_name (certtool_opt_strs+4898) /** Compiled in flag settings for the load-pubkey option */ #define LOAD_PUBKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1141,11 +1141,11 @@ static int const aVerify_EmailCantList[] = { * load-request option description: */ /** Descriptive text for the load-request option */ -#define LOAD_REQUEST_DESC (certtool_opt_strs+4916) +#define LOAD_REQUEST_DESC (certtool_opt_strs+4910) /** Upper-cased name for the load-request option */ -#define LOAD_REQUEST_NAME (certtool_opt_strs+4949) +#define LOAD_REQUEST_NAME (certtool_opt_strs+4943) /** Name string for the load-request option */ -#define LOAD_REQUEST_name (certtool_opt_strs+4962) +#define LOAD_REQUEST_name (certtool_opt_strs+4956) /** Compiled in flag settings for the load-request option */ #define LOAD_REQUEST_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1154,11 +1154,11 @@ static int const aVerify_EmailCantList[] = { * load-certificate option description: */ /** Descriptive text for the load-certificate option */ -#define LOAD_CERTIFICATE_DESC (certtool_opt_strs+4975) +#define LOAD_CERTIFICATE_DESC (certtool_opt_strs+4969) /** Upper-cased name for the load-certificate option */ -#define LOAD_CERTIFICATE_NAME (certtool_opt_strs+5000) +#define LOAD_CERTIFICATE_NAME (certtool_opt_strs+4994) /** Name string for the load-certificate option */ -#define LOAD_CERTIFICATE_name (certtool_opt_strs+5017) +#define LOAD_CERTIFICATE_name (certtool_opt_strs+5011) /** Compiled in flag settings for the load-certificate option */ #define LOAD_CERTIFICATE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1167,11 +1167,11 @@ static int const aVerify_EmailCantList[] = { * load-ca-privkey option description: */ /** Descriptive text for the load-ca-privkey option */ -#define LOAD_CA_PRIVKEY_DESC (certtool_opt_strs+5034) +#define LOAD_CA_PRIVKEY_DESC (certtool_opt_strs+5028) /** Upper-cased name for the load-ca-privkey option */ -#define LOAD_CA_PRIVKEY_NAME (certtool_opt_strs+5085) +#define LOAD_CA_PRIVKEY_NAME (certtool_opt_strs+5079) /** Name string for the load-ca-privkey option */ -#define LOAD_CA_PRIVKEY_name (certtool_opt_strs+5101) +#define LOAD_CA_PRIVKEY_name (certtool_opt_strs+5095) /** Compiled in flag settings for the load-ca-privkey option */ #define LOAD_CA_PRIVKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1180,11 +1180,11 @@ static int const aVerify_EmailCantList[] = { * load-ca-certificate option description: */ /** Descriptive text for the load-ca-certificate option */ -#define LOAD_CA_CERTIFICATE_DESC (certtool_opt_strs+5117) +#define LOAD_CA_CERTIFICATE_DESC (certtool_opt_strs+5111) /** Upper-cased name for the load-ca-certificate option */ -#define LOAD_CA_CERTIFICATE_NAME (certtool_opt_strs+5168) +#define LOAD_CA_CERTIFICATE_NAME (certtool_opt_strs+5162) /** Name string for the load-ca-certificate option */ -#define LOAD_CA_CERTIFICATE_name (certtool_opt_strs+5188) +#define LOAD_CA_CERTIFICATE_name (certtool_opt_strs+5182) /** Compiled in flag settings for the load-ca-certificate option */ #define LOAD_CA_CERTIFICATE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1193,11 +1193,11 @@ static int const aVerify_EmailCantList[] = { * load-crl option description: */ /** Descriptive text for the load-crl option */ -#define LOAD_CRL_DESC (certtool_opt_strs+5208) +#define LOAD_CRL_DESC (certtool_opt_strs+5202) /** Upper-cased name for the load-crl option */ -#define LOAD_CRL_NAME (certtool_opt_strs+5231) +#define LOAD_CRL_NAME (certtool_opt_strs+5225) /** Name string for the load-crl option */ -#define LOAD_CRL_name (certtool_opt_strs+5240) +#define LOAD_CRL_name (certtool_opt_strs+5234) /** Compiled in flag settings for the load-crl option */ #define LOAD_CRL_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1206,11 +1206,11 @@ static int const aVerify_EmailCantList[] = { * load-data option description: */ /** Descriptive text for the load-data option */ -#define LOAD_DATA_DESC (certtool_opt_strs+5249) +#define LOAD_DATA_DESC (certtool_opt_strs+5243) /** Upper-cased name for the load-data option */ -#define LOAD_DATA_NAME (certtool_opt_strs+5270) +#define LOAD_DATA_NAME (certtool_opt_strs+5264) /** Name string for the load-data option */ -#define LOAD_DATA_name (certtool_opt_strs+5280) +#define LOAD_DATA_name (certtool_opt_strs+5274) /** Compiled in flag settings for the load-data option */ #define LOAD_DATA_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1219,11 +1219,11 @@ static int const aVerify_EmailCantList[] = { * password option description: */ /** Descriptive text for the password option */ -#define PASSWORD_DESC (certtool_opt_strs+5290) +#define PASSWORD_DESC (certtool_opt_strs+5284) /** Upper-cased name for the password option */ -#define PASSWORD_NAME (certtool_opt_strs+5306) +#define PASSWORD_NAME (certtool_opt_strs+5300) /** Name string for the password option */ -#define PASSWORD_name (certtool_opt_strs+5315) +#define PASSWORD_name (certtool_opt_strs+5309) /** Compiled in flag settings for the password option */ #define PASSWORD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1232,11 +1232,11 @@ static int const aVerify_EmailCantList[] = { * null-password option description: */ /** Descriptive text for the null-password option */ -#define NULL_PASSWORD_DESC (certtool_opt_strs+5324) +#define NULL_PASSWORD_DESC (certtool_opt_strs+5318) /** Upper-cased name for the null-password option */ -#define NULL_PASSWORD_NAME (certtool_opt_strs+5348) +#define NULL_PASSWORD_NAME (certtool_opt_strs+5342) /** Name string for the null-password option */ -#define NULL_PASSWORD_name (certtool_opt_strs+5362) +#define NULL_PASSWORD_name (certtool_opt_strs+5356) /** Compiled in flag settings for the null-password option */ #define NULL_PASSWORD_FLAGS (OPTST_DISABLED) @@ -1244,11 +1244,11 @@ static int const aVerify_EmailCantList[] = { * empty-password option description: */ /** Descriptive text for the empty-password option */ -#define EMPTY_PASSWORD_DESC (certtool_opt_strs+5376) +#define EMPTY_PASSWORD_DESC (certtool_opt_strs+5370) /** Upper-cased name for the empty-password option */ -#define EMPTY_PASSWORD_NAME (certtool_opt_strs+5402) +#define EMPTY_PASSWORD_NAME (certtool_opt_strs+5396) /** Name string for the empty-password option */ -#define EMPTY_PASSWORD_name (certtool_opt_strs+5417) +#define EMPTY_PASSWORD_name (certtool_opt_strs+5411) /** Compiled in flag settings for the empty-password option */ #define EMPTY_PASSWORD_FLAGS (OPTST_DISABLED) @@ -1256,11 +1256,11 @@ static int const aVerify_EmailCantList[] = { * hex-numbers option description: */ /** Descriptive text for the hex-numbers option */ -#define HEX_NUMBERS_DESC (certtool_opt_strs+5432) +#define HEX_NUMBERS_DESC (certtool_opt_strs+5426) /** Upper-cased name for the hex-numbers option */ -#define HEX_NUMBERS_NAME (certtool_opt_strs+5478) +#define HEX_NUMBERS_NAME (certtool_opt_strs+5472) /** Name string for the hex-numbers option */ -#define HEX_NUMBERS_name (certtool_opt_strs+5490) +#define HEX_NUMBERS_name (certtool_opt_strs+5484) /** Compiled in flag settings for the hex-numbers option */ #define HEX_NUMBERS_FLAGS (OPTST_DISABLED) @@ -1268,11 +1268,11 @@ static int const aVerify_EmailCantList[] = { * cprint option description: */ /** Descriptive text for the cprint option */ -#define CPRINT_DESC (certtool_opt_strs+5502) +#define CPRINT_DESC (certtool_opt_strs+5496) /** Upper-cased name for the cprint option */ -#define CPRINT_NAME (certtool_opt_strs+5571) +#define CPRINT_NAME (certtool_opt_strs+5565) /** Name string for the cprint option */ -#define CPRINT_name (certtool_opt_strs+5578) +#define CPRINT_name (certtool_opt_strs+5572) /** Compiled in flag settings for the cprint option */ #define CPRINT_FLAGS (OPTST_DISABLED) @@ -1280,11 +1280,11 @@ static int const aVerify_EmailCantList[] = { * rsa option description: */ /** Descriptive text for the rsa option */ -#define RSA_DESC (certtool_opt_strs+5585) +#define RSA_DESC (certtool_opt_strs+5579) /** Upper-cased name for the rsa option */ -#define RSA_NAME (certtool_opt_strs+5615) +#define RSA_NAME (certtool_opt_strs+5609) /** Name string for the rsa option */ -#define RSA_name (certtool_opt_strs+5619) +#define RSA_name (certtool_opt_strs+5613) /** Compiled in flag settings for the rsa option */ #define RSA_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED) @@ -1292,11 +1292,11 @@ static int const aVerify_EmailCantList[] = { * dsa option description: */ /** Descriptive text for the dsa option */ -#define DSA_DESC (certtool_opt_strs+5623) +#define DSA_DESC (certtool_opt_strs+5617) /** Upper-cased name for the dsa option */ -#define DSA_NAME (certtool_opt_strs+5653) +#define DSA_NAME (certtool_opt_strs+5647) /** Name string for the dsa option */ -#define DSA_name (certtool_opt_strs+5657) +#define DSA_name (certtool_opt_strs+5651) /** Compiled in flag settings for the dsa option */ #define DSA_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED) @@ -1304,11 +1304,11 @@ static int const aVerify_EmailCantList[] = { * ecc option description: */ /** Descriptive text for the ecc option */ -#define ECC_DESC (certtool_opt_strs+5661) +#define ECC_DESC (certtool_opt_strs+5655) /** Upper-cased name for the ecc option */ -#define ECC_NAME (certtool_opt_strs+5699) +#define ECC_NAME (certtool_opt_strs+5693) /** Name string for the ecc option */ -#define ECC_name (certtool_opt_strs+5703) +#define ECC_name (certtool_opt_strs+5697) /** Compiled in flag settings for the ecc option */ #define ECC_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED) @@ -1316,10 +1316,10 @@ static int const aVerify_EmailCantList[] = { * ecdsa option description: */ /** Descriptive text for the ecdsa option */ -#define ECDSA_DESC (certtool_opt_strs+5707) +#define ECDSA_DESC (certtool_opt_strs+5701) #define ECDSA_NAME NULL /** Unmodified name string for the ecdsa option */ -#define ECDSA_name (certtool_opt_strs+5750) +#define ECDSA_name (certtool_opt_strs+5744) /** Compiled in flag settings for the ecdsa option */ #define ECDSA_FLAGS (ECC_FLAGS | OPTST_ALIAS | OPTST_DEPRECATED) @@ -1327,11 +1327,11 @@ static int const aVerify_EmailCantList[] = { * hash option description: */ /** Descriptive text for the hash option */ -#define HASH_DESC (certtool_opt_strs+5756) +#define HASH_DESC (certtool_opt_strs+5750) /** Upper-cased name for the hash option */ -#define HASH_NAME (certtool_opt_strs+5790) +#define HASH_NAME (certtool_opt_strs+5784) /** Name string for the hash option */ -#define HASH_name (certtool_opt_strs+5795) +#define HASH_name (certtool_opt_strs+5789) /** Compiled in flag settings for the hash option */ #define HASH_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1340,11 +1340,11 @@ static int const aVerify_EmailCantList[] = { * salt-size option description: */ /** Descriptive text for the salt-size option */ -#define SALT_SIZE_DESC (certtool_opt_strs+5800) +#define SALT_SIZE_DESC (certtool_opt_strs+5794) /** Upper-cased name for the salt-size option */ -#define SALT_SIZE_NAME (certtool_opt_strs+5842) +#define SALT_SIZE_NAME (certtool_opt_strs+5836) /** Name string for the salt-size option */ -#define SALT_SIZE_name (certtool_opt_strs+5852) +#define SALT_SIZE_name (certtool_opt_strs+5846) /** Compiled in flag settings for the salt-size option */ #define SALT_SIZE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -1353,13 +1353,13 @@ static int const aVerify_EmailCantList[] = { * inder option description: */ /** Descriptive text for the inder option */ -#define INDER_DESC (certtool_opt_strs+5862) +#define INDER_DESC (certtool_opt_strs+5856) /** Upper-cased name for the inder option */ -#define INDER_NAME (certtool_opt_strs+5933) +#define INDER_NAME (certtool_opt_strs+5927) /** disablement name for the inder option */ -#define NOT_INDER_name (certtool_opt_strs+5939) +#define NOT_INDER_name (certtool_opt_strs+5933) /** disablement prefix for the inder option */ -#define NOT_INDER_PFX (certtool_opt_strs+4207) +#define NOT_INDER_PFX (certtool_opt_strs+4201) /** Name string for the inder option */ #define INDER_name (NOT_INDER_name + 3) /** Compiled in flag settings for the inder option */ @@ -1369,10 +1369,10 @@ static int const aVerify_EmailCantList[] = { * inraw option description: */ /** Descriptive text for the inraw option */ -#define INRAW_DESC (certtool_opt_strs+5948) +#define INRAW_DESC (certtool_opt_strs+5942) #define INRAW_NAME NULL /** Unmodified name string for the inraw option */ -#define INRAW_name (certtool_opt_strs+5980) +#define INRAW_name (certtool_opt_strs+5974) /** Compiled in flag settings for the inraw option */ #define INRAW_FLAGS (INDER_FLAGS | OPTST_ALIAS) @@ -1380,13 +1380,13 @@ static int const aVerify_EmailCantList[] = { * outder option description: */ /** Descriptive text for the outder option */ -#define OUTDER_DESC (certtool_opt_strs+5986) +#define OUTDER_DESC (certtool_opt_strs+5980) /** Upper-cased name for the outder option */ -#define OUTDER_NAME (certtool_opt_strs+6058) +#define OUTDER_NAME (certtool_opt_strs+6052) /** disablement name for the outder option */ -#define NOT_OUTDER_name (certtool_opt_strs+6065) +#define NOT_OUTDER_name (certtool_opt_strs+6059) /** disablement prefix for the outder option */ -#define NOT_OUTDER_PFX (certtool_opt_strs+4207) +#define NOT_OUTDER_PFX (certtool_opt_strs+4201) /** Name string for the outder option */ #define OUTDER_name (NOT_OUTDER_name + 3) /** Compiled in flag settings for the outder option */ @@ -1396,10 +1396,10 @@ static int const aVerify_EmailCantList[] = { * outraw option description: */ /** Descriptive text for the outraw option */ -#define OUTRAW_DESC (certtool_opt_strs+6075) +#define OUTRAW_DESC (certtool_opt_strs+6069) #define OUTRAW_NAME NULL /** Unmodified name string for the outraw option */ -#define OUTRAW_name (certtool_opt_strs+6108) +#define OUTRAW_name (certtool_opt_strs+6102) /** Compiled in flag settings for the outraw option */ #define OUTRAW_FLAGS (OUTDER_FLAGS | OPTST_ALIAS) @@ -1407,11 +1407,11 @@ static int const aVerify_EmailCantList[] = { * disable-quick-random option description: */ /** Descriptive text for the disable-quick-random option */ -#define DISABLE_QUICK_RANDOM_DESC (certtool_opt_strs+6115) +#define DISABLE_QUICK_RANDOM_DESC (certtool_opt_strs+6109) /** Upper-cased name for the disable-quick-random option */ -#define DISABLE_QUICK_RANDOM_NAME (certtool_opt_strs+6138) +#define DISABLE_QUICK_RANDOM_NAME (certtool_opt_strs+6132) /** Name string for the disable-quick-random option */ -#define DISABLE_QUICK_RANDOM_name (certtool_opt_strs+6159) +#define DISABLE_QUICK_RANDOM_name (certtool_opt_strs+6153) /** Compiled in flag settings for the disable-quick-random option */ #define DISABLE_QUICK_RANDOM_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED) @@ -1419,11 +1419,11 @@ static int const aVerify_EmailCantList[] = { * template option description: */ /** Descriptive text for the template option */ -#define TEMPLATE_DESC (certtool_opt_strs+6180) +#define TEMPLATE_DESC (certtool_opt_strs+6174) /** Upper-cased name for the template option */ -#define TEMPLATE_NAME (certtool_opt_strs+6231) +#define TEMPLATE_NAME (certtool_opt_strs+6225) /** Name string for the template option */ -#define TEMPLATE_name (certtool_opt_strs+6240) +#define TEMPLATE_name (certtool_opt_strs+6234) /** Compiled in flag settings for the template option */ #define TEMPLATE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1432,11 +1432,11 @@ static int const aVerify_EmailCantList[] = { * stdout-info option description: */ /** Descriptive text for the stdout-info option */ -#define STDOUT_INFO_DESC (certtool_opt_strs+6249) +#define STDOUT_INFO_DESC (certtool_opt_strs+6243) /** Upper-cased name for the stdout-info option */ -#define STDOUT_INFO_NAME (certtool_opt_strs+6295) +#define STDOUT_INFO_NAME (certtool_opt_strs+6289) /** Name string for the stdout-info option */ -#define STDOUT_INFO_name (certtool_opt_strs+6307) +#define STDOUT_INFO_name (certtool_opt_strs+6301) /** Compiled in flag settings for the stdout-info option */ #define STDOUT_INFO_FLAGS (OPTST_DISABLED) @@ -1444,11 +1444,11 @@ static int const aVerify_EmailCantList[] = { * ask-pass option description: */ /** Descriptive text for the ask-pass option */ -#define ASK_PASS_DESC (certtool_opt_strs+6319) +#define ASK_PASS_DESC (certtool_opt_strs+6313) /** Upper-cased name for the ask-pass option */ -#define ASK_PASS_NAME (certtool_opt_strs+6380) +#define ASK_PASS_NAME (certtool_opt_strs+6374) /** Name string for the ask-pass option */ -#define ASK_PASS_name (certtool_opt_strs+6389) +#define ASK_PASS_name (certtool_opt_strs+6383) /** Compiled in flag settings for the ask-pass option */ #define ASK_PASS_FLAGS (OPTST_DISABLED) @@ -1456,11 +1456,11 @@ static int const aVerify_EmailCantList[] = { * pkcs-cipher option description: */ /** Descriptive text for the pkcs-cipher option */ -#define PKCS_CIPHER_DESC (certtool_opt_strs+6398) +#define PKCS_CIPHER_DESC (certtool_opt_strs+6392) /** Upper-cased name for the pkcs-cipher option */ -#define PKCS_CIPHER_NAME (certtool_opt_strs+6443) +#define PKCS_CIPHER_NAME (certtool_opt_strs+6437) /** Name string for the pkcs-cipher option */ -#define PKCS_CIPHER_name (certtool_opt_strs+6455) +#define PKCS_CIPHER_name (certtool_opt_strs+6449) /** Compiled in flag settings for the pkcs-cipher option */ #define PKCS_CIPHER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1469,11 +1469,11 @@ static int const aVerify_EmailCantList[] = { * provider option description: */ /** Descriptive text for the provider option */ -#define PROVIDER_DESC (certtool_opt_strs+6467) +#define PROVIDER_DESC (certtool_opt_strs+6461) /** Upper-cased name for the provider option */ -#define PROVIDER_NAME (certtool_opt_strs+6505) +#define PROVIDER_NAME (certtool_opt_strs+6499) /** Name string for the provider option */ -#define PROVIDER_name (certtool_opt_strs+6514) +#define PROVIDER_name (certtool_opt_strs+6508) /** Compiled in flag settings for the provider option */ #define PROVIDER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1481,11 +1481,11 @@ static int const aVerify_EmailCantList[] = { /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (certtool_opt_strs+6523) -#define HELP_name (certtool_opt_strs+6567) +#define HELP_DESC (certtool_opt_strs+6517) +#define HELP_name (certtool_opt_strs+6561) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (certtool_opt_strs+6572) -#define MORE_HELP_name (certtool_opt_strs+6617) +#define MORE_HELP_DESC (certtool_opt_strs+6566) +#define MORE_HELP_name (certtool_opt_strs+6611) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -1498,8 +1498,8 @@ static int const aVerify_EmailCantList[] = { # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (certtool_opt_strs+6627) -#define VER_name (certtool_opt_strs+6663) +#define VER_DESC (certtool_opt_strs+6621) +#define VER_name (certtool_opt_strs+6657) /** * Declare option callback procedures */ @@ -2666,21 +2666,21 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of certtool. */ -#define zPROGNAME (certtool_opt_strs+6671) +#define zPROGNAME (certtool_opt_strs+6665) /** Reference to the title line for certtool usage. */ -#define zUsageTitle (certtool_opt_strs+6680) +#define zUsageTitle (certtool_opt_strs+6674) /** There is no certtool configuration file. */ #define zRcName NULL /** There are no directories to search for certtool config files. */ #define apzHomeList NULL /** The certtool program bug email address. */ -#define zBugsAddr (certtool_opt_strs+6773) +#define zBugsAddr (certtool_opt_strs+6767) /** Clarification/explanation of what certtool does. */ -#define zExplain (certtool_opt_strs+6793) +#define zExplain (certtool_opt_strs+6783) /** Extra detail explaining what certtool does. */ -#define zDetail (certtool_opt_strs+6795) +#define zDetail (certtool_opt_strs+6785) /** The full version string for certtool. */ -#define zFullVersion (certtool_opt_strs+7156) +#define zFullVersion (certtool_opt_strs+7146) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -2692,7 +2692,7 @@ static tOptDesc optDesc[OPTION_CT] = { #endif /* ENABLE_NLS */ #define certtool_full_usage (NULL) -#define certtool_short_usage (certtool_opt_strs+7175) +#define certtool_short_usage (certtool_opt_strs+7161) #endif /* not defined __doxygen__ */ @@ -3024,8 +3024,8 @@ static void bogus_function(void) { translate option names. */ /* referenced via certtoolOptions.pzCopyright */ - puts(_("certtool @VERSION@\n\ -Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n\ + puts(_("certtool 3.6.4\n\ +Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the GNU General Public License,\n\ version 3 or later <http://gnu.org/licenses/gpl.html>\n")); @@ -3343,7 +3343,7 @@ PIN is required for URI access you can provide it using the environment\n\ variables GNUTLS_PIN and GNUTLS_SO_PIN.\n")); /* referenced via certtoolOptions.pzFullVersion */ - puts(_("certtool @VERSION@")); + puts(_("certtool 3.6.4")); /* referenced via certtoolOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/src/certtool-args.h.bak b/src/certtool-args.h.bak index 8413808d55..d84edec4f5 100644 --- a/src/certtool-args.h.bak +++ b/src/certtool-args.h.bak @@ -19,7 +19,7 @@ * The certtool program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -157,9 +157,9 @@ typedef enum { /** count of all options for certtool */ #define OPTION_CT 95 /** certtool version */ -#define CERTTOOL_VERSION "@VERSION@" +#define CERTTOOL_VERSION "3.6.4" /** Full certtool version text */ -#define CERTTOOL_FULL_VERSION "certtool @VERSION@" +#define CERTTOOL_FULL_VERSION "certtool 3.6.4" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/src/cli-args.c.bak b/src/cli-args.c.bak index d893f3ef41..3e40c4f9b3 100644 --- a/src/cli-args.c.bak +++ b/src/cli-args.c.bak @@ -19,7 +19,7 @@ * The gnutls-cli program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -53,7 +53,7 @@ extern "C" { #endif extern FILE * option_usage_fp; #define zCopyright (gnutls_cli_opt_strs+0) -#define zLicenseDescrip (gnutls_cli_opt_strs+291) +#define zLicenseDescrip (gnutls_cli_opt_strs+285) #ifndef NULL @@ -63,13 +63,13 @@ extern FILE * option_usage_fp; /** * static const strings for gnutls-cli options */ -static char const gnutls_cli_opt_strs[5116] = -/* 0 */ "gnutls-cli @VERSION@\n" - "Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n" +static char const gnutls_cli_opt_strs[5102] = +/* 0 */ "gnutls-cli 3.6.4\n" + "Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the GNU General Public License,\n" "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0" -/* 291 */ "gnutls-cli is free software: you can redistribute it and/or modify it under\n" +/* 285 */ "gnutls-cli is free software: you can redistribute it and/or modify it under\n" "the terms of the GNU General Public License as published by the Free\n" "Software Foundation, either version 3 of the License, or (at your option)\n" "any later version.\n\n" @@ -79,206 +79,206 @@ static char const gnutls_cli_opt_strs[5116] = "more details.\n\n" "You should have received a copy of the GNU General Public License along\n" "with this program. If not, see <http://www.gnu.org/licenses/>.\n\0" -/* 900 */ "Enable debugging\0" -/* 917 */ "DEBUG\0" -/* 923 */ "debug\0" -/* 929 */ "More verbose output\0" -/* 949 */ "VERBOSE\0" -/* 957 */ "verbose\0" -/* 965 */ "Enable trust on first use authentication\0" -/* 1006 */ "TOFU\0" -/* 1011 */ "no-tofu\0" -/* 1019 */ "no\0" -/* 1022 */ "Fail to connect if a certificate is unknown or a known certificate has\n" +/* 894 */ "Enable debugging\0" +/* 911 */ "DEBUG\0" +/* 917 */ "debug\0" +/* 923 */ "More verbose output\0" +/* 943 */ "VERBOSE\0" +/* 951 */ "verbose\0" +/* 959 */ "Enable trust on first use authentication\0" +/* 1000 */ "TOFU\0" +/* 1005 */ "no-tofu\0" +/* 1013 */ "no\0" +/* 1016 */ "Fail to connect if a certificate is unknown or a known certificate has\n" "changed\0" -/* 1101 */ "STRICT_TOFU\0" -/* 1113 */ "no-strict-tofu\0" -/* 1128 */ "Enable DANE certificate verification (DNSSEC)\0" -/* 1174 */ "DANE\0" -/* 1179 */ "no-dane\0" -/* 1187 */ "Use the local DNS server for DNSSEC resolving\0" -/* 1233 */ "LOCAL_DNS\0" -/* 1243 */ "no-local-dns\0" -/* 1256 */ "Enable CA certificate verification\0" -/* 1291 */ "CA_VERIFICATION\0" -/* 1307 */ "no-ca-verification\0" -/* 1326 */ "Enable OCSP certificate verification\0" -/* 1363 */ "OCSP\0" -/* 1368 */ "no-ocsp\0" -/* 1376 */ "Establish a session and resume\0" -/* 1407 */ "RESUME\0" -/* 1414 */ "resume\0" -/* 1421 */ "Establish a session and rehandshake\0" -/* 1457 */ "REHANDSHAKE\0" -/* 1469 */ "rehandshake\0" -/* 1481 */ "Server's hostname for server name indication extension\0" -/* 1536 */ "SNI_HOSTNAME\0" -/* 1549 */ "sni-hostname\0" -/* 1562 */ "Server's hostname to use for validation\0" -/* 1602 */ "VERIFY_HOSTNAME\0" -/* 1618 */ "verify-hostname\0" -/* 1634 */ "Connect, establish a plain session and start TLS\0" -/* 1683 */ "STARTTLS\0" -/* 1692 */ "starttls\0" -/* 1701 */ "an alias for the 'starttls-proto' option\0" -/* 1742 */ "app-proto\0" -/* 1752 */ "The application protocol to be used to obtain the server's certificate\n" +/* 1095 */ "STRICT_TOFU\0" +/* 1107 */ "no-strict-tofu\0" +/* 1122 */ "Enable DANE certificate verification (DNSSEC)\0" +/* 1168 */ "DANE\0" +/* 1173 */ "no-dane\0" +/* 1181 */ "Use the local DNS server for DNSSEC resolving\0" +/* 1227 */ "LOCAL_DNS\0" +/* 1237 */ "no-local-dns\0" +/* 1250 */ "Enable CA certificate verification\0" +/* 1285 */ "CA_VERIFICATION\0" +/* 1301 */ "no-ca-verification\0" +/* 1320 */ "Enable OCSP certificate verification\0" +/* 1357 */ "OCSP\0" +/* 1362 */ "no-ocsp\0" +/* 1370 */ "Establish a session and resume\0" +/* 1401 */ "RESUME\0" +/* 1408 */ "resume\0" +/* 1415 */ "Establish a session and rehandshake\0" +/* 1451 */ "REHANDSHAKE\0" +/* 1463 */ "rehandshake\0" +/* 1475 */ "Server's hostname for server name indication extension\0" +/* 1530 */ "SNI_HOSTNAME\0" +/* 1543 */ "sni-hostname\0" +/* 1556 */ "Server's hostname to use for validation\0" +/* 1596 */ "VERIFY_HOSTNAME\0" +/* 1612 */ "verify-hostname\0" +/* 1628 */ "Connect, establish a plain session and start TLS\0" +/* 1677 */ "STARTTLS\0" +/* 1686 */ "starttls\0" +/* 1695 */ "an alias for the 'starttls-proto' option\0" +/* 1736 */ "app-proto\0" +/* 1746 */ "The application protocol to be used to obtain the server's certificate\n" "(https, ftp, smtp, imap, ldap, xmpp, lmtp, pop3, nntp, sieve, postgres)\0" -/* 1895 */ "STARTTLS_PROTO\0" -/* 1910 */ "starttls-proto\0" -/* 1925 */ "Use DTLS (datagram TLS) over UDP\0" -/* 1958 */ "UDP\0" -/* 1962 */ "udp\0" -/* 1966 */ "Set MTU for datagram TLS\0" -/* 1991 */ "MTU\0" -/* 1995 */ "mtu\0" -/* 1999 */ "Send CR LF instead of LF\0" -/* 2024 */ "CRLF\0" -/* 2029 */ "crlf\0" -/* 2034 */ "Enable TCP Fast Open\0" -/* 2055 */ "FASTOPEN\0" -/* 2064 */ "fastopen\0" -/* 2073 */ "Use DER format for certificates to read from\0" -/* 2118 */ "X509FMTDER\0" -/* 2129 */ "x509fmtder\0" -/* 2140 */ "Print peer's certificate in PEM format\0" -/* 2179 */ "PRINT_CERT\0" -/* 2190 */ "print-cert\0" -/* 2201 */ "Save the peer's certificate chain in the specified file in PEM format\0" -/* 2271 */ "SAVE_CERT\0" -/* 2281 */ "save-cert\0" -/* 2291 */ "Save the peer's OCSP status response in the provided file\0" -/* 2349 */ "SAVE_OCSP\0" -/* 2359 */ "save-ocsp\0" -/* 2369 */ "Save the server-side TLS message trace in the provided file\0" -/* 2429 */ "SAVE_SERVER_TRACE\0" -/* 2447 */ "save-server-trace\0" -/* 2465 */ "Save the client-side TLS message trace in the provided file\0" -/* 2525 */ "SAVE_CLIENT_TRACE\0" -/* 2543 */ "save-client-trace\0" -/* 2561 */ "The minimum number of bits allowed for DH\0" -/* 2603 */ "DH_BITS\0" -/* 2611 */ "dh-bits\0" -/* 2619 */ "Priorities string\0" -/* 2637 */ "PRIORITY\0" -/* 2646 */ "priority\0" -/* 2655 */ "Certificate file or PKCS #11 URL to use\0" -/* 2695 */ "X509CAFILE\0" -/* 2706 */ "x509cafile\0" -/* 2717 */ "CRL file to use\0" -/* 2733 */ "X509CRLFILE\0" -/* 2745 */ "x509crlfile\0" -/* 2757 */ "X.509 key file or PKCS #11 URL to use\0" -/* 2795 */ "X509KEYFILE\0" -/* 2807 */ "x509keyfile\0" -/* 2819 */ "X.509 Certificate file or PKCS #11 URL to use\0" -/* 2865 */ "X509CERTFILE\0" -/* 2878 */ "x509certfile\0" -/* 2891 */ "SRP username to use\0" -/* 2911 */ "SRPUSERNAME\0" -/* 2923 */ "srpusername\0" -/* 2935 */ "SRP password to use\0" -/* 2955 */ "SRPPASSWD\0" -/* 2965 */ "srppasswd\0" -/* 2975 */ "PSK username to use\0" -/* 2995 */ "PSKUSERNAME\0" -/* 3007 */ "pskusername\0" -/* 3019 */ "PSK key (in hex) to use\0" -/* 3043 */ "PSKKEY\0" -/* 3050 */ "pskkey\0" -/* 3057 */ "The port or service to connect to\0" -/* 3091 */ "PORT\0" -/* 3096 */ "port\0" -/* 3101 */ "Don't abort program if server certificate can't be validated\0" -/* 3162 */ "INSECURE\0" -/* 3171 */ "insecure\0" -/* 3180 */ "Allow broken algorithms, such as MD5 for certificate verification\0" -/* 3246 */ "VERIFY_ALLOW_BROKEN\0" -/* 3266 */ "verify-allow-broken\0" -/* 3286 */ "Use length-hiding padding to prevent traffic analysis (deprecated)\0" -/* 3353 */ "RANGES\0" -/* 3360 */ "ranges\0" -/* 3367 */ "Benchmark individual ciphers\0" -/* 3396 */ "BENCHMARK_CIPHERS\0" -/* 3414 */ "benchmark-ciphers\0" -/* 3432 */ "Benchmark TLS key exchange methods\0" -/* 3467 */ "BENCHMARK_TLS_KX\0" -/* 3484 */ "benchmark-tls-kx\0" -/* 3501 */ "Benchmark TLS ciphers\0" -/* 3523 */ "BENCHMARK_TLS_CIPHERS\0" -/* 3545 */ "benchmark-tls-ciphers\0" -/* 3567 */ "Print a list of the supported algorithms and modes\0" -/* 3618 */ "LIST\0" -/* 3623 */ "list\0" -/* 3628 */ "Print a list of the supported priority strings\0" -/* 3675 */ "PRIORITY_LIST\0" -/* 3689 */ "priority-list\0" -/* 3703 */ "Don't allow session tickets\0" -/* 3731 */ "NOTICKET\0" -/* 3740 */ "noticket\0" -/* 3749 */ "Offer SRTP profiles\0" -/* 3769 */ "SRTP_PROFILES\0" -/* 3783 */ "srtp-profiles\0" -/* 3797 */ "Application layer protocol\0" -/* 3824 */ "ALPN\0" -/* 3829 */ "alpn\0" -/* 3834 */ "Activate heartbeat support\0" -/* 3861 */ "HEARTBEAT\0" -/* 3871 */ "heartbeat\0" -/* 3881 */ "The maximum record size to advertize\0" -/* 3918 */ "RECORDSIZE\0" -/* 3929 */ "recordsize\0" -/* 3940 */ "Do not send a Server Name Indication (SNI)\0" -/* 3983 */ "DISABLE_SNI\0" -/* 3995 */ "disable-sni\0" -/* 4007 */ "Disable all the TLS extensions (deprecated)\0" -/* 4051 */ "DISABLE_EXTENSIONS\0" -/* 4070 */ "disable-extensions\0" -/* 4089 */ "Send a single key share under TLS1.3\0" -/* 4126 */ "SINGLE_KEY_SHARE\0" -/* 4143 */ "single-key-share\0" -/* 4160 */ "Enable post-handshake authentication under TLS1.3\0" -/* 4210 */ "POST_HANDSHAKE_AUTH\0" -/* 4230 */ "post-handshake-auth\0" -/* 4250 */ "Inline commands of the form ^<cmd>^\0" -/* 4286 */ "INLINE_COMMANDS\0" -/* 4302 */ "inline-commands\0" -/* 4318 */ "Change the default delimiter for inline commands.\0" -/* 4368 */ "INLINE_COMMANDS_PREFIX\0" -/* 4391 */ "inline-commands-prefix\0" -/* 4414 */ "Specify the PKCS #11 provider library\0" -/* 4452 */ "PROVIDER\0" -/* 4461 */ "provider\0" -/* 4470 */ "Reports the status of the FIPS140-2 mode in gnutls library\0" -/* 4529 */ "FIPS140_MODE\0" -/* 4542 */ "fips140-mode\0" -/* 4555 */ "display extended usage information and exit\0" -/* 4599 */ "help\0" -/* 4604 */ "extended usage information passed thru pager\0" -/* 4649 */ "more-help\0" -/* 4659 */ "output version information and exit\0" -/* 4695 */ "version\0" -/* 4703 */ "GNUTLS_CLI\0" -/* 4714 */ "gnutls-cli - GnuTLS client\n" +/* 1889 */ "STARTTLS_PROTO\0" +/* 1904 */ "starttls-proto\0" +/* 1919 */ "Use DTLS (datagram TLS) over UDP\0" +/* 1952 */ "UDP\0" +/* 1956 */ "udp\0" +/* 1960 */ "Set MTU for datagram TLS\0" +/* 1985 */ "MTU\0" +/* 1989 */ "mtu\0" +/* 1993 */ "Send CR LF instead of LF\0" +/* 2018 */ "CRLF\0" +/* 2023 */ "crlf\0" +/* 2028 */ "Enable TCP Fast Open\0" +/* 2049 */ "FASTOPEN\0" +/* 2058 */ "fastopen\0" +/* 2067 */ "Use DER format for certificates to read from\0" +/* 2112 */ "X509FMTDER\0" +/* 2123 */ "x509fmtder\0" +/* 2134 */ "Print peer's certificate in PEM format\0" +/* 2173 */ "PRINT_CERT\0" +/* 2184 */ "print-cert\0" +/* 2195 */ "Save the peer's certificate chain in the specified file in PEM format\0" +/* 2265 */ "SAVE_CERT\0" +/* 2275 */ "save-cert\0" +/* 2285 */ "Save the peer's OCSP status response in the provided file\0" +/* 2343 */ "SAVE_OCSP\0" +/* 2353 */ "save-ocsp\0" +/* 2363 */ "Save the server-side TLS message trace in the provided file\0" +/* 2423 */ "SAVE_SERVER_TRACE\0" +/* 2441 */ "save-server-trace\0" +/* 2459 */ "Save the client-side TLS message trace in the provided file\0" +/* 2519 */ "SAVE_CLIENT_TRACE\0" +/* 2537 */ "save-client-trace\0" +/* 2555 */ "The minimum number of bits allowed for DH\0" +/* 2597 */ "DH_BITS\0" +/* 2605 */ "dh-bits\0" +/* 2613 */ "Priorities string\0" +/* 2631 */ "PRIORITY\0" +/* 2640 */ "priority\0" +/* 2649 */ "Certificate file or PKCS #11 URL to use\0" +/* 2689 */ "X509CAFILE\0" +/* 2700 */ "x509cafile\0" +/* 2711 */ "CRL file to use\0" +/* 2727 */ "X509CRLFILE\0" +/* 2739 */ "x509crlfile\0" +/* 2751 */ "X.509 key file or PKCS #11 URL to use\0" +/* 2789 */ "X509KEYFILE\0" +/* 2801 */ "x509keyfile\0" +/* 2813 */ "X.509 Certificate file or PKCS #11 URL to use\0" +/* 2859 */ "X509CERTFILE\0" +/* 2872 */ "x509certfile\0" +/* 2885 */ "SRP username to use\0" +/* 2905 */ "SRPUSERNAME\0" +/* 2917 */ "srpusername\0" +/* 2929 */ "SRP password to use\0" +/* 2949 */ "SRPPASSWD\0" +/* 2959 */ "srppasswd\0" +/* 2969 */ "PSK username to use\0" +/* 2989 */ "PSKUSERNAME\0" +/* 3001 */ "pskusername\0" +/* 3013 */ "PSK key (in hex) to use\0" +/* 3037 */ "PSKKEY\0" +/* 3044 */ "pskkey\0" +/* 3051 */ "The port or service to connect to\0" +/* 3085 */ "PORT\0" +/* 3090 */ "port\0" +/* 3095 */ "Don't abort program if server certificate can't be validated\0" +/* 3156 */ "INSECURE\0" +/* 3165 */ "insecure\0" +/* 3174 */ "Allow broken algorithms, such as MD5 for certificate verification\0" +/* 3240 */ "VERIFY_ALLOW_BROKEN\0" +/* 3260 */ "verify-allow-broken\0" +/* 3280 */ "Use length-hiding padding to prevent traffic analysis (deprecated)\0" +/* 3347 */ "RANGES\0" +/* 3354 */ "ranges\0" +/* 3361 */ "Benchmark individual ciphers\0" +/* 3390 */ "BENCHMARK_CIPHERS\0" +/* 3408 */ "benchmark-ciphers\0" +/* 3426 */ "Benchmark TLS key exchange methods\0" +/* 3461 */ "BENCHMARK_TLS_KX\0" +/* 3478 */ "benchmark-tls-kx\0" +/* 3495 */ "Benchmark TLS ciphers\0" +/* 3517 */ "BENCHMARK_TLS_CIPHERS\0" +/* 3539 */ "benchmark-tls-ciphers\0" +/* 3561 */ "Print a list of the supported algorithms and modes\0" +/* 3612 */ "LIST\0" +/* 3617 */ "list\0" +/* 3622 */ "Print a list of the supported priority strings\0" +/* 3669 */ "PRIORITY_LIST\0" +/* 3683 */ "priority-list\0" +/* 3697 */ "Don't allow session tickets\0" +/* 3725 */ "NOTICKET\0" +/* 3734 */ "noticket\0" +/* 3743 */ "Offer SRTP profiles\0" +/* 3763 */ "SRTP_PROFILES\0" +/* 3777 */ "srtp-profiles\0" +/* 3791 */ "Application layer protocol\0" +/* 3818 */ "ALPN\0" +/* 3823 */ "alpn\0" +/* 3828 */ "Activate heartbeat support\0" +/* 3855 */ "HEARTBEAT\0" +/* 3865 */ "heartbeat\0" +/* 3875 */ "The maximum record size to advertize\0" +/* 3912 */ "RECORDSIZE\0" +/* 3923 */ "recordsize\0" +/* 3934 */ "Do not send a Server Name Indication (SNI)\0" +/* 3977 */ "DISABLE_SNI\0" +/* 3989 */ "disable-sni\0" +/* 4001 */ "Disable all the TLS extensions (deprecated)\0" +/* 4045 */ "DISABLE_EXTENSIONS\0" +/* 4064 */ "disable-extensions\0" +/* 4083 */ "Send a single key share under TLS1.3\0" +/* 4120 */ "SINGLE_KEY_SHARE\0" +/* 4137 */ "single-key-share\0" +/* 4154 */ "Enable post-handshake authentication under TLS1.3\0" +/* 4204 */ "POST_HANDSHAKE_AUTH\0" +/* 4224 */ "post-handshake-auth\0" +/* 4244 */ "Inline commands of the form ^<cmd>^\0" +/* 4280 */ "INLINE_COMMANDS\0" +/* 4296 */ "inline-commands\0" +/* 4312 */ "Change the default delimiter for inline commands.\0" +/* 4362 */ "INLINE_COMMANDS_PREFIX\0" +/* 4385 */ "inline-commands-prefix\0" +/* 4408 */ "Specify the PKCS #11 provider library\0" +/* 4446 */ "PROVIDER\0" +/* 4455 */ "provider\0" +/* 4464 */ "Reports the status of the FIPS140-2 mode in gnutls library\0" +/* 4523 */ "FIPS140_MODE\0" +/* 4536 */ "fips140-mode\0" +/* 4549 */ "display extended usage information and exit\0" +/* 4593 */ "help\0" +/* 4598 */ "extended usage information passed thru pager\0" +/* 4643 */ "more-help\0" +/* 4653 */ "output version information and exit\0" +/* 4689 */ "version\0" +/* 4697 */ "GNUTLS_CLI\0" +/* 4708 */ "gnutls-cli - GnuTLS client\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [hostname]\n\0" -/* 4810 */ "@PACKAGE_BUGREPORT@\0" -/* 4830 */ "\n\0" -/* 4832 */ "Simple client program to set up a TLS connection to some other computer. It\n" +/* 4804 */ "bugs@gnutls.org\0" +/* 4820 */ "\n\0" +/* 4822 */ "Simple client program to set up a TLS connection to some other computer. It\n" "sets up a TLS connection and forwards data from the standard input to the\n" "secured socket and vice versa.\n\0" -/* 5015 */ "gnutls-cli @VERSION@\0" -/* 5036 */ "Usage: gnutls-cli [options] hostname\n" +/* 5005 */ "gnutls-cli 3.6.4\0" +/* 5022 */ "Usage: gnutls-cli [options] hostname\n" "gnutls-cli --help for usage instructions.\n"; /** * debug option description: */ /** Descriptive text for the debug option */ -#define DEBUG_DESC (gnutls_cli_opt_strs+900) +#define DEBUG_DESC (gnutls_cli_opt_strs+894) /** Upper-cased name for the debug option */ -#define DEBUG_NAME (gnutls_cli_opt_strs+917) +#define DEBUG_NAME (gnutls_cli_opt_strs+911) /** Name string for the debug option */ -#define DEBUG_name (gnutls_cli_opt_strs+923) +#define DEBUG_name (gnutls_cli_opt_strs+917) /** Compiled in flag settings for the debug option */ #define DEBUG_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -287,11 +287,11 @@ static char const gnutls_cli_opt_strs[5116] = * verbose option description: */ /** Descriptive text for the verbose option */ -#define VERBOSE_DESC (gnutls_cli_opt_strs+929) +#define VERBOSE_DESC (gnutls_cli_opt_strs+923) /** Upper-cased name for the verbose option */ -#define VERBOSE_NAME (gnutls_cli_opt_strs+949) +#define VERBOSE_NAME (gnutls_cli_opt_strs+943) /** Name string for the verbose option */ -#define VERBOSE_name (gnutls_cli_opt_strs+957) +#define VERBOSE_name (gnutls_cli_opt_strs+951) /** Compiled in flag settings for the verbose option */ #define VERBOSE_FLAGS (OPTST_DISABLED) @@ -299,13 +299,13 @@ static char const gnutls_cli_opt_strs[5116] = * tofu option description: */ /** Descriptive text for the tofu option */ -#define TOFU_DESC (gnutls_cli_opt_strs+965) +#define TOFU_DESC (gnutls_cli_opt_strs+959) /** Upper-cased name for the tofu option */ -#define TOFU_NAME (gnutls_cli_opt_strs+1006) +#define TOFU_NAME (gnutls_cli_opt_strs+1000) /** disablement name for the tofu option */ -#define NOT_TOFU_name (gnutls_cli_opt_strs+1011) +#define NOT_TOFU_name (gnutls_cli_opt_strs+1005) /** disablement prefix for the tofu option */ -#define NOT_TOFU_PFX (gnutls_cli_opt_strs+1019) +#define NOT_TOFU_PFX (gnutls_cli_opt_strs+1013) /** Name string for the tofu option */ #define TOFU_name (NOT_TOFU_name + 3) /** Compiled in flag settings for the tofu option */ @@ -315,13 +315,13 @@ static char const gnutls_cli_opt_strs[5116] = * strict-tofu option description: */ /** Descriptive text for the strict-tofu option */ -#define STRICT_TOFU_DESC (gnutls_cli_opt_strs+1022) +#define STRICT_TOFU_DESC (gnutls_cli_opt_strs+1016) /** Upper-cased name for the strict-tofu option */ -#define STRICT_TOFU_NAME (gnutls_cli_opt_strs+1101) +#define STRICT_TOFU_NAME (gnutls_cli_opt_strs+1095) /** disablement name for the strict-tofu option */ -#define NOT_STRICT_TOFU_name (gnutls_cli_opt_strs+1113) +#define NOT_STRICT_TOFU_name (gnutls_cli_opt_strs+1107) /** disablement prefix for the strict-tofu option */ -#define NOT_STRICT_TOFU_PFX (gnutls_cli_opt_strs+1019) +#define NOT_STRICT_TOFU_PFX (gnutls_cli_opt_strs+1013) /** Name string for the strict-tofu option */ #define STRICT_TOFU_name (NOT_STRICT_TOFU_name + 3) /** Compiled in flag settings for the strict-tofu option */ @@ -331,13 +331,13 @@ static char const gnutls_cli_opt_strs[5116] = * dane option description: */ /** Descriptive text for the dane option */ -#define DANE_DESC (gnutls_cli_opt_strs+1128) +#define DANE_DESC (gnutls_cli_opt_strs+1122) /** Upper-cased name for the dane option */ -#define DANE_NAME (gnutls_cli_opt_strs+1174) +#define DANE_NAME (gnutls_cli_opt_strs+1168) /** disablement name for the dane option */ -#define NOT_DANE_name (gnutls_cli_opt_strs+1179) +#define NOT_DANE_name (gnutls_cli_opt_strs+1173) /** disablement prefix for the dane option */ -#define NOT_DANE_PFX (gnutls_cli_opt_strs+1019) +#define NOT_DANE_PFX (gnutls_cli_opt_strs+1013) /** Name string for the dane option */ #define DANE_name (NOT_DANE_name + 3) /** Compiled in flag settings for the dane option */ @@ -347,13 +347,13 @@ static char const gnutls_cli_opt_strs[5116] = * local-dns option description: */ /** Descriptive text for the local-dns option */ -#define LOCAL_DNS_DESC (gnutls_cli_opt_strs+1187) +#define LOCAL_DNS_DESC (gnutls_cli_opt_strs+1181) /** Upper-cased name for the local-dns option */ -#define LOCAL_DNS_NAME (gnutls_cli_opt_strs+1233) +#define LOCAL_DNS_NAME (gnutls_cli_opt_strs+1227) /** disablement name for the local-dns option */ -#define NOT_LOCAL_DNS_name (gnutls_cli_opt_strs+1243) +#define NOT_LOCAL_DNS_name (gnutls_cli_opt_strs+1237) /** disablement prefix for the local-dns option */ -#define NOT_LOCAL_DNS_PFX (gnutls_cli_opt_strs+1019) +#define NOT_LOCAL_DNS_PFX (gnutls_cli_opt_strs+1013) /** Name string for the local-dns option */ #define LOCAL_DNS_name (NOT_LOCAL_DNS_name + 3) /** Compiled in flag settings for the local-dns option */ @@ -363,13 +363,13 @@ static char const gnutls_cli_opt_strs[5116] = * ca-verification option description: */ /** Descriptive text for the ca-verification option */ -#define CA_VERIFICATION_DESC (gnutls_cli_opt_strs+1256) +#define CA_VERIFICATION_DESC (gnutls_cli_opt_strs+1250) /** Upper-cased name for the ca-verification option */ -#define CA_VERIFICATION_NAME (gnutls_cli_opt_strs+1291) +#define CA_VERIFICATION_NAME (gnutls_cli_opt_strs+1285) /** disablement name for the ca-verification option */ -#define NOT_CA_VERIFICATION_name (gnutls_cli_opt_strs+1307) +#define NOT_CA_VERIFICATION_name (gnutls_cli_opt_strs+1301) /** disablement prefix for the ca-verification option */ -#define NOT_CA_VERIFICATION_PFX (gnutls_cli_opt_strs+1019) +#define NOT_CA_VERIFICATION_PFX (gnutls_cli_opt_strs+1013) /** Name string for the ca-verification option */ #define CA_VERIFICATION_name (NOT_CA_VERIFICATION_name + 3) /** Compiled in flag settings for the ca-verification option */ @@ -379,13 +379,13 @@ static char const gnutls_cli_opt_strs[5116] = * ocsp option description: */ /** Descriptive text for the ocsp option */ -#define OCSP_DESC (gnutls_cli_opt_strs+1326) +#define OCSP_DESC (gnutls_cli_opt_strs+1320) /** Upper-cased name for the ocsp option */ -#define OCSP_NAME (gnutls_cli_opt_strs+1363) +#define OCSP_NAME (gnutls_cli_opt_strs+1357) /** disablement name for the ocsp option */ -#define NOT_OCSP_name (gnutls_cli_opt_strs+1368) +#define NOT_OCSP_name (gnutls_cli_opt_strs+1362) /** disablement prefix for the ocsp option */ -#define NOT_OCSP_PFX (gnutls_cli_opt_strs+1019) +#define NOT_OCSP_PFX (gnutls_cli_opt_strs+1013) /** Name string for the ocsp option */ #define OCSP_name (NOT_OCSP_name + 3) /** Compiled in flag settings for the ocsp option */ @@ -395,11 +395,11 @@ static char const gnutls_cli_opt_strs[5116] = * resume option description: */ /** Descriptive text for the resume option */ -#define RESUME_DESC (gnutls_cli_opt_strs+1376) +#define RESUME_DESC (gnutls_cli_opt_strs+1370) /** Upper-cased name for the resume option */ -#define RESUME_NAME (gnutls_cli_opt_strs+1407) +#define RESUME_NAME (gnutls_cli_opt_strs+1401) /** Name string for the resume option */ -#define RESUME_name (gnutls_cli_opt_strs+1414) +#define RESUME_name (gnutls_cli_opt_strs+1408) /** Compiled in flag settings for the resume option */ #define RESUME_FLAGS (OPTST_DISABLED) @@ -407,11 +407,11 @@ static char const gnutls_cli_opt_strs[5116] = * rehandshake option description: */ /** Descriptive text for the rehandshake option */ -#define REHANDSHAKE_DESC (gnutls_cli_opt_strs+1421) +#define REHANDSHAKE_DESC (gnutls_cli_opt_strs+1415) /** Upper-cased name for the rehandshake option */ -#define REHANDSHAKE_NAME (gnutls_cli_opt_strs+1457) +#define REHANDSHAKE_NAME (gnutls_cli_opt_strs+1451) /** Name string for the rehandshake option */ -#define REHANDSHAKE_name (gnutls_cli_opt_strs+1469) +#define REHANDSHAKE_name (gnutls_cli_opt_strs+1463) /** Compiled in flag settings for the rehandshake option */ #define REHANDSHAKE_FLAGS (OPTST_DISABLED) @@ -419,11 +419,11 @@ static char const gnutls_cli_opt_strs[5116] = * sni-hostname option description: */ /** Descriptive text for the sni-hostname option */ -#define SNI_HOSTNAME_DESC (gnutls_cli_opt_strs+1481) +#define SNI_HOSTNAME_DESC (gnutls_cli_opt_strs+1475) /** Upper-cased name for the sni-hostname option */ -#define SNI_HOSTNAME_NAME (gnutls_cli_opt_strs+1536) +#define SNI_HOSTNAME_NAME (gnutls_cli_opt_strs+1530) /** Name string for the sni-hostname option */ -#define SNI_HOSTNAME_name (gnutls_cli_opt_strs+1549) +#define SNI_HOSTNAME_name (gnutls_cli_opt_strs+1543) /** Compiled in flag settings for the sni-hostname option */ #define SNI_HOSTNAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -432,11 +432,11 @@ static char const gnutls_cli_opt_strs[5116] = * verify-hostname option description: */ /** Descriptive text for the verify-hostname option */ -#define VERIFY_HOSTNAME_DESC (gnutls_cli_opt_strs+1562) +#define VERIFY_HOSTNAME_DESC (gnutls_cli_opt_strs+1556) /** Upper-cased name for the verify-hostname option */ -#define VERIFY_HOSTNAME_NAME (gnutls_cli_opt_strs+1602) +#define VERIFY_HOSTNAME_NAME (gnutls_cli_opt_strs+1596) /** Name string for the verify-hostname option */ -#define VERIFY_HOSTNAME_name (gnutls_cli_opt_strs+1618) +#define VERIFY_HOSTNAME_name (gnutls_cli_opt_strs+1612) /** Compiled in flag settings for the verify-hostname option */ #define VERIFY_HOSTNAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -445,11 +445,11 @@ static char const gnutls_cli_opt_strs[5116] = * starttls option description: */ /** Descriptive text for the starttls option */ -#define STARTTLS_DESC (gnutls_cli_opt_strs+1634) +#define STARTTLS_DESC (gnutls_cli_opt_strs+1628) /** Upper-cased name for the starttls option */ -#define STARTTLS_NAME (gnutls_cli_opt_strs+1683) +#define STARTTLS_NAME (gnutls_cli_opt_strs+1677) /** Name string for the starttls option */ -#define STARTTLS_name (gnutls_cli_opt_strs+1692) +#define STARTTLS_name (gnutls_cli_opt_strs+1686) /** Compiled in flag settings for the starttls option */ #define STARTTLS_FLAGS (OPTST_DISABLED) @@ -457,10 +457,10 @@ static char const gnutls_cli_opt_strs[5116] = * app-proto option description: */ /** Descriptive text for the app-proto option */ -#define APP_PROTO_DESC (gnutls_cli_opt_strs+1701) +#define APP_PROTO_DESC (gnutls_cli_opt_strs+1695) #define APP_PROTO_NAME NULL /** Unmodified name string for the app-proto option */ -#define APP_PROTO_name (gnutls_cli_opt_strs+1742) +#define APP_PROTO_name (gnutls_cli_opt_strs+1736) /** Compiled in flag settings for the app-proto option */ #define APP_PROTO_FLAGS (STARTTLS_PROTO_FLAGS | OPTST_ALIAS) @@ -469,11 +469,11 @@ static char const gnutls_cli_opt_strs[5116] = * "Must also have options" and "Incompatible options": */ /** Descriptive text for the starttls-proto option */ -#define STARTTLS_PROTO_DESC (gnutls_cli_opt_strs+1752) +#define STARTTLS_PROTO_DESC (gnutls_cli_opt_strs+1746) /** Upper-cased name for the starttls-proto option */ -#define STARTTLS_PROTO_NAME (gnutls_cli_opt_strs+1895) +#define STARTTLS_PROTO_NAME (gnutls_cli_opt_strs+1889) /** Name string for the starttls-proto option */ -#define STARTTLS_PROTO_name (gnutls_cli_opt_strs+1910) +#define STARTTLS_PROTO_name (gnutls_cli_opt_strs+1904) /** Other options that appear in conjunction with the starttls-proto option */ static int const aStarttls_ProtoCantList[] = { INDEX_OPT_STARTTLS, NO_EQUIVALENT }; @@ -485,11 +485,11 @@ static int const aStarttls_ProtoCantList[] = { * udp option description: */ /** Descriptive text for the udp option */ -#define UDP_DESC (gnutls_cli_opt_strs+1925) +#define UDP_DESC (gnutls_cli_opt_strs+1919) /** Upper-cased name for the udp option */ -#define UDP_NAME (gnutls_cli_opt_strs+1958) +#define UDP_NAME (gnutls_cli_opt_strs+1952) /** Name string for the udp option */ -#define UDP_name (gnutls_cli_opt_strs+1962) +#define UDP_name (gnutls_cli_opt_strs+1956) /** Compiled in flag settings for the udp option */ #define UDP_FLAGS (OPTST_DISABLED) @@ -497,11 +497,11 @@ static int const aStarttls_ProtoCantList[] = { * mtu option description: */ /** Descriptive text for the mtu option */ -#define MTU_DESC (gnutls_cli_opt_strs+1966) +#define MTU_DESC (gnutls_cli_opt_strs+1960) /** Upper-cased name for the mtu option */ -#define MTU_NAME (gnutls_cli_opt_strs+1991) +#define MTU_NAME (gnutls_cli_opt_strs+1985) /** Name string for the mtu option */ -#define MTU_name (gnutls_cli_opt_strs+1995) +#define MTU_name (gnutls_cli_opt_strs+1989) /** Compiled in flag settings for the mtu option */ #define MTU_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -510,11 +510,11 @@ static int const aStarttls_ProtoCantList[] = { * crlf option description: */ /** Descriptive text for the crlf option */ -#define CRLF_DESC (gnutls_cli_opt_strs+1999) +#define CRLF_DESC (gnutls_cli_opt_strs+1993) /** Upper-cased name for the crlf option */ -#define CRLF_NAME (gnutls_cli_opt_strs+2024) +#define CRLF_NAME (gnutls_cli_opt_strs+2018) /** Name string for the crlf option */ -#define CRLF_name (gnutls_cli_opt_strs+2029) +#define CRLF_name (gnutls_cli_opt_strs+2023) /** Compiled in flag settings for the crlf option */ #define CRLF_FLAGS (OPTST_DISABLED) @@ -522,11 +522,11 @@ static int const aStarttls_ProtoCantList[] = { * fastopen option description: */ /** Descriptive text for the fastopen option */ -#define FASTOPEN_DESC (gnutls_cli_opt_strs+2034) +#define FASTOPEN_DESC (gnutls_cli_opt_strs+2028) /** Upper-cased name for the fastopen option */ -#define FASTOPEN_NAME (gnutls_cli_opt_strs+2055) +#define FASTOPEN_NAME (gnutls_cli_opt_strs+2049) /** Name string for the fastopen option */ -#define FASTOPEN_name (gnutls_cli_opt_strs+2064) +#define FASTOPEN_name (gnutls_cli_opt_strs+2058) /** Compiled in flag settings for the fastopen option */ #define FASTOPEN_FLAGS (OPTST_DISABLED) @@ -534,11 +534,11 @@ static int const aStarttls_ProtoCantList[] = { * x509fmtder option description: */ /** Descriptive text for the x509fmtder option */ -#define X509FMTDER_DESC (gnutls_cli_opt_strs+2073) +#define X509FMTDER_DESC (gnutls_cli_opt_strs+2067) /** Upper-cased name for the x509fmtder option */ -#define X509FMTDER_NAME (gnutls_cli_opt_strs+2118) +#define X509FMTDER_NAME (gnutls_cli_opt_strs+2112) /** Name string for the x509fmtder option */ -#define X509FMTDER_name (gnutls_cli_opt_strs+2129) +#define X509FMTDER_name (gnutls_cli_opt_strs+2123) /** Compiled in flag settings for the x509fmtder option */ #define X509FMTDER_FLAGS (OPTST_DISABLED) @@ -546,11 +546,11 @@ static int const aStarttls_ProtoCantList[] = { * print-cert option description: */ /** Descriptive text for the print-cert option */ -#define PRINT_CERT_DESC (gnutls_cli_opt_strs+2140) +#define PRINT_CERT_DESC (gnutls_cli_opt_strs+2134) /** Upper-cased name for the print-cert option */ -#define PRINT_CERT_NAME (gnutls_cli_opt_strs+2179) +#define PRINT_CERT_NAME (gnutls_cli_opt_strs+2173) /** Name string for the print-cert option */ -#define PRINT_CERT_name (gnutls_cli_opt_strs+2190) +#define PRINT_CERT_name (gnutls_cli_opt_strs+2184) /** Compiled in flag settings for the print-cert option */ #define PRINT_CERT_FLAGS (OPTST_DISABLED) @@ -558,11 +558,11 @@ static int const aStarttls_ProtoCantList[] = { * save-cert option description: */ /** Descriptive text for the save-cert option */ -#define SAVE_CERT_DESC (gnutls_cli_opt_strs+2201) +#define SAVE_CERT_DESC (gnutls_cli_opt_strs+2195) /** Upper-cased name for the save-cert option */ -#define SAVE_CERT_NAME (gnutls_cli_opt_strs+2271) +#define SAVE_CERT_NAME (gnutls_cli_opt_strs+2265) /** Name string for the save-cert option */ -#define SAVE_CERT_name (gnutls_cli_opt_strs+2281) +#define SAVE_CERT_name (gnutls_cli_opt_strs+2275) /** Compiled in flag settings for the save-cert option */ #define SAVE_CERT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -571,11 +571,11 @@ static int const aStarttls_ProtoCantList[] = { * save-ocsp option description: */ /** Descriptive text for the save-ocsp option */ -#define SAVE_OCSP_DESC (gnutls_cli_opt_strs+2291) +#define SAVE_OCSP_DESC (gnutls_cli_opt_strs+2285) /** Upper-cased name for the save-ocsp option */ -#define SAVE_OCSP_NAME (gnutls_cli_opt_strs+2349) +#define SAVE_OCSP_NAME (gnutls_cli_opt_strs+2343) /** Name string for the save-ocsp option */ -#define SAVE_OCSP_name (gnutls_cli_opt_strs+2359) +#define SAVE_OCSP_name (gnutls_cli_opt_strs+2353) /** Compiled in flag settings for the save-ocsp option */ #define SAVE_OCSP_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -584,11 +584,11 @@ static int const aStarttls_ProtoCantList[] = { * save-server-trace option description: */ /** Descriptive text for the save-server-trace option */ -#define SAVE_SERVER_TRACE_DESC (gnutls_cli_opt_strs+2369) +#define SAVE_SERVER_TRACE_DESC (gnutls_cli_opt_strs+2363) /** Upper-cased name for the save-server-trace option */ -#define SAVE_SERVER_TRACE_NAME (gnutls_cli_opt_strs+2429) +#define SAVE_SERVER_TRACE_NAME (gnutls_cli_opt_strs+2423) /** Name string for the save-server-trace option */ -#define SAVE_SERVER_TRACE_name (gnutls_cli_opt_strs+2447) +#define SAVE_SERVER_TRACE_name (gnutls_cli_opt_strs+2441) /** Compiled in flag settings for the save-server-trace option */ #define SAVE_SERVER_TRACE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -597,11 +597,11 @@ static int const aStarttls_ProtoCantList[] = { * save-client-trace option description: */ /** Descriptive text for the save-client-trace option */ -#define SAVE_CLIENT_TRACE_DESC (gnutls_cli_opt_strs+2465) +#define SAVE_CLIENT_TRACE_DESC (gnutls_cli_opt_strs+2459) /** Upper-cased name for the save-client-trace option */ -#define SAVE_CLIENT_TRACE_NAME (gnutls_cli_opt_strs+2525) +#define SAVE_CLIENT_TRACE_NAME (gnutls_cli_opt_strs+2519) /** Name string for the save-client-trace option */ -#define SAVE_CLIENT_TRACE_name (gnutls_cli_opt_strs+2543) +#define SAVE_CLIENT_TRACE_name (gnutls_cli_opt_strs+2537) /** Compiled in flag settings for the save-client-trace option */ #define SAVE_CLIENT_TRACE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -610,11 +610,11 @@ static int const aStarttls_ProtoCantList[] = { * dh-bits option description: */ /** Descriptive text for the dh-bits option */ -#define DH_BITS_DESC (gnutls_cli_opt_strs+2561) +#define DH_BITS_DESC (gnutls_cli_opt_strs+2555) /** Upper-cased name for the dh-bits option */ -#define DH_BITS_NAME (gnutls_cli_opt_strs+2603) +#define DH_BITS_NAME (gnutls_cli_opt_strs+2597) /** Name string for the dh-bits option */ -#define DH_BITS_name (gnutls_cli_opt_strs+2611) +#define DH_BITS_name (gnutls_cli_opt_strs+2605) /** Compiled in flag settings for the dh-bits option */ #define DH_BITS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -623,11 +623,11 @@ static int const aStarttls_ProtoCantList[] = { * priority option description: */ /** Descriptive text for the priority option */ -#define PRIORITY_DESC (gnutls_cli_opt_strs+2619) +#define PRIORITY_DESC (gnutls_cli_opt_strs+2613) /** Upper-cased name for the priority option */ -#define PRIORITY_NAME (gnutls_cli_opt_strs+2637) +#define PRIORITY_NAME (gnutls_cli_opt_strs+2631) /** Name string for the priority option */ -#define PRIORITY_name (gnutls_cli_opt_strs+2646) +#define PRIORITY_name (gnutls_cli_opt_strs+2640) /** Compiled in flag settings for the priority option */ #define PRIORITY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -636,11 +636,11 @@ static int const aStarttls_ProtoCantList[] = { * x509cafile option description: */ /** Descriptive text for the x509cafile option */ -#define X509CAFILE_DESC (gnutls_cli_opt_strs+2655) +#define X509CAFILE_DESC (gnutls_cli_opt_strs+2649) /** Upper-cased name for the x509cafile option */ -#define X509CAFILE_NAME (gnutls_cli_opt_strs+2695) +#define X509CAFILE_NAME (gnutls_cli_opt_strs+2689) /** Name string for the x509cafile option */ -#define X509CAFILE_name (gnutls_cli_opt_strs+2706) +#define X509CAFILE_name (gnutls_cli_opt_strs+2700) /** Compiled in flag settings for the x509cafile option */ #define X509CAFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -649,11 +649,11 @@ static int const aStarttls_ProtoCantList[] = { * x509crlfile option description: */ /** Descriptive text for the x509crlfile option */ -#define X509CRLFILE_DESC (gnutls_cli_opt_strs+2717) +#define X509CRLFILE_DESC (gnutls_cli_opt_strs+2711) /** Upper-cased name for the x509crlfile option */ -#define X509CRLFILE_NAME (gnutls_cli_opt_strs+2733) +#define X509CRLFILE_NAME (gnutls_cli_opt_strs+2727) /** Name string for the x509crlfile option */ -#define X509CRLFILE_name (gnutls_cli_opt_strs+2745) +#define X509CRLFILE_name (gnutls_cli_opt_strs+2739) /** Compiled in flag settings for the x509crlfile option */ #define X509CRLFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -662,11 +662,11 @@ static int const aStarttls_ProtoCantList[] = { * x509keyfile option description: */ /** Descriptive text for the x509keyfile option */ -#define X509KEYFILE_DESC (gnutls_cli_opt_strs+2757) +#define X509KEYFILE_DESC (gnutls_cli_opt_strs+2751) /** Upper-cased name for the x509keyfile option */ -#define X509KEYFILE_NAME (gnutls_cli_opt_strs+2795) +#define X509KEYFILE_NAME (gnutls_cli_opt_strs+2789) /** Name string for the x509keyfile option */ -#define X509KEYFILE_name (gnutls_cli_opt_strs+2807) +#define X509KEYFILE_name (gnutls_cli_opt_strs+2801) /** Compiled in flag settings for the x509keyfile option */ #define X509KEYFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -676,11 +676,11 @@ static int const aStarttls_ProtoCantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the x509certfile option */ -#define X509CERTFILE_DESC (gnutls_cli_opt_strs+2819) +#define X509CERTFILE_DESC (gnutls_cli_opt_strs+2813) /** Upper-cased name for the x509certfile option */ -#define X509CERTFILE_NAME (gnutls_cli_opt_strs+2865) +#define X509CERTFILE_NAME (gnutls_cli_opt_strs+2859) /** Name string for the x509certfile option */ -#define X509CERTFILE_name (gnutls_cli_opt_strs+2878) +#define X509CERTFILE_name (gnutls_cli_opt_strs+2872) /** Other options that are required by the x509certfile option */ static int const aX509certfileMustList[] = { INDEX_OPT_X509KEYFILE, NO_EQUIVALENT }; @@ -692,11 +692,11 @@ static int const aX509certfileMustList[] = { * srpusername option description: */ /** Descriptive text for the srpusername option */ -#define SRPUSERNAME_DESC (gnutls_cli_opt_strs+2891) +#define SRPUSERNAME_DESC (gnutls_cli_opt_strs+2885) /** Upper-cased name for the srpusername option */ -#define SRPUSERNAME_NAME (gnutls_cli_opt_strs+2911) +#define SRPUSERNAME_NAME (gnutls_cli_opt_strs+2905) /** Name string for the srpusername option */ -#define SRPUSERNAME_name (gnutls_cli_opt_strs+2923) +#define SRPUSERNAME_name (gnutls_cli_opt_strs+2917) /** Compiled in flag settings for the srpusername option */ #define SRPUSERNAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -705,11 +705,11 @@ static int const aX509certfileMustList[] = { * srppasswd option description: */ /** Descriptive text for the srppasswd option */ -#define SRPPASSWD_DESC (gnutls_cli_opt_strs+2935) +#define SRPPASSWD_DESC (gnutls_cli_opt_strs+2929) /** Upper-cased name for the srppasswd option */ -#define SRPPASSWD_NAME (gnutls_cli_opt_strs+2955) +#define SRPPASSWD_NAME (gnutls_cli_opt_strs+2949) /** Name string for the srppasswd option */ -#define SRPPASSWD_name (gnutls_cli_opt_strs+2965) +#define SRPPASSWD_name (gnutls_cli_opt_strs+2959) /** Compiled in flag settings for the srppasswd option */ #define SRPPASSWD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -718,11 +718,11 @@ static int const aX509certfileMustList[] = { * pskusername option description: */ /** Descriptive text for the pskusername option */ -#define PSKUSERNAME_DESC (gnutls_cli_opt_strs+2975) +#define PSKUSERNAME_DESC (gnutls_cli_opt_strs+2969) /** Upper-cased name for the pskusername option */ -#define PSKUSERNAME_NAME (gnutls_cli_opt_strs+2995) +#define PSKUSERNAME_NAME (gnutls_cli_opt_strs+2989) /** Name string for the pskusername option */ -#define PSKUSERNAME_name (gnutls_cli_opt_strs+3007) +#define PSKUSERNAME_name (gnutls_cli_opt_strs+3001) /** Compiled in flag settings for the pskusername option */ #define PSKUSERNAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -731,11 +731,11 @@ static int const aX509certfileMustList[] = { * pskkey option description: */ /** Descriptive text for the pskkey option */ -#define PSKKEY_DESC (gnutls_cli_opt_strs+3019) +#define PSKKEY_DESC (gnutls_cli_opt_strs+3013) /** Upper-cased name for the pskkey option */ -#define PSKKEY_NAME (gnutls_cli_opt_strs+3043) +#define PSKKEY_NAME (gnutls_cli_opt_strs+3037) /** Name string for the pskkey option */ -#define PSKKEY_name (gnutls_cli_opt_strs+3050) +#define PSKKEY_name (gnutls_cli_opt_strs+3044) /** Compiled in flag settings for the pskkey option */ #define PSKKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -744,11 +744,11 @@ static int const aX509certfileMustList[] = { * port option description: */ /** Descriptive text for the port option */ -#define PORT_DESC (gnutls_cli_opt_strs+3057) +#define PORT_DESC (gnutls_cli_opt_strs+3051) /** Upper-cased name for the port option */ -#define PORT_NAME (gnutls_cli_opt_strs+3091) +#define PORT_NAME (gnutls_cli_opt_strs+3085) /** Name string for the port option */ -#define PORT_name (gnutls_cli_opt_strs+3096) +#define PORT_name (gnutls_cli_opt_strs+3090) /** Compiled in flag settings for the port option */ #define PORT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -757,11 +757,11 @@ static int const aX509certfileMustList[] = { * insecure option description: */ /** Descriptive text for the insecure option */ -#define INSECURE_DESC (gnutls_cli_opt_strs+3101) +#define INSECURE_DESC (gnutls_cli_opt_strs+3095) /** Upper-cased name for the insecure option */ -#define INSECURE_NAME (gnutls_cli_opt_strs+3162) +#define INSECURE_NAME (gnutls_cli_opt_strs+3156) /** Name string for the insecure option */ -#define INSECURE_name (gnutls_cli_opt_strs+3171) +#define INSECURE_name (gnutls_cli_opt_strs+3165) /** Compiled in flag settings for the insecure option */ #define INSECURE_FLAGS (OPTST_DISABLED) @@ -769,11 +769,11 @@ static int const aX509certfileMustList[] = { * verify-allow-broken option description: */ /** Descriptive text for the verify-allow-broken option */ -#define VERIFY_ALLOW_BROKEN_DESC (gnutls_cli_opt_strs+3180) +#define VERIFY_ALLOW_BROKEN_DESC (gnutls_cli_opt_strs+3174) /** Upper-cased name for the verify-allow-broken option */ -#define VERIFY_ALLOW_BROKEN_NAME (gnutls_cli_opt_strs+3246) +#define VERIFY_ALLOW_BROKEN_NAME (gnutls_cli_opt_strs+3240) /** Name string for the verify-allow-broken option */ -#define VERIFY_ALLOW_BROKEN_name (gnutls_cli_opt_strs+3266) +#define VERIFY_ALLOW_BROKEN_name (gnutls_cli_opt_strs+3260) /** Compiled in flag settings for the verify-allow-broken option */ #define VERIFY_ALLOW_BROKEN_FLAGS (OPTST_DISABLED) @@ -781,11 +781,11 @@ static int const aX509certfileMustList[] = { * ranges option description: */ /** Descriptive text for the ranges option */ -#define RANGES_DESC (gnutls_cli_opt_strs+3286) +#define RANGES_DESC (gnutls_cli_opt_strs+3280) /** Upper-cased name for the ranges option */ -#define RANGES_NAME (gnutls_cli_opt_strs+3353) +#define RANGES_NAME (gnutls_cli_opt_strs+3347) /** Name string for the ranges option */ -#define RANGES_name (gnutls_cli_opt_strs+3360) +#define RANGES_name (gnutls_cli_opt_strs+3354) /** Compiled in flag settings for the ranges option */ #define RANGES_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED) @@ -793,11 +793,11 @@ static int const aX509certfileMustList[] = { * benchmark-ciphers option description: */ /** Descriptive text for the benchmark-ciphers option */ -#define BENCHMARK_CIPHERS_DESC (gnutls_cli_opt_strs+3367) +#define BENCHMARK_CIPHERS_DESC (gnutls_cli_opt_strs+3361) /** Upper-cased name for the benchmark-ciphers option */ -#define BENCHMARK_CIPHERS_NAME (gnutls_cli_opt_strs+3396) +#define BENCHMARK_CIPHERS_NAME (gnutls_cli_opt_strs+3390) /** Name string for the benchmark-ciphers option */ -#define BENCHMARK_CIPHERS_name (gnutls_cli_opt_strs+3414) +#define BENCHMARK_CIPHERS_name (gnutls_cli_opt_strs+3408) /** Compiled in flag settings for the benchmark-ciphers option */ #define BENCHMARK_CIPHERS_FLAGS (OPTST_DISABLED) @@ -805,11 +805,11 @@ static int const aX509certfileMustList[] = { * benchmark-tls-kx option description: */ /** Descriptive text for the benchmark-tls-kx option */ -#define BENCHMARK_TLS_KX_DESC (gnutls_cli_opt_strs+3432) +#define BENCHMARK_TLS_KX_DESC (gnutls_cli_opt_strs+3426) /** Upper-cased name for the benchmark-tls-kx option */ -#define BENCHMARK_TLS_KX_NAME (gnutls_cli_opt_strs+3467) +#define BENCHMARK_TLS_KX_NAME (gnutls_cli_opt_strs+3461) /** Name string for the benchmark-tls-kx option */ -#define BENCHMARK_TLS_KX_name (gnutls_cli_opt_strs+3484) +#define BENCHMARK_TLS_KX_name (gnutls_cli_opt_strs+3478) /** Compiled in flag settings for the benchmark-tls-kx option */ #define BENCHMARK_TLS_KX_FLAGS (OPTST_DISABLED) @@ -817,11 +817,11 @@ static int const aX509certfileMustList[] = { * benchmark-tls-ciphers option description: */ /** Descriptive text for the benchmark-tls-ciphers option */ -#define BENCHMARK_TLS_CIPHERS_DESC (gnutls_cli_opt_strs+3501) +#define BENCHMARK_TLS_CIPHERS_DESC (gnutls_cli_opt_strs+3495) /** Upper-cased name for the benchmark-tls-ciphers option */ -#define BENCHMARK_TLS_CIPHERS_NAME (gnutls_cli_opt_strs+3523) +#define BENCHMARK_TLS_CIPHERS_NAME (gnutls_cli_opt_strs+3517) /** Name string for the benchmark-tls-ciphers option */ -#define BENCHMARK_TLS_CIPHERS_name (gnutls_cli_opt_strs+3545) +#define BENCHMARK_TLS_CIPHERS_name (gnutls_cli_opt_strs+3539) /** Compiled in flag settings for the benchmark-tls-ciphers option */ #define BENCHMARK_TLS_CIPHERS_FLAGS (OPTST_DISABLED) @@ -830,11 +830,11 @@ static int const aX509certfileMustList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the list option */ -#define LIST_DESC (gnutls_cli_opt_strs+3567) +#define LIST_DESC (gnutls_cli_opt_strs+3561) /** Upper-cased name for the list option */ -#define LIST_NAME (gnutls_cli_opt_strs+3618) +#define LIST_NAME (gnutls_cli_opt_strs+3612) /** Name string for the list option */ -#define LIST_name (gnutls_cli_opt_strs+3623) +#define LIST_name (gnutls_cli_opt_strs+3617) /** Other options that appear in conjunction with the list option */ static int const aListCantList[] = { INDEX_OPT_PORT, NO_EQUIVALENT }; @@ -845,11 +845,11 @@ static int const aListCantList[] = { * priority-list option description: */ /** Descriptive text for the priority-list option */ -#define PRIORITY_LIST_DESC (gnutls_cli_opt_strs+3628) +#define PRIORITY_LIST_DESC (gnutls_cli_opt_strs+3622) /** Upper-cased name for the priority-list option */ -#define PRIORITY_LIST_NAME (gnutls_cli_opt_strs+3675) +#define PRIORITY_LIST_NAME (gnutls_cli_opt_strs+3669) /** Name string for the priority-list option */ -#define PRIORITY_LIST_name (gnutls_cli_opt_strs+3689) +#define PRIORITY_LIST_name (gnutls_cli_opt_strs+3683) /** Compiled in flag settings for the priority-list option */ #define PRIORITY_LIST_FLAGS (OPTST_DISABLED) @@ -857,11 +857,11 @@ static int const aListCantList[] = { * noticket option description: */ /** Descriptive text for the noticket option */ -#define NOTICKET_DESC (gnutls_cli_opt_strs+3703) +#define NOTICKET_DESC (gnutls_cli_opt_strs+3697) /** Upper-cased name for the noticket option */ -#define NOTICKET_NAME (gnutls_cli_opt_strs+3731) +#define NOTICKET_NAME (gnutls_cli_opt_strs+3725) /** Name string for the noticket option */ -#define NOTICKET_name (gnutls_cli_opt_strs+3740) +#define NOTICKET_name (gnutls_cli_opt_strs+3734) /** Compiled in flag settings for the noticket option */ #define NOTICKET_FLAGS (OPTST_DISABLED) @@ -869,11 +869,11 @@ static int const aListCantList[] = { * srtp_profiles option description: */ /** Descriptive text for the srtp_profiles option */ -#define SRTP_PROFILES_DESC (gnutls_cli_opt_strs+3749) +#define SRTP_PROFILES_DESC (gnutls_cli_opt_strs+3743) /** Upper-cased name for the srtp_profiles option */ -#define SRTP_PROFILES_NAME (gnutls_cli_opt_strs+3769) +#define SRTP_PROFILES_NAME (gnutls_cli_opt_strs+3763) /** Name string for the srtp_profiles option */ -#define SRTP_PROFILES_name (gnutls_cli_opt_strs+3783) +#define SRTP_PROFILES_name (gnutls_cli_opt_strs+3777) /** Compiled in flag settings for the srtp_profiles option */ #define SRTP_PROFILES_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -882,11 +882,11 @@ static int const aListCantList[] = { * alpn option description: */ /** Descriptive text for the alpn option */ -#define ALPN_DESC (gnutls_cli_opt_strs+3797) +#define ALPN_DESC (gnutls_cli_opt_strs+3791) /** Upper-cased name for the alpn option */ -#define ALPN_NAME (gnutls_cli_opt_strs+3824) +#define ALPN_NAME (gnutls_cli_opt_strs+3818) /** Name string for the alpn option */ -#define ALPN_name (gnutls_cli_opt_strs+3829) +#define ALPN_name (gnutls_cli_opt_strs+3823) /** Compiled in flag settings for the alpn option */ #define ALPN_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -895,11 +895,11 @@ static int const aListCantList[] = { * heartbeat option description: */ /** Descriptive text for the heartbeat option */ -#define HEARTBEAT_DESC (gnutls_cli_opt_strs+3834) +#define HEARTBEAT_DESC (gnutls_cli_opt_strs+3828) /** Upper-cased name for the heartbeat option */ -#define HEARTBEAT_NAME (gnutls_cli_opt_strs+3861) +#define HEARTBEAT_NAME (gnutls_cli_opt_strs+3855) /** Name string for the heartbeat option */ -#define HEARTBEAT_name (gnutls_cli_opt_strs+3871) +#define HEARTBEAT_name (gnutls_cli_opt_strs+3865) /** Compiled in flag settings for the heartbeat option */ #define HEARTBEAT_FLAGS (OPTST_DISABLED) @@ -907,11 +907,11 @@ static int const aListCantList[] = { * recordsize option description: */ /** Descriptive text for the recordsize option */ -#define RECORDSIZE_DESC (gnutls_cli_opt_strs+3881) +#define RECORDSIZE_DESC (gnutls_cli_opt_strs+3875) /** Upper-cased name for the recordsize option */ -#define RECORDSIZE_NAME (gnutls_cli_opt_strs+3918) +#define RECORDSIZE_NAME (gnutls_cli_opt_strs+3912) /** Name string for the recordsize option */ -#define RECORDSIZE_name (gnutls_cli_opt_strs+3929) +#define RECORDSIZE_name (gnutls_cli_opt_strs+3923) /** Compiled in flag settings for the recordsize option */ #define RECORDSIZE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -920,11 +920,11 @@ static int const aListCantList[] = { * disable-sni option description: */ /** Descriptive text for the disable-sni option */ -#define DISABLE_SNI_DESC (gnutls_cli_opt_strs+3940) +#define DISABLE_SNI_DESC (gnutls_cli_opt_strs+3934) /** Upper-cased name for the disable-sni option */ -#define DISABLE_SNI_NAME (gnutls_cli_opt_strs+3983) +#define DISABLE_SNI_NAME (gnutls_cli_opt_strs+3977) /** Name string for the disable-sni option */ -#define DISABLE_SNI_name (gnutls_cli_opt_strs+3995) +#define DISABLE_SNI_name (gnutls_cli_opt_strs+3989) /** Compiled in flag settings for the disable-sni option */ #define DISABLE_SNI_FLAGS (OPTST_DISABLED) @@ -932,11 +932,11 @@ static int const aListCantList[] = { * disable-extensions option description: */ /** Descriptive text for the disable-extensions option */ -#define DISABLE_EXTENSIONS_DESC (gnutls_cli_opt_strs+4007) +#define DISABLE_EXTENSIONS_DESC (gnutls_cli_opt_strs+4001) /** Upper-cased name for the disable-extensions option */ -#define DISABLE_EXTENSIONS_NAME (gnutls_cli_opt_strs+4051) +#define DISABLE_EXTENSIONS_NAME (gnutls_cli_opt_strs+4045) /** Name string for the disable-extensions option */ -#define DISABLE_EXTENSIONS_name (gnutls_cli_opt_strs+4070) +#define DISABLE_EXTENSIONS_name (gnutls_cli_opt_strs+4064) /** Compiled in flag settings for the disable-extensions option */ #define DISABLE_EXTENSIONS_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED) @@ -944,11 +944,11 @@ static int const aListCantList[] = { * single-key-share option description: */ /** Descriptive text for the single-key-share option */ -#define SINGLE_KEY_SHARE_DESC (gnutls_cli_opt_strs+4089) +#define SINGLE_KEY_SHARE_DESC (gnutls_cli_opt_strs+4083) /** Upper-cased name for the single-key-share option */ -#define SINGLE_KEY_SHARE_NAME (gnutls_cli_opt_strs+4126) +#define SINGLE_KEY_SHARE_NAME (gnutls_cli_opt_strs+4120) /** Name string for the single-key-share option */ -#define SINGLE_KEY_SHARE_name (gnutls_cli_opt_strs+4143) +#define SINGLE_KEY_SHARE_name (gnutls_cli_opt_strs+4137) /** Compiled in flag settings for the single-key-share option */ #define SINGLE_KEY_SHARE_FLAGS (OPTST_DISABLED) @@ -956,11 +956,11 @@ static int const aListCantList[] = { * post-handshake-auth option description: */ /** Descriptive text for the post-handshake-auth option */ -#define POST_HANDSHAKE_AUTH_DESC (gnutls_cli_opt_strs+4160) +#define POST_HANDSHAKE_AUTH_DESC (gnutls_cli_opt_strs+4154) /** Upper-cased name for the post-handshake-auth option */ -#define POST_HANDSHAKE_AUTH_NAME (gnutls_cli_opt_strs+4210) +#define POST_HANDSHAKE_AUTH_NAME (gnutls_cli_opt_strs+4204) /** Name string for the post-handshake-auth option */ -#define POST_HANDSHAKE_AUTH_name (gnutls_cli_opt_strs+4230) +#define POST_HANDSHAKE_AUTH_name (gnutls_cli_opt_strs+4224) /** Compiled in flag settings for the post-handshake-auth option */ #define POST_HANDSHAKE_AUTH_FLAGS (OPTST_DISABLED) @@ -968,11 +968,11 @@ static int const aListCantList[] = { * inline-commands option description: */ /** Descriptive text for the inline-commands option */ -#define INLINE_COMMANDS_DESC (gnutls_cli_opt_strs+4250) +#define INLINE_COMMANDS_DESC (gnutls_cli_opt_strs+4244) /** Upper-cased name for the inline-commands option */ -#define INLINE_COMMANDS_NAME (gnutls_cli_opt_strs+4286) +#define INLINE_COMMANDS_NAME (gnutls_cli_opt_strs+4280) /** Name string for the inline-commands option */ -#define INLINE_COMMANDS_name (gnutls_cli_opt_strs+4302) +#define INLINE_COMMANDS_name (gnutls_cli_opt_strs+4296) /** Compiled in flag settings for the inline-commands option */ #define INLINE_COMMANDS_FLAGS (OPTST_DISABLED) @@ -980,11 +980,11 @@ static int const aListCantList[] = { * inline-commands-prefix option description: */ /** Descriptive text for the inline-commands-prefix option */ -#define INLINE_COMMANDS_PREFIX_DESC (gnutls_cli_opt_strs+4318) +#define INLINE_COMMANDS_PREFIX_DESC (gnutls_cli_opt_strs+4312) /** Upper-cased name for the inline-commands-prefix option */ -#define INLINE_COMMANDS_PREFIX_NAME (gnutls_cli_opt_strs+4368) +#define INLINE_COMMANDS_PREFIX_NAME (gnutls_cli_opt_strs+4362) /** Name string for the inline-commands-prefix option */ -#define INLINE_COMMANDS_PREFIX_name (gnutls_cli_opt_strs+4391) +#define INLINE_COMMANDS_PREFIX_name (gnutls_cli_opt_strs+4385) /** Compiled in flag settings for the inline-commands-prefix option */ #define INLINE_COMMANDS_PREFIX_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -993,11 +993,11 @@ static int const aListCantList[] = { * provider option description: */ /** Descriptive text for the provider option */ -#define PROVIDER_DESC (gnutls_cli_opt_strs+4414) +#define PROVIDER_DESC (gnutls_cli_opt_strs+4408) /** Upper-cased name for the provider option */ -#define PROVIDER_NAME (gnutls_cli_opt_strs+4452) +#define PROVIDER_NAME (gnutls_cli_opt_strs+4446) /** Name string for the provider option */ -#define PROVIDER_name (gnutls_cli_opt_strs+4461) +#define PROVIDER_name (gnutls_cli_opt_strs+4455) /** Compiled in flag settings for the provider option */ #define PROVIDER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -1006,22 +1006,22 @@ static int const aListCantList[] = { * fips140-mode option description: */ /** Descriptive text for the fips140-mode option */ -#define FIPS140_MODE_DESC (gnutls_cli_opt_strs+4470) +#define FIPS140_MODE_DESC (gnutls_cli_opt_strs+4464) /** Upper-cased name for the fips140-mode option */ -#define FIPS140_MODE_NAME (gnutls_cli_opt_strs+4529) +#define FIPS140_MODE_NAME (gnutls_cli_opt_strs+4523) /** Name string for the fips140-mode option */ -#define FIPS140_MODE_name (gnutls_cli_opt_strs+4542) +#define FIPS140_MODE_name (gnutls_cli_opt_strs+4536) /** Compiled in flag settings for the fips140-mode option */ #define FIPS140_MODE_FLAGS (OPTST_DISABLED) /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (gnutls_cli_opt_strs+4555) -#define HELP_name (gnutls_cli_opt_strs+4599) +#define HELP_DESC (gnutls_cli_opt_strs+4549) +#define HELP_name (gnutls_cli_opt_strs+4593) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (gnutls_cli_opt_strs+4604) -#define MORE_HELP_name (gnutls_cli_opt_strs+4649) +#define MORE_HELP_DESC (gnutls_cli_opt_strs+4598) +#define MORE_HELP_name (gnutls_cli_opt_strs+4643) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -1034,8 +1034,8 @@ static int const aListCantList[] = { # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (gnutls_cli_opt_strs+4659) -#define VER_name (gnutls_cli_opt_strs+4695) +#define VER_DESC (gnutls_cli_opt_strs+4653) +#define VER_name (gnutls_cli_opt_strs+4689) /** * Declare option callback procedures */ @@ -1782,21 +1782,21 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of gnutls-cli. */ -#define zPROGNAME (gnutls_cli_opt_strs+4703) +#define zPROGNAME (gnutls_cli_opt_strs+4697) /** Reference to the title line for gnutls-cli usage. */ -#define zUsageTitle (gnutls_cli_opt_strs+4714) +#define zUsageTitle (gnutls_cli_opt_strs+4708) /** There is no gnutls-cli configuration file. */ #define zRcName NULL /** There are no directories to search for gnutls-cli config files. */ #define apzHomeList NULL /** The gnutls-cli program bug email address. */ -#define zBugsAddr (gnutls_cli_opt_strs+4810) +#define zBugsAddr (gnutls_cli_opt_strs+4804) /** Clarification/explanation of what gnutls-cli does. */ -#define zExplain (gnutls_cli_opt_strs+4830) +#define zExplain (gnutls_cli_opt_strs+4820) /** Extra detail explaining what gnutls-cli does. */ -#define zDetail (gnutls_cli_opt_strs+4832) +#define zDetail (gnutls_cli_opt_strs+4822) /** The full version string for gnutls-cli. */ -#define zFullVersion (gnutls_cli_opt_strs+5015) +#define zFullVersion (gnutls_cli_opt_strs+5005) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -1808,7 +1808,7 @@ static tOptDesc optDesc[OPTION_CT] = { #endif /* ENABLE_NLS */ #define gnutls_cli_full_usage (NULL) -#define gnutls_cli_short_usage (gnutls_cli_opt_strs+5036) +#define gnutls_cli_short_usage (gnutls_cli_opt_strs+5022) #endif /* not defined __doxygen__ */ @@ -2202,8 +2202,8 @@ static void bogus_function(void) { translate option names. */ /* referenced via gnutls_cliOptions.pzCopyright */ - puts(_("gnutls-cli @VERSION@\n\ -Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n\ + puts(_("gnutls-cli 3.6.4\n\ +Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the GNU General Public License,\n\ version 3 or later <http://gnu.org/licenses/gpl.html>\n")); @@ -2415,7 +2415,7 @@ sets up a TLS connection and forwards data from the standard input to the\n\ secured socket and vice versa.\n")); /* referenced via gnutls_cliOptions.pzFullVersion */ - puts(_("gnutls-cli @VERSION@")); + puts(_("gnutls-cli 3.6.4")); /* referenced via gnutls_cliOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/src/cli-args.h.bak b/src/cli-args.h.bak index 549e687c6f..6a83f05651 100644 --- a/src/cli-args.h.bak +++ b/src/cli-args.h.bak @@ -19,7 +19,7 @@ * The gnutls-cli program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -130,9 +130,9 @@ typedef enum { /** count of all options for gnutls-cli */ #define OPTION_CT 60 /** gnutls-cli version */ -#define GNUTLS_CLI_VERSION "@VERSION@" +#define GNUTLS_CLI_VERSION "3.6.4" /** Full gnutls-cli version text */ -#define GNUTLS_CLI_FULL_VERSION "gnutls-cli @VERSION@" +#define GNUTLS_CLI_FULL_VERSION "gnutls-cli 3.6.4" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/src/cli-debug-args.c.bak b/src/cli-debug-args.c.bak index e04f39fea9..1b30eb17e6 100644 --- a/src/cli-debug-args.c.bak +++ b/src/cli-debug-args.c.bak @@ -19,7 +19,7 @@ * The gnutls-cli-debug program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -53,7 +53,7 @@ extern "C" { #endif extern FILE * option_usage_fp; #define zCopyright (gnutls_cli_debug_opt_strs+0) -#define zLicenseDescrip (gnutls_cli_debug_opt_strs+297) +#define zLicenseDescrip (gnutls_cli_debug_opt_strs+291) #ifndef NULL @@ -63,13 +63,13 @@ extern FILE * option_usage_fp; /** * static const strings for gnutls-cli-debug options */ -static char const gnutls_cli_debug_opt_strs[2056] = -/* 0 */ "gnutls-cli-debug @VERSION@\n" - "Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n" +static char const gnutls_cli_debug_opt_strs[2042] = +/* 0 */ "gnutls-cli-debug 3.6.4\n" + "Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the GNU General Public License,\n" "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0" -/* 297 */ "gnutls-cli-debug is free software: you can redistribute it and/or modify it\n" +/* 291 */ "gnutls-cli-debug is free software: you can redistribute it and/or modify it\n" "under the terms of the GNU General Public License as published by the Free\n" "Software Foundation, either version 3 of the License, or (at your option)\n" "any later version.\n\n" @@ -79,51 +79,51 @@ static char const gnutls_cli_debug_opt_strs[2056] = "for more details.\n\n" "You should have received a copy of the GNU General Public License along\n" "with this program. If not, see <http://www.gnu.org/licenses/>.\n\0" -/* 918 */ "Enable debugging\0" -/* 935 */ "DEBUG\0" -/* 941 */ "debug\0" -/* 947 */ "More verbose output\0" -/* 967 */ "VERBOSE\0" -/* 975 */ "verbose\0" -/* 983 */ "The port to connect to\0" -/* 1006 */ "PORT\0" -/* 1011 */ "port\0" -/* 1016 */ "an alias for the 'starttls-proto' option\0" -/* 1057 */ "app-proto\0" -/* 1067 */ "The application protocol to be used to obtain the server's certificate\n" +/* 912 */ "Enable debugging\0" +/* 929 */ "DEBUG\0" +/* 935 */ "debug\0" +/* 941 */ "More verbose output\0" +/* 961 */ "VERBOSE\0" +/* 969 */ "verbose\0" +/* 977 */ "The port to connect to\0" +/* 1000 */ "PORT\0" +/* 1005 */ "port\0" +/* 1010 */ "an alias for the 'starttls-proto' option\0" +/* 1051 */ "app-proto\0" +/* 1061 */ "The application protocol to be used to obtain the server's certificate\n" "(https, ftp, smtp, imap, ldap, xmpp, lmtp, pop3, nntp, sieve, postgres)\0" -/* 1210 */ "STARTTLS_PROTO\0" -/* 1225 */ "starttls-proto\0" -/* 1240 */ "display extended usage information and exit\0" -/* 1284 */ "help\0" -/* 1289 */ "extended usage information passed thru pager\0" -/* 1334 */ "more-help\0" -/* 1344 */ "output version information and exit\0" -/* 1380 */ "version\0" -/* 1388 */ "GNUTLS_CLI_DEBUG\0" -/* 1405 */ "gnutls-cli-debug - GnuTLS debug client\n" +/* 1204 */ "STARTTLS_PROTO\0" +/* 1219 */ "starttls-proto\0" +/* 1234 */ "display extended usage information and exit\0" +/* 1278 */ "help\0" +/* 1283 */ "extended usage information passed thru pager\0" +/* 1328 */ "more-help\0" +/* 1338 */ "output version information and exit\0" +/* 1374 */ "version\0" +/* 1382 */ "GNUTLS_CLI_DEBUG\0" +/* 1399 */ "gnutls-cli-debug - GnuTLS debug client\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \n\0" -/* 1503 */ "@PACKAGE_BUGREPORT@\0" -/* 1523 */ "\n\0" -/* 1525 */ "TLS debug client. It sets up multiple TLS connections to a server and\n" +/* 1497 */ "bugs@gnutls.org\0" +/* 1513 */ "\n\0" +/* 1515 */ "TLS debug client. It sets up multiple TLS connections to a server and\n" "queries its capabilities. It was created to assist in debugging GnuTLS,\n" "but it might be useful to extract a TLS server's capabilities. It connects\n" "to a TLS server, performs tests and print the server's capabilities. If\n" "called with the `-V' parameter more checks will be performed. Can be used\n" "to check for servers with special needs or bugs.\n\0" -/* 1943 */ "gnutls-cli-debug @VERSION@\0" -/* 1970 */ "Usage: gnutls-cli-debug [options] hostname\n" +/* 1933 */ "gnutls-cli-debug 3.6.4\0" +/* 1956 */ "Usage: gnutls-cli-debug [options] hostname\n" "gnutls-cli --help for usage instructions.\n"; /** * debug option description: */ /** Descriptive text for the debug option */ -#define DEBUG_DESC (gnutls_cli_debug_opt_strs+918) +#define DEBUG_DESC (gnutls_cli_debug_opt_strs+912) /** Upper-cased name for the debug option */ -#define DEBUG_NAME (gnutls_cli_debug_opt_strs+935) +#define DEBUG_NAME (gnutls_cli_debug_opt_strs+929) /** Name string for the debug option */ -#define DEBUG_name (gnutls_cli_debug_opt_strs+941) +#define DEBUG_name (gnutls_cli_debug_opt_strs+935) /** Compiled in flag settings for the debug option */ #define DEBUG_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -132,11 +132,11 @@ static char const gnutls_cli_debug_opt_strs[2056] = * verbose option description: */ /** Descriptive text for the verbose option */ -#define VERBOSE_DESC (gnutls_cli_debug_opt_strs+947) +#define VERBOSE_DESC (gnutls_cli_debug_opt_strs+941) /** Upper-cased name for the verbose option */ -#define VERBOSE_NAME (gnutls_cli_debug_opt_strs+967) +#define VERBOSE_NAME (gnutls_cli_debug_opt_strs+961) /** Name string for the verbose option */ -#define VERBOSE_name (gnutls_cli_debug_opt_strs+975) +#define VERBOSE_name (gnutls_cli_debug_opt_strs+969) /** Compiled in flag settings for the verbose option */ #define VERBOSE_FLAGS (OPTST_DISABLED) @@ -144,11 +144,11 @@ static char const gnutls_cli_debug_opt_strs[2056] = * port option description: */ /** Descriptive text for the port option */ -#define PORT_DESC (gnutls_cli_debug_opt_strs+983) +#define PORT_DESC (gnutls_cli_debug_opt_strs+977) /** Upper-cased name for the port option */ -#define PORT_NAME (gnutls_cli_debug_opt_strs+1006) +#define PORT_NAME (gnutls_cli_debug_opt_strs+1000) /** Name string for the port option */ -#define PORT_name (gnutls_cli_debug_opt_strs+1011) +#define PORT_name (gnutls_cli_debug_opt_strs+1005) /** Compiled in flag settings for the port option */ #define PORT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -157,10 +157,10 @@ static char const gnutls_cli_debug_opt_strs[2056] = * app-proto option description: */ /** Descriptive text for the app-proto option */ -#define APP_PROTO_DESC (gnutls_cli_debug_opt_strs+1016) +#define APP_PROTO_DESC (gnutls_cli_debug_opt_strs+1010) #define APP_PROTO_NAME NULL /** Unmodified name string for the app-proto option */ -#define APP_PROTO_name (gnutls_cli_debug_opt_strs+1057) +#define APP_PROTO_name (gnutls_cli_debug_opt_strs+1051) /** Compiled in flag settings for the app-proto option */ #define APP_PROTO_FLAGS (STARTTLS_PROTO_FLAGS | OPTST_ALIAS) @@ -168,11 +168,11 @@ static char const gnutls_cli_debug_opt_strs[2056] = * starttls-proto option description: */ /** Descriptive text for the starttls-proto option */ -#define STARTTLS_PROTO_DESC (gnutls_cli_debug_opt_strs+1067) +#define STARTTLS_PROTO_DESC (gnutls_cli_debug_opt_strs+1061) /** Upper-cased name for the starttls-proto option */ -#define STARTTLS_PROTO_NAME (gnutls_cli_debug_opt_strs+1210) +#define STARTTLS_PROTO_NAME (gnutls_cli_debug_opt_strs+1204) /** Name string for the starttls-proto option */ -#define STARTTLS_PROTO_name (gnutls_cli_debug_opt_strs+1225) +#define STARTTLS_PROTO_name (gnutls_cli_debug_opt_strs+1219) /** Compiled in flag settings for the starttls-proto option */ #define STARTTLS_PROTO_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -180,11 +180,11 @@ static char const gnutls_cli_debug_opt_strs[2056] = /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (gnutls_cli_debug_opt_strs+1240) -#define HELP_name (gnutls_cli_debug_opt_strs+1284) +#define HELP_DESC (gnutls_cli_debug_opt_strs+1234) +#define HELP_name (gnutls_cli_debug_opt_strs+1278) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (gnutls_cli_debug_opt_strs+1289) -#define MORE_HELP_name (gnutls_cli_debug_opt_strs+1334) +#define MORE_HELP_DESC (gnutls_cli_debug_opt_strs+1283) +#define MORE_HELP_name (gnutls_cli_debug_opt_strs+1328) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -197,8 +197,8 @@ static char const gnutls_cli_debug_opt_strs[2056] = # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (gnutls_cli_debug_opt_strs+1344) -#define VER_name (gnutls_cli_debug_opt_strs+1380) +#define VER_DESC (gnutls_cli_debug_opt_strs+1338) +#define VER_name (gnutls_cli_debug_opt_strs+1374) /** * Declare option callback procedures */ @@ -320,21 +320,21 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of gnutls-cli-debug. */ -#define zPROGNAME (gnutls_cli_debug_opt_strs+1388) +#define zPROGNAME (gnutls_cli_debug_opt_strs+1382) /** Reference to the title line for gnutls-cli-debug usage. */ -#define zUsageTitle (gnutls_cli_debug_opt_strs+1405) +#define zUsageTitle (gnutls_cli_debug_opt_strs+1399) /** There is no gnutls-cli-debug configuration file. */ #define zRcName NULL /** There are no directories to search for gnutls-cli-debug config files. */ #define apzHomeList NULL /** The gnutls-cli-debug program bug email address. */ -#define zBugsAddr (gnutls_cli_debug_opt_strs+1503) +#define zBugsAddr (gnutls_cli_debug_opt_strs+1497) /** Clarification/explanation of what gnutls-cli-debug does. */ -#define zExplain (gnutls_cli_debug_opt_strs+1523) +#define zExplain (gnutls_cli_debug_opt_strs+1513) /** Extra detail explaining what gnutls-cli-debug does. */ -#define zDetail (gnutls_cli_debug_opt_strs+1525) +#define zDetail (gnutls_cli_debug_opt_strs+1515) /** The full version string for gnutls-cli-debug. */ -#define zFullVersion (gnutls_cli_debug_opt_strs+1943) +#define zFullVersion (gnutls_cli_debug_opt_strs+1933) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -346,7 +346,7 @@ static tOptDesc optDesc[OPTION_CT] = { #endif /* ENABLE_NLS */ #define gnutls_cli_debug_full_usage (NULL) -#define gnutls_cli_debug_short_usage (gnutls_cli_debug_opt_strs+1970) +#define gnutls_cli_debug_short_usage (gnutls_cli_debug_opt_strs+1956) #endif /* not defined __doxygen__ */ @@ -657,8 +657,8 @@ static void bogus_function(void) { translate option names. */ /* referenced via gnutls_cli_debugOptions.pzCopyright */ - puts(_("gnutls-cli-debug @VERSION@\n\ -Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n\ + puts(_("gnutls-cli-debug 3.6.4\n\ +Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the GNU General Public License,\n\ version 3 or later <http://gnu.org/licenses/gpl.html>\n")); @@ -716,7 +716,7 @@ called with the `-V' parameter more checks will be performed. Can be used\n\ to check for servers with special needs or bugs.\n")); /* referenced via gnutls_cli_debugOptions.pzFullVersion */ - puts(_("gnutls-cli-debug @VERSION@")); + puts(_("gnutls-cli-debug 3.6.4")); /* referenced via gnutls_cli_debugOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/src/cli-debug-args.h.bak b/src/cli-debug-args.h.bak index 10cb4036a4..ff6863e9b7 100644 --- a/src/cli-debug-args.h.bak +++ b/src/cli-debug-args.h.bak @@ -19,7 +19,7 @@ * The gnutls-cli-debug program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -78,9 +78,9 @@ typedef enum { /** count of all options for gnutls-cli-debug */ #define OPTION_CT 8 /** gnutls-cli-debug version */ -#define GNUTLS_CLI_DEBUG_VERSION "@VERSION@" +#define GNUTLS_CLI_DEBUG_VERSION "3.6.4" /** Full gnutls-cli-debug version text */ -#define GNUTLS_CLI_DEBUG_FULL_VERSION "gnutls-cli-debug @VERSION@" +#define GNUTLS_CLI_DEBUG_FULL_VERSION "gnutls-cli-debug 3.6.4" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/src/danetool-args.c.bak b/src/danetool-args.c.bak index b4d2cd803c..825e4f1edb 100644 --- a/src/danetool-args.c.bak +++ b/src/danetool-args.c.bak @@ -19,7 +19,7 @@ * The danetool program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -53,7 +53,7 @@ extern "C" { #endif extern FILE * option_usage_fp; #define zCopyright (danetool_opt_strs+0) -#define zLicenseDescrip (danetool_opt_strs+289) +#define zLicenseDescrip (danetool_opt_strs+283) #ifndef NULL @@ -63,13 +63,13 @@ extern FILE * option_usage_fp; /** * static const strings for danetool options */ -static char const danetool_opt_strs[2884] = -/* 0 */ "danetool @VERSION@\n" - "Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n" +static char const danetool_opt_strs[2870] = +/* 0 */ "danetool 3.6.4\n" + "Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the GNU General Public License,\n" "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0" -/* 289 */ "danetool is free software: you can redistribute it and/or modify it under\n" +/* 283 */ "danetool is free software: you can redistribute it and/or modify it under\n" "the terms of the GNU General Public License as published by the Free\n" "Software Foundation, either version 3 of the License, or (at your option)\n" "any later version.\n\n" @@ -79,112 +79,112 @@ static char const danetool_opt_strs[2884] = "details.\n\n" "You should have received a copy of the GNU General Public License along\n" "with this program. If not, see <http://www.gnu.org/licenses/>.\n\0" -/* 894 */ "Enable debugging\0" -/* 911 */ "DEBUG\0" -/* 917 */ "debug\0" -/* 923 */ "More verbose output\0" -/* 943 */ "VERBOSE\0" -/* 951 */ "verbose\0" -/* 959 */ "Input file\0" -/* 970 */ "INFILE\0" -/* 977 */ "infile\0" -/* 984 */ "Output file\0" -/* 996 */ "OUTFILE\0" -/* 1004 */ "outfile\0" -/* 1012 */ "Loads a public key file\0" -/* 1036 */ "LOAD_PUBKEY\0" -/* 1048 */ "load-pubkey\0" -/* 1060 */ "Loads a certificate file\0" -/* 1085 */ "LOAD_CERTIFICATE\0" -/* 1102 */ "load-certificate\0" -/* 1119 */ "Sets a DLV file\0" -/* 1135 */ "DLV\0" -/* 1139 */ "dlv\0" -/* 1143 */ "Hash algorithm to use for signing\0" -/* 1177 */ "HASH\0" -/* 1182 */ "hash\0" -/* 1187 */ "Check a host's DANE TLSA entry\0" -/* 1218 */ "CHECK\0" -/* 1224 */ "check\0" -/* 1230 */ "Check only the end-entity's certificate\0" -/* 1270 */ "CHECK_EE\0" -/* 1279 */ "check-ee\0" -/* 1288 */ "Check only the CA's certificate\0" -/* 1320 */ "CHECK_CA\0" -/* 1329 */ "check-ca\0" -/* 1338 */ "Print the DANE RR data on a certificate or public key\0" -/* 1392 */ "TLSA_RR\0" -/* 1400 */ "tlsa-rr\0" -/* 1408 */ "Specify the hostname to be used in the DANE RR\0" -/* 1455 */ "HOST\0" -/* 1460 */ "host\0" -/* 1465 */ "The protocol set for DANE data (tcp, udp etc.)\0" -/* 1512 */ "PROTO\0" -/* 1518 */ "proto\0" -/* 1524 */ "The port or service to connect to, for DANE data\0" -/* 1573 */ "PORT\0" -/* 1578 */ "port\0" -/* 1583 */ "an alias for the 'starttls-proto' option\0" -/* 1624 */ "app-proto\0" -/* 1634 */ "The application protocol to be used to obtain the server's certificate\n" +/* 888 */ "Enable debugging\0" +/* 905 */ "DEBUG\0" +/* 911 */ "debug\0" +/* 917 */ "More verbose output\0" +/* 937 */ "VERBOSE\0" +/* 945 */ "verbose\0" +/* 953 */ "Input file\0" +/* 964 */ "INFILE\0" +/* 971 */ "infile\0" +/* 978 */ "Output file\0" +/* 990 */ "OUTFILE\0" +/* 998 */ "outfile\0" +/* 1006 */ "Loads a public key file\0" +/* 1030 */ "LOAD_PUBKEY\0" +/* 1042 */ "load-pubkey\0" +/* 1054 */ "Loads a certificate file\0" +/* 1079 */ "LOAD_CERTIFICATE\0" +/* 1096 */ "load-certificate\0" +/* 1113 */ "Sets a DLV file\0" +/* 1129 */ "DLV\0" +/* 1133 */ "dlv\0" +/* 1137 */ "Hash algorithm to use for signing\0" +/* 1171 */ "HASH\0" +/* 1176 */ "hash\0" +/* 1181 */ "Check a host's DANE TLSA entry\0" +/* 1212 */ "CHECK\0" +/* 1218 */ "check\0" +/* 1224 */ "Check only the end-entity's certificate\0" +/* 1264 */ "CHECK_EE\0" +/* 1273 */ "check-ee\0" +/* 1282 */ "Check only the CA's certificate\0" +/* 1314 */ "CHECK_CA\0" +/* 1323 */ "check-ca\0" +/* 1332 */ "Print the DANE RR data on a certificate or public key\0" +/* 1386 */ "TLSA_RR\0" +/* 1394 */ "tlsa-rr\0" +/* 1402 */ "Specify the hostname to be used in the DANE RR\0" +/* 1449 */ "HOST\0" +/* 1454 */ "host\0" +/* 1459 */ "The protocol set for DANE data (tcp, udp etc.)\0" +/* 1506 */ "PROTO\0" +/* 1512 */ "proto\0" +/* 1518 */ "The port or service to connect to, for DANE data\0" +/* 1567 */ "PORT\0" +/* 1572 */ "port\0" +/* 1577 */ "an alias for the 'starttls-proto' option\0" +/* 1618 */ "app-proto\0" +/* 1628 */ "The application protocol to be used to obtain the server's certificate\n" "(https, ftp, smtp, imap, ldap, xmpp, lmtp, pop3, nntp, sieve, postgres)\0" -/* 1777 */ "STARTTLS_PROTO\0" -/* 1792 */ "starttls-proto\0" -/* 1807 */ "Whether the provided certificate or public key is a Certificate\n" +/* 1771 */ "STARTTLS_PROTO\0" +/* 1786 */ "starttls-proto\0" +/* 1801 */ "Whether the provided certificate or public key is a Certificate\n" "Authority\0" -/* 1881 */ "CA\0" -/* 1884 */ "ca\0" -/* 1887 */ "Use the hash of the X.509 certificate, rather than the public key\0" -/* 1953 */ "X509\0" -/* 1958 */ "x509\0" -/* 1963 */ "an alias for the 'domain' option\0" -/* 1996 */ "local\0" -/* 2002 */ "The provided certificate or public key is issued by the local domain\0" -/* 2071 */ "DOMAIN\0" -/* 2078 */ "no-domain\0" -/* 2088 */ "no\0" -/* 2091 */ "Use the local DNS server for DNSSEC resolving\0" -/* 2137 */ "LOCAL_DNS\0" -/* 2147 */ "no-local-dns\0" -/* 2160 */ "Do not verify any DNSSEC signature\0" -/* 2195 */ "INSECURE\0" -/* 2204 */ "insecure\0" -/* 2213 */ "Use DER format for input certificates and private keys\0" -/* 2268 */ "INDER\0" -/* 2274 */ "no-inder\0" -/* 2283 */ "an alias for the 'inder' option\0" -/* 2315 */ "inraw\0" -/* 2321 */ "Print the received DANE data in raw format\0" -/* 2364 */ "PRINT_RAW\0" -/* 2374 */ "no-print-raw\0" -/* 2387 */ "Suppress several informational messages\0" -/* 2427 */ "QUIET\0" -/* 2433 */ "quiet\0" -/* 2439 */ "display extended usage information and exit\0" -/* 2483 */ "help\0" -/* 2488 */ "extended usage information passed thru pager\0" -/* 2533 */ "more-help\0" -/* 2543 */ "output version information and exit\0" -/* 2579 */ "version\0" -/* 2587 */ "DANETOOL\0" -/* 2596 */ "danetool - GnuTLS DANE tool\n" +/* 1875 */ "CA\0" +/* 1878 */ "ca\0" +/* 1881 */ "Use the hash of the X.509 certificate, rather than the public key\0" +/* 1947 */ "X509\0" +/* 1952 */ "x509\0" +/* 1957 */ "an alias for the 'domain' option\0" +/* 1990 */ "local\0" +/* 1996 */ "The provided certificate or public key is issued by the local domain\0" +/* 2065 */ "DOMAIN\0" +/* 2072 */ "no-domain\0" +/* 2082 */ "no\0" +/* 2085 */ "Use the local DNS server for DNSSEC resolving\0" +/* 2131 */ "LOCAL_DNS\0" +/* 2141 */ "no-local-dns\0" +/* 2154 */ "Do not verify any DNSSEC signature\0" +/* 2189 */ "INSECURE\0" +/* 2198 */ "insecure\0" +/* 2207 */ "Use DER format for input certificates and private keys\0" +/* 2262 */ "INDER\0" +/* 2268 */ "no-inder\0" +/* 2277 */ "an alias for the 'inder' option\0" +/* 2309 */ "inraw\0" +/* 2315 */ "Print the received DANE data in raw format\0" +/* 2358 */ "PRINT_RAW\0" +/* 2368 */ "no-print-raw\0" +/* 2381 */ "Suppress several informational messages\0" +/* 2421 */ "QUIET\0" +/* 2427 */ "quiet\0" +/* 2433 */ "display extended usage information and exit\0" +/* 2477 */ "help\0" +/* 2482 */ "extended usage information passed thru pager\0" +/* 2527 */ "more-help\0" +/* 2537 */ "output version information and exit\0" +/* 2573 */ "version\0" +/* 2581 */ "DANETOOL\0" +/* 2590 */ "danetool - GnuTLS DANE tool\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0" -/* 2682 */ "@PACKAGE_BUGREPORT@\0" -/* 2702 */ "\n\0" -/* 2704 */ "Tool to generate and check DNS resource records for the DANE protocol.\n\0" -/* 2776 */ "danetool @VERSION@\0" -/* 2795 */ "danetool --[tlsa-rr|check] [options]\n" +/* 2676 */ "bugs@gnutls.org\0" +/* 2692 */ "\n\0" +/* 2694 */ "Tool to generate and check DNS resource records for the DANE protocol.\n\0" +/* 2766 */ "danetool 3.6.4\0" +/* 2781 */ "danetool --[tlsa-rr|check] [options]\n" "danetool --help for additional usage instructions.\n"; /** * debug option description: */ /** Descriptive text for the debug option */ -#define DEBUG_DESC (danetool_opt_strs+894) +#define DEBUG_DESC (danetool_opt_strs+888) /** Upper-cased name for the debug option */ -#define DEBUG_NAME (danetool_opt_strs+911) +#define DEBUG_NAME (danetool_opt_strs+905) /** Name string for the debug option */ -#define DEBUG_name (danetool_opt_strs+917) +#define DEBUG_name (danetool_opt_strs+911) /** Compiled in flag settings for the debug option */ #define DEBUG_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -193,11 +193,11 @@ static char const danetool_opt_strs[2884] = * verbose option description: */ /** Descriptive text for the verbose option */ -#define VERBOSE_DESC (danetool_opt_strs+923) +#define VERBOSE_DESC (danetool_opt_strs+917) /** Upper-cased name for the verbose option */ -#define VERBOSE_NAME (danetool_opt_strs+943) +#define VERBOSE_NAME (danetool_opt_strs+937) /** Name string for the verbose option */ -#define VERBOSE_name (danetool_opt_strs+951) +#define VERBOSE_name (danetool_opt_strs+945) /** Compiled in flag settings for the verbose option */ #define VERBOSE_FLAGS (OPTST_DISABLED) @@ -205,11 +205,11 @@ static char const danetool_opt_strs[2884] = * infile option description: */ /** Descriptive text for the infile option */ -#define INFILE_DESC (danetool_opt_strs+959) +#define INFILE_DESC (danetool_opt_strs+953) /** Upper-cased name for the infile option */ -#define INFILE_NAME (danetool_opt_strs+970) +#define INFILE_NAME (danetool_opt_strs+964) /** Name string for the infile option */ -#define INFILE_name (danetool_opt_strs+977) +#define INFILE_name (danetool_opt_strs+971) /** Compiled in flag settings for the infile option */ #define INFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -218,11 +218,11 @@ static char const danetool_opt_strs[2884] = * outfile option description: */ /** Descriptive text for the outfile option */ -#define OUTFILE_DESC (danetool_opt_strs+984) +#define OUTFILE_DESC (danetool_opt_strs+978) /** Upper-cased name for the outfile option */ -#define OUTFILE_NAME (danetool_opt_strs+996) +#define OUTFILE_NAME (danetool_opt_strs+990) /** Name string for the outfile option */ -#define OUTFILE_name (danetool_opt_strs+1004) +#define OUTFILE_name (danetool_opt_strs+998) /** Compiled in flag settings for the outfile option */ #define OUTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -231,11 +231,11 @@ static char const danetool_opt_strs[2884] = * load-pubkey option description: */ /** Descriptive text for the load-pubkey option */ -#define LOAD_PUBKEY_DESC (danetool_opt_strs+1012) +#define LOAD_PUBKEY_DESC (danetool_opt_strs+1006) /** Upper-cased name for the load-pubkey option */ -#define LOAD_PUBKEY_NAME (danetool_opt_strs+1036) +#define LOAD_PUBKEY_NAME (danetool_opt_strs+1030) /** Name string for the load-pubkey option */ -#define LOAD_PUBKEY_name (danetool_opt_strs+1048) +#define LOAD_PUBKEY_name (danetool_opt_strs+1042) /** Compiled in flag settings for the load-pubkey option */ #define LOAD_PUBKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -244,11 +244,11 @@ static char const danetool_opt_strs[2884] = * load-certificate option description: */ /** Descriptive text for the load-certificate option */ -#define LOAD_CERTIFICATE_DESC (danetool_opt_strs+1060) +#define LOAD_CERTIFICATE_DESC (danetool_opt_strs+1054) /** Upper-cased name for the load-certificate option */ -#define LOAD_CERTIFICATE_NAME (danetool_opt_strs+1085) +#define LOAD_CERTIFICATE_NAME (danetool_opt_strs+1079) /** Name string for the load-certificate option */ -#define LOAD_CERTIFICATE_name (danetool_opt_strs+1102) +#define LOAD_CERTIFICATE_name (danetool_opt_strs+1096) /** Compiled in flag settings for the load-certificate option */ #define LOAD_CERTIFICATE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -257,11 +257,11 @@ static char const danetool_opt_strs[2884] = * dlv option description: */ /** Descriptive text for the dlv option */ -#define DLV_DESC (danetool_opt_strs+1119) +#define DLV_DESC (danetool_opt_strs+1113) /** Upper-cased name for the dlv option */ -#define DLV_NAME (danetool_opt_strs+1135) +#define DLV_NAME (danetool_opt_strs+1129) /** Name string for the dlv option */ -#define DLV_name (danetool_opt_strs+1139) +#define DLV_name (danetool_opt_strs+1133) /** Compiled in flag settings for the dlv option */ #define DLV_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -270,11 +270,11 @@ static char const danetool_opt_strs[2884] = * hash option description: */ /** Descriptive text for the hash option */ -#define HASH_DESC (danetool_opt_strs+1143) +#define HASH_DESC (danetool_opt_strs+1137) /** Upper-cased name for the hash option */ -#define HASH_NAME (danetool_opt_strs+1177) +#define HASH_NAME (danetool_opt_strs+1171) /** Name string for the hash option */ -#define HASH_name (danetool_opt_strs+1182) +#define HASH_name (danetool_opt_strs+1176) /** Compiled in flag settings for the hash option */ #define HASH_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -283,11 +283,11 @@ static char const danetool_opt_strs[2884] = * check option description: */ /** Descriptive text for the check option */ -#define CHECK_DESC (danetool_opt_strs+1187) +#define CHECK_DESC (danetool_opt_strs+1181) /** Upper-cased name for the check option */ -#define CHECK_NAME (danetool_opt_strs+1218) +#define CHECK_NAME (danetool_opt_strs+1212) /** Name string for the check option */ -#define CHECK_name (danetool_opt_strs+1224) +#define CHECK_name (danetool_opt_strs+1218) /** Compiled in flag settings for the check option */ #define CHECK_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -296,11 +296,11 @@ static char const danetool_opt_strs[2884] = * check-ee option description: */ /** Descriptive text for the check-ee option */ -#define CHECK_EE_DESC (danetool_opt_strs+1230) +#define CHECK_EE_DESC (danetool_opt_strs+1224) /** Upper-cased name for the check-ee option */ -#define CHECK_EE_NAME (danetool_opt_strs+1270) +#define CHECK_EE_NAME (danetool_opt_strs+1264) /** Name string for the check-ee option */ -#define CHECK_EE_name (danetool_opt_strs+1279) +#define CHECK_EE_name (danetool_opt_strs+1273) /** Compiled in flag settings for the check-ee option */ #define CHECK_EE_FLAGS (OPTST_DISABLED) @@ -308,11 +308,11 @@ static char const danetool_opt_strs[2884] = * check-ca option description: */ /** Descriptive text for the check-ca option */ -#define CHECK_CA_DESC (danetool_opt_strs+1288) +#define CHECK_CA_DESC (danetool_opt_strs+1282) /** Upper-cased name for the check-ca option */ -#define CHECK_CA_NAME (danetool_opt_strs+1320) +#define CHECK_CA_NAME (danetool_opt_strs+1314) /** Name string for the check-ca option */ -#define CHECK_CA_name (danetool_opt_strs+1329) +#define CHECK_CA_name (danetool_opt_strs+1323) /** Compiled in flag settings for the check-ca option */ #define CHECK_CA_FLAGS (OPTST_DISABLED) @@ -321,11 +321,11 @@ static char const danetool_opt_strs[2884] = * "Must also have options" and "Incompatible options": */ /** Descriptive text for the tlsa-rr option */ -#define TLSA_RR_DESC (danetool_opt_strs+1338) +#define TLSA_RR_DESC (danetool_opt_strs+1332) /** Upper-cased name for the tlsa-rr option */ -#define TLSA_RR_NAME (danetool_opt_strs+1392) +#define TLSA_RR_NAME (danetool_opt_strs+1386) /** Name string for the tlsa-rr option */ -#define TLSA_RR_name (danetool_opt_strs+1400) +#define TLSA_RR_name (danetool_opt_strs+1394) /** Other options that are required by the tlsa-rr option */ static int const aTlsa_RrMustList[] = { INDEX_OPT_HOST, NO_EQUIVALENT }; @@ -336,11 +336,11 @@ static int const aTlsa_RrMustList[] = { * host option description: */ /** Descriptive text for the host option */ -#define HOST_DESC (danetool_opt_strs+1408) +#define HOST_DESC (danetool_opt_strs+1402) /** Upper-cased name for the host option */ -#define HOST_NAME (danetool_opt_strs+1455) +#define HOST_NAME (danetool_opt_strs+1449) /** Name string for the host option */ -#define HOST_name (danetool_opt_strs+1460) +#define HOST_name (danetool_opt_strs+1454) /** Compiled in flag settings for the host option */ #define HOST_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -349,11 +349,11 @@ static int const aTlsa_RrMustList[] = { * proto option description: */ /** Descriptive text for the proto option */ -#define PROTO_DESC (danetool_opt_strs+1465) +#define PROTO_DESC (danetool_opt_strs+1459) /** Upper-cased name for the proto option */ -#define PROTO_NAME (danetool_opt_strs+1512) +#define PROTO_NAME (danetool_opt_strs+1506) /** Name string for the proto option */ -#define PROTO_name (danetool_opt_strs+1518) +#define PROTO_name (danetool_opt_strs+1512) /** Compiled in flag settings for the proto option */ #define PROTO_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -362,11 +362,11 @@ static int const aTlsa_RrMustList[] = { * port option description: */ /** Descriptive text for the port option */ -#define PORT_DESC (danetool_opt_strs+1524) +#define PORT_DESC (danetool_opt_strs+1518) /** Upper-cased name for the port option */ -#define PORT_NAME (danetool_opt_strs+1573) +#define PORT_NAME (danetool_opt_strs+1567) /** Name string for the port option */ -#define PORT_name (danetool_opt_strs+1578) +#define PORT_name (danetool_opt_strs+1572) /** Compiled in flag settings for the port option */ #define PORT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -375,10 +375,10 @@ static int const aTlsa_RrMustList[] = { * app-proto option description: */ /** Descriptive text for the app-proto option */ -#define APP_PROTO_DESC (danetool_opt_strs+1583) +#define APP_PROTO_DESC (danetool_opt_strs+1577) #define APP_PROTO_NAME NULL /** Unmodified name string for the app-proto option */ -#define APP_PROTO_name (danetool_opt_strs+1624) +#define APP_PROTO_name (danetool_opt_strs+1618) /** Compiled in flag settings for the app-proto option */ #define APP_PROTO_FLAGS (STARTTLS_PROTO_FLAGS | OPTST_ALIAS) @@ -386,11 +386,11 @@ static int const aTlsa_RrMustList[] = { * starttls-proto option description: */ /** Descriptive text for the starttls-proto option */ -#define STARTTLS_PROTO_DESC (danetool_opt_strs+1634) +#define STARTTLS_PROTO_DESC (danetool_opt_strs+1628) /** Upper-cased name for the starttls-proto option */ -#define STARTTLS_PROTO_NAME (danetool_opt_strs+1777) +#define STARTTLS_PROTO_NAME (danetool_opt_strs+1771) /** Name string for the starttls-proto option */ -#define STARTTLS_PROTO_name (danetool_opt_strs+1792) +#define STARTTLS_PROTO_name (danetool_opt_strs+1786) /** Compiled in flag settings for the starttls-proto option */ #define STARTTLS_PROTO_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -399,11 +399,11 @@ static int const aTlsa_RrMustList[] = { * ca option description: */ /** Descriptive text for the ca option */ -#define CA_DESC (danetool_opt_strs+1807) +#define CA_DESC (danetool_opt_strs+1801) /** Upper-cased name for the ca option */ -#define CA_NAME (danetool_opt_strs+1881) +#define CA_NAME (danetool_opt_strs+1875) /** Name string for the ca option */ -#define CA_name (danetool_opt_strs+1884) +#define CA_name (danetool_opt_strs+1878) /** Compiled in flag settings for the ca option */ #define CA_FLAGS (OPTST_DISABLED) @@ -411,11 +411,11 @@ static int const aTlsa_RrMustList[] = { * x509 option description: */ /** Descriptive text for the x509 option */ -#define X509_DESC (danetool_opt_strs+1887) +#define X509_DESC (danetool_opt_strs+1881) /** Upper-cased name for the x509 option */ -#define X509_NAME (danetool_opt_strs+1953) +#define X509_NAME (danetool_opt_strs+1947) /** Name string for the x509 option */ -#define X509_name (danetool_opt_strs+1958) +#define X509_name (danetool_opt_strs+1952) /** Compiled in flag settings for the x509 option */ #define X509_FLAGS (OPTST_DISABLED) @@ -423,10 +423,10 @@ static int const aTlsa_RrMustList[] = { * local option description: */ /** Descriptive text for the local option */ -#define LOCAL_DESC (danetool_opt_strs+1963) +#define LOCAL_DESC (danetool_opt_strs+1957) #define LOCAL_NAME NULL /** Unmodified name string for the local option */ -#define LOCAL_name (danetool_opt_strs+1996) +#define LOCAL_name (danetool_opt_strs+1990) /** Compiled in flag settings for the local option */ #define LOCAL_FLAGS (DOMAIN_FLAGS | OPTST_ALIAS) @@ -434,13 +434,13 @@ static int const aTlsa_RrMustList[] = { * domain option description: */ /** Descriptive text for the domain option */ -#define DOMAIN_DESC (danetool_opt_strs+2002) +#define DOMAIN_DESC (danetool_opt_strs+1996) /** Upper-cased name for the domain option */ -#define DOMAIN_NAME (danetool_opt_strs+2071) +#define DOMAIN_NAME (danetool_opt_strs+2065) /** disablement name for the domain option */ -#define NOT_DOMAIN_name (danetool_opt_strs+2078) +#define NOT_DOMAIN_name (danetool_opt_strs+2072) /** disablement prefix for the domain option */ -#define NOT_DOMAIN_PFX (danetool_opt_strs+2088) +#define NOT_DOMAIN_PFX (danetool_opt_strs+2082) /** Name string for the domain option */ #define DOMAIN_name (NOT_DOMAIN_name + 3) /** Compiled in flag settings for the domain option */ @@ -450,13 +450,13 @@ static int const aTlsa_RrMustList[] = { * local-dns option description: */ /** Descriptive text for the local-dns option */ -#define LOCAL_DNS_DESC (danetool_opt_strs+2091) +#define LOCAL_DNS_DESC (danetool_opt_strs+2085) /** Upper-cased name for the local-dns option */ -#define LOCAL_DNS_NAME (danetool_opt_strs+2137) +#define LOCAL_DNS_NAME (danetool_opt_strs+2131) /** disablement name for the local-dns option */ -#define NOT_LOCAL_DNS_name (danetool_opt_strs+2147) +#define NOT_LOCAL_DNS_name (danetool_opt_strs+2141) /** disablement prefix for the local-dns option */ -#define NOT_LOCAL_DNS_PFX (danetool_opt_strs+2088) +#define NOT_LOCAL_DNS_PFX (danetool_opt_strs+2082) /** Name string for the local-dns option */ #define LOCAL_DNS_name (NOT_LOCAL_DNS_name + 3) /** Compiled in flag settings for the local-dns option */ @@ -466,11 +466,11 @@ static int const aTlsa_RrMustList[] = { * insecure option description: */ /** Descriptive text for the insecure option */ -#define INSECURE_DESC (danetool_opt_strs+2160) +#define INSECURE_DESC (danetool_opt_strs+2154) /** Upper-cased name for the insecure option */ -#define INSECURE_NAME (danetool_opt_strs+2195) +#define INSECURE_NAME (danetool_opt_strs+2189) /** Name string for the insecure option */ -#define INSECURE_name (danetool_opt_strs+2204) +#define INSECURE_name (danetool_opt_strs+2198) /** Compiled in flag settings for the insecure option */ #define INSECURE_FLAGS (OPTST_DISABLED) @@ -478,13 +478,13 @@ static int const aTlsa_RrMustList[] = { * inder option description: */ /** Descriptive text for the inder option */ -#define INDER_DESC (danetool_opt_strs+2213) +#define INDER_DESC (danetool_opt_strs+2207) /** Upper-cased name for the inder option */ -#define INDER_NAME (danetool_opt_strs+2268) +#define INDER_NAME (danetool_opt_strs+2262) /** disablement name for the inder option */ -#define NOT_INDER_name (danetool_opt_strs+2274) +#define NOT_INDER_name (danetool_opt_strs+2268) /** disablement prefix for the inder option */ -#define NOT_INDER_PFX (danetool_opt_strs+2088) +#define NOT_INDER_PFX (danetool_opt_strs+2082) /** Name string for the inder option */ #define INDER_name (NOT_INDER_name + 3) /** Compiled in flag settings for the inder option */ @@ -494,10 +494,10 @@ static int const aTlsa_RrMustList[] = { * inraw option description: */ /** Descriptive text for the inraw option */ -#define INRAW_DESC (danetool_opt_strs+2283) +#define INRAW_DESC (danetool_opt_strs+2277) #define INRAW_NAME NULL /** Unmodified name string for the inraw option */ -#define INRAW_name (danetool_opt_strs+2315) +#define INRAW_name (danetool_opt_strs+2309) /** Compiled in flag settings for the inraw option */ #define INRAW_FLAGS (INDER_FLAGS | OPTST_ALIAS) @@ -505,13 +505,13 @@ static int const aTlsa_RrMustList[] = { * print-raw option description: */ /** Descriptive text for the print-raw option */ -#define PRINT_RAW_DESC (danetool_opt_strs+2321) +#define PRINT_RAW_DESC (danetool_opt_strs+2315) /** Upper-cased name for the print-raw option */ -#define PRINT_RAW_NAME (danetool_opt_strs+2364) +#define PRINT_RAW_NAME (danetool_opt_strs+2358) /** disablement name for the print-raw option */ -#define NOT_PRINT_RAW_name (danetool_opt_strs+2374) +#define NOT_PRINT_RAW_name (danetool_opt_strs+2368) /** disablement prefix for the print-raw option */ -#define NOT_PRINT_RAW_PFX (danetool_opt_strs+2088) +#define NOT_PRINT_RAW_PFX (danetool_opt_strs+2082) /** Name string for the print-raw option */ #define PRINT_RAW_name (NOT_PRINT_RAW_name + 3) /** Compiled in flag settings for the print-raw option */ @@ -521,22 +521,22 @@ static int const aTlsa_RrMustList[] = { * quiet option description: */ /** Descriptive text for the quiet option */ -#define QUIET_DESC (danetool_opt_strs+2387) +#define QUIET_DESC (danetool_opt_strs+2381) /** Upper-cased name for the quiet option */ -#define QUIET_NAME (danetool_opt_strs+2427) +#define QUIET_NAME (danetool_opt_strs+2421) /** Name string for the quiet option */ -#define QUIET_name (danetool_opt_strs+2433) +#define QUIET_name (danetool_opt_strs+2427) /** Compiled in flag settings for the quiet option */ #define QUIET_FLAGS (OPTST_DISABLED) /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (danetool_opt_strs+2439) -#define HELP_name (danetool_opt_strs+2483) +#define HELP_DESC (danetool_opt_strs+2433) +#define HELP_name (danetool_opt_strs+2477) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (danetool_opt_strs+2488) -#define MORE_HELP_name (danetool_opt_strs+2533) +#define MORE_HELP_DESC (danetool_opt_strs+2482) +#define MORE_HELP_name (danetool_opt_strs+2527) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -549,8 +549,8 @@ static int const aTlsa_RrMustList[] = { # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (danetool_opt_strs+2543) -#define VER_name (danetool_opt_strs+2579) +#define VER_DESC (danetool_opt_strs+2537) +#define VER_name (danetool_opt_strs+2573) /** * Declare option callback procedures */ @@ -937,21 +937,21 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of danetool. */ -#define zPROGNAME (danetool_opt_strs+2587) +#define zPROGNAME (danetool_opt_strs+2581) /** Reference to the title line for danetool usage. */ -#define zUsageTitle (danetool_opt_strs+2596) +#define zUsageTitle (danetool_opt_strs+2590) /** There is no danetool configuration file. */ #define zRcName NULL /** There are no directories to search for danetool config files. */ #define apzHomeList NULL /** The danetool program bug email address. */ -#define zBugsAddr (danetool_opt_strs+2682) +#define zBugsAddr (danetool_opt_strs+2676) /** Clarification/explanation of what danetool does. */ -#define zExplain (danetool_opt_strs+2702) +#define zExplain (danetool_opt_strs+2692) /** Extra detail explaining what danetool does. */ -#define zDetail (danetool_opt_strs+2704) +#define zDetail (danetool_opt_strs+2694) /** The full version string for danetool. */ -#define zFullVersion (danetool_opt_strs+2776) +#define zFullVersion (danetool_opt_strs+2766) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -963,7 +963,7 @@ static tOptDesc optDesc[OPTION_CT] = { #endif /* ENABLE_NLS */ #define danetool_full_usage (NULL) -#define danetool_short_usage (danetool_opt_strs+2795) +#define danetool_short_usage (danetool_opt_strs+2781) #endif /* not defined __doxygen__ */ @@ -1295,8 +1295,8 @@ static void bogus_function(void) { translate option names. */ /* referenced via danetoolOptions.pzCopyright */ - puts(_("danetool @VERSION@\n\ -Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n\ + puts(_("danetool 3.6.4\n\ +Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the GNU General Public License,\n\ version 3 or later <http://gnu.org/licenses/gpl.html>\n")); @@ -1416,7 +1416,7 @@ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n")); puts(_("Tool to generate and check DNS resource records for the DANE protocol.\n")); /* referenced via danetoolOptions.pzFullVersion */ - puts(_("danetool @VERSION@")); + puts(_("danetool 3.6.4")); /* referenced via danetoolOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/src/danetool-args.h.bak b/src/danetool-args.h.bak index f7717dbea7..8d535e11a6 100644 --- a/src/danetool-args.h.bak +++ b/src/danetool-args.h.bak @@ -19,7 +19,7 @@ * The danetool program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -100,9 +100,9 @@ typedef enum { /** count of all options for danetool */ #define OPTION_CT 30 /** danetool version */ -#define DANETOOL_VERSION "@VERSION@" +#define DANETOOL_VERSION "3.6.4" /** Full danetool version text */ -#define DANETOOL_FULL_VERSION "danetool @VERSION@" +#define DANETOOL_FULL_VERSION "danetool 3.6.4" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/src/ocsptool-args.c.bak b/src/ocsptool-args.c.bak index 31c4816e8f..3cf1db61ef 100644 --- a/src/ocsptool-args.c.bak +++ b/src/ocsptool-args.c.bak @@ -19,7 +19,7 @@ * The ocsptool program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -53,7 +53,7 @@ extern "C" { #endif extern FILE * option_usage_fp; #define zCopyright (ocsptool_opt_strs+0) -#define zLicenseDescrip (ocsptool_opt_strs+289) +#define zLicenseDescrip (ocsptool_opt_strs+283) #ifndef NULL @@ -63,13 +63,13 @@ extern FILE * option_usage_fp; /** * static const strings for ocsptool options */ -static char const ocsptool_opt_strs[2772] = -/* 0 */ "ocsptool @VERSION@\n" - "Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n" +static char const ocsptool_opt_strs[2758] = +/* 0 */ "ocsptool 3.6.4\n" + "Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the GNU General Public License,\n" "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0" -/* 289 */ "ocsptool is free software: you can redistribute it and/or modify it under\n" +/* 283 */ "ocsptool is free software: you can redistribute it and/or modify it under\n" "the terms of the GNU General Public License as published by the Free\n" "Software Foundation, either version 3 of the License, or (at your option)\n" "any later version.\n\n" @@ -79,101 +79,101 @@ static char const ocsptool_opt_strs[2772] = "details.\n\n" "You should have received a copy of the GNU General Public License along\n" "with this program. If not, see <http://www.gnu.org/licenses/>.\n\0" -/* 894 */ "Enable debugging\0" -/* 911 */ "DEBUG\0" -/* 917 */ "debug\0" -/* 923 */ "More verbose output\0" -/* 943 */ "VERBOSE\0" -/* 951 */ "verbose\0" -/* 959 */ "Input file\0" -/* 970 */ "INFILE\0" -/* 977 */ "infile\0" -/* 984 */ "Output file\0" -/* 996 */ "OUTFILE\0" -/* 1004 */ "outfile\0" -/* 1012 */ "Ask an OCSP/HTTP server on a certificate validity\0" -/* 1062 */ "ASK\0" -/* 1066 */ "ask\0" -/* 1070 */ "Verify response\0" -/* 1086 */ "VERIFY_RESPONSE\0" -/* 1102 */ "verify-response\0" -/* 1118 */ "Print information on a OCSP request\0" -/* 1154 */ "REQUEST_INFO\0" -/* 1167 */ "request-info\0" -/* 1180 */ "Print information on a OCSP response\0" -/* 1217 */ "RESPONSE_INFO\0" -/* 1231 */ "response-info\0" -/* 1245 */ "Generates an OCSP request\0" -/* 1271 */ "GENERATE_REQUEST\0" -/* 1288 */ "generate-request\0" -/* 1305 */ "Use (or not) a nonce to OCSP request\0" -/* 1342 */ "NONCE\0" -/* 1348 */ "no-nonce\0" -/* 1357 */ "no\0" -/* 1360 */ "Reads a set of certificates forming a chain from file\0" -/* 1414 */ "LOAD_CHAIN\0" -/* 1425 */ "load-chain\0" -/* 1436 */ "Reads issuer's certificate from file\0" -/* 1473 */ "LOAD_ISSUER\0" -/* 1485 */ "load-issuer\0" -/* 1497 */ "Reads the certificate to check from file\0" -/* 1538 */ "LOAD_CERT\0" -/* 1548 */ "load-cert\0" -/* 1558 */ "Read OCSP trust anchors from file\0" -/* 1592 */ "LOAD_TRUST\0" -/* 1603 */ "load-trust\0" -/* 1614 */ "Reads the OCSP response signer from file\0" -/* 1655 */ "LOAD_SIGNER\0" -/* 1667 */ "load-signer\0" -/* 1679 */ "Use DER format for input certificates and private keys\0" -/* 1734 */ "INDER\0" -/* 1740 */ "no-inder\0" -/* 1749 */ "Use DER format for output of responses (this is the default)\0" -/* 1810 */ "OUTDER\0" -/* 1817 */ "outder\0" -/* 1824 */ "Use PEM format for output of responses\0" -/* 1863 */ "OUTPEM\0" -/* 1870 */ "outpem\0" -/* 1877 */ "Reads the DER encoded OCSP request from file\0" -/* 1922 */ "LOAD_REQUEST\0" -/* 1935 */ "load-request\0" -/* 1948 */ "Reads the DER encoded OCSP response from file\0" -/* 1994 */ "LOAD_RESPONSE\0" -/* 2008 */ "load-response\0" -/* 2022 */ "Ignore any verification errors\0" -/* 2053 */ "IGNORE_ERRORS\0" -/* 2067 */ "ignore-errors\0" -/* 2081 */ "Allow broken algorithms, such as MD5 for verification\0" -/* 2135 */ "VERIFY_ALLOW_BROKEN\0" -/* 2155 */ "verify-allow-broken\0" -/* 2175 */ "display extended usage information and exit\0" -/* 2219 */ "help\0" -/* 2224 */ "extended usage information passed thru pager\0" -/* 2269 */ "more-help\0" -/* 2279 */ "output version information and exit\0" -/* 2315 */ "version\0" -/* 2323 */ "OCSPTOOL\0" -/* 2332 */ "ocsptool - GnuTLS OCSP tool\n" +/* 888 */ "Enable debugging\0" +/* 905 */ "DEBUG\0" +/* 911 */ "debug\0" +/* 917 */ "More verbose output\0" +/* 937 */ "VERBOSE\0" +/* 945 */ "verbose\0" +/* 953 */ "Input file\0" +/* 964 */ "INFILE\0" +/* 971 */ "infile\0" +/* 978 */ "Output file\0" +/* 990 */ "OUTFILE\0" +/* 998 */ "outfile\0" +/* 1006 */ "Ask an OCSP/HTTP server on a certificate validity\0" +/* 1056 */ "ASK\0" +/* 1060 */ "ask\0" +/* 1064 */ "Verify response\0" +/* 1080 */ "VERIFY_RESPONSE\0" +/* 1096 */ "verify-response\0" +/* 1112 */ "Print information on a OCSP request\0" +/* 1148 */ "REQUEST_INFO\0" +/* 1161 */ "request-info\0" +/* 1174 */ "Print information on a OCSP response\0" +/* 1211 */ "RESPONSE_INFO\0" +/* 1225 */ "response-info\0" +/* 1239 */ "Generates an OCSP request\0" +/* 1265 */ "GENERATE_REQUEST\0" +/* 1282 */ "generate-request\0" +/* 1299 */ "Use (or not) a nonce to OCSP request\0" +/* 1336 */ "NONCE\0" +/* 1342 */ "no-nonce\0" +/* 1351 */ "no\0" +/* 1354 */ "Reads a set of certificates forming a chain from file\0" +/* 1408 */ "LOAD_CHAIN\0" +/* 1419 */ "load-chain\0" +/* 1430 */ "Reads issuer's certificate from file\0" +/* 1467 */ "LOAD_ISSUER\0" +/* 1479 */ "load-issuer\0" +/* 1491 */ "Reads the certificate to check from file\0" +/* 1532 */ "LOAD_CERT\0" +/* 1542 */ "load-cert\0" +/* 1552 */ "Read OCSP trust anchors from file\0" +/* 1586 */ "LOAD_TRUST\0" +/* 1597 */ "load-trust\0" +/* 1608 */ "Reads the OCSP response signer from file\0" +/* 1649 */ "LOAD_SIGNER\0" +/* 1661 */ "load-signer\0" +/* 1673 */ "Use DER format for input certificates and private keys\0" +/* 1728 */ "INDER\0" +/* 1734 */ "no-inder\0" +/* 1743 */ "Use DER format for output of responses (this is the default)\0" +/* 1804 */ "OUTDER\0" +/* 1811 */ "outder\0" +/* 1818 */ "Use PEM format for output of responses\0" +/* 1857 */ "OUTPEM\0" +/* 1864 */ "outpem\0" +/* 1871 */ "Reads the DER encoded OCSP request from file\0" +/* 1916 */ "LOAD_REQUEST\0" +/* 1929 */ "load-request\0" +/* 1942 */ "Reads the DER encoded OCSP response from file\0" +/* 1988 */ "LOAD_RESPONSE\0" +/* 2002 */ "load-response\0" +/* 2016 */ "Ignore any verification errors\0" +/* 2047 */ "IGNORE_ERRORS\0" +/* 2061 */ "ignore-errors\0" +/* 2075 */ "Allow broken algorithms, such as MD5 for verification\0" +/* 2129 */ "VERIFY_ALLOW_BROKEN\0" +/* 2149 */ "verify-allow-broken\0" +/* 2169 */ "display extended usage information and exit\0" +/* 2213 */ "help\0" +/* 2218 */ "extended usage information passed thru pager\0" +/* 2263 */ "more-help\0" +/* 2273 */ "output version information and exit\0" +/* 2309 */ "version\0" +/* 2317 */ "OCSPTOOL\0" +/* 2326 */ "ocsptool - GnuTLS OCSP tool\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0" -/* 2418 */ "@PACKAGE_BUGREPORT@\0" -/* 2438 */ "\n\0" -/* 2440 */ "ocsptool is a program that can parse and print information about OCSP\n" +/* 2412 */ "bugs@gnutls.org\0" +/* 2428 */ "\n\0" +/* 2430 */ "ocsptool is a program that can parse and print information about OCSP\n" "requests/responses, generate requests and verify responses. Unlike other\n" "GnuTLS applications it outputs DER encoded structures by default unless the\n" "'--outpem' option is specified.\n\0" -/* 2693 */ "ocsptool @VERSION@\0" -/* 2712 */ "ocsptool [options]\n" +/* 2683 */ "ocsptool 3.6.4\0" +/* 2698 */ "ocsptool [options]\n" "ocsptool --help for usage instructions.\n"; /** * debug option description: */ /** Descriptive text for the debug option */ -#define DEBUG_DESC (ocsptool_opt_strs+894) +#define DEBUG_DESC (ocsptool_opt_strs+888) /** Upper-cased name for the debug option */ -#define DEBUG_NAME (ocsptool_opt_strs+911) +#define DEBUG_NAME (ocsptool_opt_strs+905) /** Name string for the debug option */ -#define DEBUG_name (ocsptool_opt_strs+917) +#define DEBUG_name (ocsptool_opt_strs+911) /** Compiled in flag settings for the debug option */ #define DEBUG_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -182,11 +182,11 @@ static char const ocsptool_opt_strs[2772] = * verbose option description: */ /** Descriptive text for the verbose option */ -#define VERBOSE_DESC (ocsptool_opt_strs+923) +#define VERBOSE_DESC (ocsptool_opt_strs+917) /** Upper-cased name for the verbose option */ -#define VERBOSE_NAME (ocsptool_opt_strs+943) +#define VERBOSE_NAME (ocsptool_opt_strs+937) /** Name string for the verbose option */ -#define VERBOSE_name (ocsptool_opt_strs+951) +#define VERBOSE_name (ocsptool_opt_strs+945) /** Compiled in flag settings for the verbose option */ #define VERBOSE_FLAGS (OPTST_DISABLED) @@ -194,11 +194,11 @@ static char const ocsptool_opt_strs[2772] = * infile option description: */ /** Descriptive text for the infile option */ -#define INFILE_DESC (ocsptool_opt_strs+959) +#define INFILE_DESC (ocsptool_opt_strs+953) /** Upper-cased name for the infile option */ -#define INFILE_NAME (ocsptool_opt_strs+970) +#define INFILE_NAME (ocsptool_opt_strs+964) /** Name string for the infile option */ -#define INFILE_name (ocsptool_opt_strs+977) +#define INFILE_name (ocsptool_opt_strs+971) /** Compiled in flag settings for the infile option */ #define INFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -207,11 +207,11 @@ static char const ocsptool_opt_strs[2772] = * outfile option description: */ /** Descriptive text for the outfile option */ -#define OUTFILE_DESC (ocsptool_opt_strs+984) +#define OUTFILE_DESC (ocsptool_opt_strs+978) /** Upper-cased name for the outfile option */ -#define OUTFILE_NAME (ocsptool_opt_strs+996) +#define OUTFILE_NAME (ocsptool_opt_strs+990) /** Name string for the outfile option */ -#define OUTFILE_name (ocsptool_opt_strs+1004) +#define OUTFILE_name (ocsptool_opt_strs+998) /** Compiled in flag settings for the outfile option */ #define OUTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -220,11 +220,11 @@ static char const ocsptool_opt_strs[2772] = * ask option description: */ /** Descriptive text for the ask option */ -#define ASK_DESC (ocsptool_opt_strs+1012) +#define ASK_DESC (ocsptool_opt_strs+1006) /** Upper-cased name for the ask option */ -#define ASK_NAME (ocsptool_opt_strs+1062) +#define ASK_NAME (ocsptool_opt_strs+1056) /** Name string for the ask option */ -#define ASK_name (ocsptool_opt_strs+1066) +#define ASK_name (ocsptool_opt_strs+1060) /** Compiled in flag settings for the ask option */ #define ASK_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | OPTST_ARG_OPTIONAL) @@ -233,11 +233,11 @@ static char const ocsptool_opt_strs[2772] = * verify-response option description: */ /** Descriptive text for the verify-response option */ -#define VERIFY_RESPONSE_DESC (ocsptool_opt_strs+1070) +#define VERIFY_RESPONSE_DESC (ocsptool_opt_strs+1064) /** Upper-cased name for the verify-response option */ -#define VERIFY_RESPONSE_NAME (ocsptool_opt_strs+1086) +#define VERIFY_RESPONSE_NAME (ocsptool_opt_strs+1080) /** Name string for the verify-response option */ -#define VERIFY_RESPONSE_name (ocsptool_opt_strs+1102) +#define VERIFY_RESPONSE_name (ocsptool_opt_strs+1096) /** Compiled in flag settings for the verify-response option */ #define VERIFY_RESPONSE_FLAGS (OPTST_DISABLED) @@ -245,11 +245,11 @@ static char const ocsptool_opt_strs[2772] = * request-info option description: */ /** Descriptive text for the request-info option */ -#define REQUEST_INFO_DESC (ocsptool_opt_strs+1118) +#define REQUEST_INFO_DESC (ocsptool_opt_strs+1112) /** Upper-cased name for the request-info option */ -#define REQUEST_INFO_NAME (ocsptool_opt_strs+1154) +#define REQUEST_INFO_NAME (ocsptool_opt_strs+1148) /** Name string for the request-info option */ -#define REQUEST_INFO_name (ocsptool_opt_strs+1167) +#define REQUEST_INFO_name (ocsptool_opt_strs+1161) /** Compiled in flag settings for the request-info option */ #define REQUEST_INFO_FLAGS (OPTST_DISABLED) @@ -257,11 +257,11 @@ static char const ocsptool_opt_strs[2772] = * response-info option description: */ /** Descriptive text for the response-info option */ -#define RESPONSE_INFO_DESC (ocsptool_opt_strs+1180) +#define RESPONSE_INFO_DESC (ocsptool_opt_strs+1174) /** Upper-cased name for the response-info option */ -#define RESPONSE_INFO_NAME (ocsptool_opt_strs+1217) +#define RESPONSE_INFO_NAME (ocsptool_opt_strs+1211) /** Name string for the response-info option */ -#define RESPONSE_INFO_name (ocsptool_opt_strs+1231) +#define RESPONSE_INFO_name (ocsptool_opt_strs+1225) /** Compiled in flag settings for the response-info option */ #define RESPONSE_INFO_FLAGS (OPTST_DISABLED) @@ -269,11 +269,11 @@ static char const ocsptool_opt_strs[2772] = * generate-request option description: */ /** Descriptive text for the generate-request option */ -#define GENERATE_REQUEST_DESC (ocsptool_opt_strs+1245) +#define GENERATE_REQUEST_DESC (ocsptool_opt_strs+1239) /** Upper-cased name for the generate-request option */ -#define GENERATE_REQUEST_NAME (ocsptool_opt_strs+1271) +#define GENERATE_REQUEST_NAME (ocsptool_opt_strs+1265) /** Name string for the generate-request option */ -#define GENERATE_REQUEST_name (ocsptool_opt_strs+1288) +#define GENERATE_REQUEST_name (ocsptool_opt_strs+1282) /** Compiled in flag settings for the generate-request option */ #define GENERATE_REQUEST_FLAGS (OPTST_DISABLED) @@ -281,13 +281,13 @@ static char const ocsptool_opt_strs[2772] = * nonce option description: */ /** Descriptive text for the nonce option */ -#define NONCE_DESC (ocsptool_opt_strs+1305) +#define NONCE_DESC (ocsptool_opt_strs+1299) /** Upper-cased name for the nonce option */ -#define NONCE_NAME (ocsptool_opt_strs+1342) +#define NONCE_NAME (ocsptool_opt_strs+1336) /** disablement name for the nonce option */ -#define NOT_NONCE_name (ocsptool_opt_strs+1348) +#define NOT_NONCE_name (ocsptool_opt_strs+1342) /** disablement prefix for the nonce option */ -#define NOT_NONCE_PFX (ocsptool_opt_strs+1357) +#define NOT_NONCE_PFX (ocsptool_opt_strs+1351) /** Name string for the nonce option */ #define NONCE_name (NOT_NONCE_name + 3) /** Compiled in flag settings for the nonce option */ @@ -297,11 +297,11 @@ static char const ocsptool_opt_strs[2772] = * load-chain option description: */ /** Descriptive text for the load-chain option */ -#define LOAD_CHAIN_DESC (ocsptool_opt_strs+1360) +#define LOAD_CHAIN_DESC (ocsptool_opt_strs+1354) /** Upper-cased name for the load-chain option */ -#define LOAD_CHAIN_NAME (ocsptool_opt_strs+1414) +#define LOAD_CHAIN_NAME (ocsptool_opt_strs+1408) /** Name string for the load-chain option */ -#define LOAD_CHAIN_name (ocsptool_opt_strs+1425) +#define LOAD_CHAIN_name (ocsptool_opt_strs+1419) /** Compiled in flag settings for the load-chain option */ #define LOAD_CHAIN_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -310,11 +310,11 @@ static char const ocsptool_opt_strs[2772] = * load-issuer option description: */ /** Descriptive text for the load-issuer option */ -#define LOAD_ISSUER_DESC (ocsptool_opt_strs+1436) +#define LOAD_ISSUER_DESC (ocsptool_opt_strs+1430) /** Upper-cased name for the load-issuer option */ -#define LOAD_ISSUER_NAME (ocsptool_opt_strs+1473) +#define LOAD_ISSUER_NAME (ocsptool_opt_strs+1467) /** Name string for the load-issuer option */ -#define LOAD_ISSUER_name (ocsptool_opt_strs+1485) +#define LOAD_ISSUER_name (ocsptool_opt_strs+1479) /** Compiled in flag settings for the load-issuer option */ #define LOAD_ISSUER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -323,11 +323,11 @@ static char const ocsptool_opt_strs[2772] = * load-cert option description: */ /** Descriptive text for the load-cert option */ -#define LOAD_CERT_DESC (ocsptool_opt_strs+1497) +#define LOAD_CERT_DESC (ocsptool_opt_strs+1491) /** Upper-cased name for the load-cert option */ -#define LOAD_CERT_NAME (ocsptool_opt_strs+1538) +#define LOAD_CERT_NAME (ocsptool_opt_strs+1532) /** Name string for the load-cert option */ -#define LOAD_CERT_name (ocsptool_opt_strs+1548) +#define LOAD_CERT_name (ocsptool_opt_strs+1542) /** Compiled in flag settings for the load-cert option */ #define LOAD_CERT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -337,11 +337,11 @@ static char const ocsptool_opt_strs[2772] = * "Must also have options" and "Incompatible options": */ /** Descriptive text for the load-trust option */ -#define LOAD_TRUST_DESC (ocsptool_opt_strs+1558) +#define LOAD_TRUST_DESC (ocsptool_opt_strs+1552) /** Upper-cased name for the load-trust option */ -#define LOAD_TRUST_NAME (ocsptool_opt_strs+1592) +#define LOAD_TRUST_NAME (ocsptool_opt_strs+1586) /** Name string for the load-trust option */ -#define LOAD_TRUST_name (ocsptool_opt_strs+1603) +#define LOAD_TRUST_name (ocsptool_opt_strs+1597) /** Other options that appear in conjunction with the load-trust option */ static int const aLoad_TrustCantList[] = { INDEX_OPT_LOAD_SIGNER, NO_EQUIVALENT }; @@ -354,11 +354,11 @@ static int const aLoad_TrustCantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the load-signer option */ -#define LOAD_SIGNER_DESC (ocsptool_opt_strs+1614) +#define LOAD_SIGNER_DESC (ocsptool_opt_strs+1608) /** Upper-cased name for the load-signer option */ -#define LOAD_SIGNER_NAME (ocsptool_opt_strs+1655) +#define LOAD_SIGNER_NAME (ocsptool_opt_strs+1649) /** Name string for the load-signer option */ -#define LOAD_SIGNER_name (ocsptool_opt_strs+1667) +#define LOAD_SIGNER_name (ocsptool_opt_strs+1661) /** Other options that appear in conjunction with the load-signer option */ static int const aLoad_SignerCantList[] = { INDEX_OPT_LOAD_TRUST, NO_EQUIVALENT }; @@ -370,13 +370,13 @@ static int const aLoad_SignerCantList[] = { * inder option description: */ /** Descriptive text for the inder option */ -#define INDER_DESC (ocsptool_opt_strs+1679) +#define INDER_DESC (ocsptool_opt_strs+1673) /** Upper-cased name for the inder option */ -#define INDER_NAME (ocsptool_opt_strs+1734) +#define INDER_NAME (ocsptool_opt_strs+1728) /** disablement name for the inder option */ -#define NOT_INDER_name (ocsptool_opt_strs+1740) +#define NOT_INDER_name (ocsptool_opt_strs+1734) /** disablement prefix for the inder option */ -#define NOT_INDER_PFX (ocsptool_opt_strs+1357) +#define NOT_INDER_PFX (ocsptool_opt_strs+1351) /** Name string for the inder option */ #define INDER_name (NOT_INDER_name + 3) /** Compiled in flag settings for the inder option */ @@ -386,11 +386,11 @@ static int const aLoad_SignerCantList[] = { * outder option description: */ /** Descriptive text for the outder option */ -#define OUTDER_DESC (ocsptool_opt_strs+1749) +#define OUTDER_DESC (ocsptool_opt_strs+1743) /** Upper-cased name for the outder option */ -#define OUTDER_NAME (ocsptool_opt_strs+1810) +#define OUTDER_NAME (ocsptool_opt_strs+1804) /** Name string for the outder option */ -#define OUTDER_name (ocsptool_opt_strs+1817) +#define OUTDER_name (ocsptool_opt_strs+1811) /** Compiled in flag settings for the outder option */ #define OUTDER_FLAGS (OPTST_DISABLED) @@ -398,11 +398,11 @@ static int const aLoad_SignerCantList[] = { * outpem option description: */ /** Descriptive text for the outpem option */ -#define OUTPEM_DESC (ocsptool_opt_strs+1824) +#define OUTPEM_DESC (ocsptool_opt_strs+1818) /** Upper-cased name for the outpem option */ -#define OUTPEM_NAME (ocsptool_opt_strs+1863) +#define OUTPEM_NAME (ocsptool_opt_strs+1857) /** Name string for the outpem option */ -#define OUTPEM_name (ocsptool_opt_strs+1870) +#define OUTPEM_name (ocsptool_opt_strs+1864) /** Compiled in flag settings for the outpem option */ #define OUTPEM_FLAGS (OPTST_DISABLED) @@ -410,11 +410,11 @@ static int const aLoad_SignerCantList[] = { * load-request option description: */ /** Descriptive text for the load-request option */ -#define LOAD_REQUEST_DESC (ocsptool_opt_strs+1877) +#define LOAD_REQUEST_DESC (ocsptool_opt_strs+1871) /** Upper-cased name for the load-request option */ -#define LOAD_REQUEST_NAME (ocsptool_opt_strs+1922) +#define LOAD_REQUEST_NAME (ocsptool_opt_strs+1916) /** Name string for the load-request option */ -#define LOAD_REQUEST_name (ocsptool_opt_strs+1935) +#define LOAD_REQUEST_name (ocsptool_opt_strs+1929) /** Compiled in flag settings for the load-request option */ #define LOAD_REQUEST_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -423,11 +423,11 @@ static int const aLoad_SignerCantList[] = { * load-response option description: */ /** Descriptive text for the load-response option */ -#define LOAD_RESPONSE_DESC (ocsptool_opt_strs+1948) +#define LOAD_RESPONSE_DESC (ocsptool_opt_strs+1942) /** Upper-cased name for the load-response option */ -#define LOAD_RESPONSE_NAME (ocsptool_opt_strs+1994) +#define LOAD_RESPONSE_NAME (ocsptool_opt_strs+1988) /** Name string for the load-response option */ -#define LOAD_RESPONSE_name (ocsptool_opt_strs+2008) +#define LOAD_RESPONSE_name (ocsptool_opt_strs+2002) /** Compiled in flag settings for the load-response option */ #define LOAD_RESPONSE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -436,11 +436,11 @@ static int const aLoad_SignerCantList[] = { * ignore-errors option description: */ /** Descriptive text for the ignore-errors option */ -#define IGNORE_ERRORS_DESC (ocsptool_opt_strs+2022) +#define IGNORE_ERRORS_DESC (ocsptool_opt_strs+2016) /** Upper-cased name for the ignore-errors option */ -#define IGNORE_ERRORS_NAME (ocsptool_opt_strs+2053) +#define IGNORE_ERRORS_NAME (ocsptool_opt_strs+2047) /** Name string for the ignore-errors option */ -#define IGNORE_ERRORS_name (ocsptool_opt_strs+2067) +#define IGNORE_ERRORS_name (ocsptool_opt_strs+2061) /** Compiled in flag settings for the ignore-errors option */ #define IGNORE_ERRORS_FLAGS (OPTST_DISABLED) @@ -448,22 +448,22 @@ static int const aLoad_SignerCantList[] = { * verify-allow-broken option description: */ /** Descriptive text for the verify-allow-broken option */ -#define VERIFY_ALLOW_BROKEN_DESC (ocsptool_opt_strs+2081) +#define VERIFY_ALLOW_BROKEN_DESC (ocsptool_opt_strs+2075) /** Upper-cased name for the verify-allow-broken option */ -#define VERIFY_ALLOW_BROKEN_NAME (ocsptool_opt_strs+2135) +#define VERIFY_ALLOW_BROKEN_NAME (ocsptool_opt_strs+2129) /** Name string for the verify-allow-broken option */ -#define VERIFY_ALLOW_BROKEN_name (ocsptool_opt_strs+2155) +#define VERIFY_ALLOW_BROKEN_name (ocsptool_opt_strs+2149) /** Compiled in flag settings for the verify-allow-broken option */ #define VERIFY_ALLOW_BROKEN_FLAGS (OPTST_DISABLED) /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (ocsptool_opt_strs+2175) -#define HELP_name (ocsptool_opt_strs+2219) +#define HELP_DESC (ocsptool_opt_strs+2169) +#define HELP_name (ocsptool_opt_strs+2213) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (ocsptool_opt_strs+2224) -#define MORE_HELP_name (ocsptool_opt_strs+2269) +#define MORE_HELP_DESC (ocsptool_opt_strs+2218) +#define MORE_HELP_name (ocsptool_opt_strs+2263) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -476,8 +476,8 @@ static int const aLoad_SignerCantList[] = { # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (ocsptool_opt_strs+2279) -#define VER_name (ocsptool_opt_strs+2315) +#define VER_DESC (ocsptool_opt_strs+2273) +#define VER_name (ocsptool_opt_strs+2309) /** * Declare option callback procedures */ @@ -806,21 +806,21 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of ocsptool. */ -#define zPROGNAME (ocsptool_opt_strs+2323) +#define zPROGNAME (ocsptool_opt_strs+2317) /** Reference to the title line for ocsptool usage. */ -#define zUsageTitle (ocsptool_opt_strs+2332) +#define zUsageTitle (ocsptool_opt_strs+2326) /** There is no ocsptool configuration file. */ #define zRcName NULL /** There are no directories to search for ocsptool config files. */ #define apzHomeList NULL /** The ocsptool program bug email address. */ -#define zBugsAddr (ocsptool_opt_strs+2418) +#define zBugsAddr (ocsptool_opt_strs+2412) /** Clarification/explanation of what ocsptool does. */ -#define zExplain (ocsptool_opt_strs+2438) +#define zExplain (ocsptool_opt_strs+2428) /** Extra detail explaining what ocsptool does. */ -#define zDetail (ocsptool_opt_strs+2440) +#define zDetail (ocsptool_opt_strs+2430) /** The full version string for ocsptool. */ -#define zFullVersion (ocsptool_opt_strs+2693) +#define zFullVersion (ocsptool_opt_strs+2683) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -832,7 +832,7 @@ static tOptDesc optDesc[OPTION_CT] = { #endif /* ENABLE_NLS */ #define ocsptool_full_usage (NULL) -#define ocsptool_short_usage (ocsptool_opt_strs+2712) +#define ocsptool_short_usage (ocsptool_opt_strs+2698) #endif /* not defined __doxygen__ */ @@ -1286,8 +1286,8 @@ static void bogus_function(void) { translate option names. */ /* referenced via ocsptoolOptions.pzCopyright */ - puts(_("ocsptool @VERSION@\n\ -Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n\ + puts(_("ocsptool 3.6.4\n\ +Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the GNU General Public License,\n\ version 3 or later <http://gnu.org/licenses/gpl.html>\n")); @@ -1393,7 +1393,7 @@ GnuTLS applications it outputs DER encoded structures by default unless the\n\ '--outpem' option is specified.\n")); /* referenced via ocsptoolOptions.pzFullVersion */ - puts(_("ocsptool @VERSION@")); + puts(_("ocsptool 3.6.4")); /* referenced via ocsptoolOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/src/ocsptool-args.h.bak b/src/ocsptool-args.h.bak index 15f2d34ad8..45275e0368 100644 --- a/src/ocsptool-args.h.bak +++ b/src/ocsptool-args.h.bak @@ -19,7 +19,7 @@ * The ocsptool program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -95,9 +95,9 @@ typedef enum { /** count of all options for ocsptool */ #define OPTION_CT 25 /** ocsptool version */ -#define OCSPTOOL_VERSION "@VERSION@" +#define OCSPTOOL_VERSION "3.6.4" /** Full ocsptool version text */ -#define OCSPTOOL_FULL_VERSION "ocsptool @VERSION@" +#define OCSPTOOL_FULL_VERSION "ocsptool 3.6.4" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/src/p11tool-args.c.bak b/src/p11tool-args.c.bak index 549630c20c..1c457ce91c 100644 --- a/src/p11tool-args.c.bak +++ b/src/p11tool-args.c.bak @@ -19,7 +19,7 @@ * The p11tool program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -53,7 +53,7 @@ extern "C" { #endif extern FILE * option_usage_fp; #define zCopyright (p11tool_opt_strs+0) -#define zLicenseDescrip (p11tool_opt_strs+288) +#define zLicenseDescrip (p11tool_opt_strs+282) #ifndef NULL @@ -63,13 +63,13 @@ extern FILE * option_usage_fp; /** * static const strings for p11tool options */ -static char const p11tool_opt_strs[5995] = -/* 0 */ "p11tool @VERSION@\n" - "Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n" +static char const p11tool_opt_strs[5982] = +/* 0 */ "p11tool 3.6.4\n" + "Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the GNU General Public License,\n" "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0" -/* 288 */ "p11tool is free software: you can redistribute it and/or modify it under\n" +/* 282 */ "p11tool is free software: you can redistribute it and/or modify it under\n" "the terms of the GNU General Public License as published by the Free\n" "Software Foundation, either version 3 of the License, or (at your option)\n" "any later version.\n\n" @@ -79,216 +79,216 @@ static char const p11tool_opt_strs[5995] = "details.\n\n" "You should have received a copy of the GNU General Public License along\n" "with this program. If not, see <http://www.gnu.org/licenses/>.\n\0" -/* 891 */ "Tokens:\0" -/* 899 */ "List all available tokens\0" -/* 925 */ "LIST_TOKENS\0" -/* 937 */ "list-tokens\0" -/* 949 */ "List the URLs available tokens\0" -/* 980 */ "LIST_TOKEN_URLS\0" -/* 996 */ "list-token-urls\0" -/* 1012 */ "List all available mechanisms in a token\0" -/* 1053 */ "LIST_MECHANISMS\0" -/* 1069 */ "list-mechanisms\0" -/* 1085 */ "Initializes a PKCS #11 token\0" -/* 1114 */ "INITIALIZE\0" -/* 1125 */ "initialize\0" -/* 1136 */ "Initializes/Resets a PKCS #11 token user PIN\0" -/* 1181 */ "INITIALIZE_PIN\0" -/* 1196 */ "initialize-pin\0" -/* 1211 */ "Initializes/Resets a PKCS #11 token security officer PIN\0" -/* 1268 */ "INITIALIZE_SO_PIN\0" -/* 1286 */ "initialize-so-pin\0" -/* 1304 */ "Specify the PIN to use on token operations\0" -/* 1347 */ "SET_PIN\0" -/* 1355 */ "set-pin\0" -/* 1363 */ "Specify the Security Officer's PIN to use on token initialization\0" -/* 1429 */ "SET_SO_PIN\0" -/* 1440 */ "set-so-pin\0" -/* 1451 */ "Object listing:\0" -/* 1467 */ "List all available objects in a token\0" -/* 1505 */ "LIST_ALL\0" -/* 1514 */ "list-all\0" -/* 1523 */ "List all available certificates in a token\0" -/* 1566 */ "LIST_ALL_CERTS\0" -/* 1581 */ "list-all-certs\0" -/* 1596 */ "List all certificates that have an associated private key\0" -/* 1654 */ "LIST_CERTS\0" -/* 1665 */ "list-certs\0" -/* 1676 */ "List all available private keys in a token\0" -/* 1719 */ "LIST_ALL_PRIVKEYS\0" -/* 1737 */ "list-all-privkeys\0" -/* 1755 */ "an alias for the 'list-all-privkeys' option\0" -/* 1799 */ "list-privkeys\0" -/* 1813 */ "list-keys\0" -/* 1823 */ "List all available certificates marked as trusted\0" -/* 1873 */ "LIST_ALL_TRUSTED\0" -/* 1890 */ "list-all-trusted\0" -/* 1907 */ "Export the object specified by the URL\0" -/* 1946 */ "EXPORT\0" -/* 1953 */ "export\0" -/* 1960 */ "Export the certificate object specified by the URL\0" -/* 2011 */ "EXPORT_STAPLED\0" -/* 2026 */ "export-stapled\0" -/* 2041 */ "Export the certificate specified by the URL and its chain of trust\0" -/* 2108 */ "EXPORT_CHAIN\0" -/* 2121 */ "export-chain\0" -/* 2134 */ "Export the public key for a private key\0" -/* 2174 */ "EXPORT_PUBKEY\0" -/* 2188 */ "export-pubkey\0" -/* 2202 */ "List information on an available object in a token\0" -/* 2253 */ "INFO\0" -/* 2258 */ "info\0" -/* 2263 */ "an alias for the 'mark-trusted' option\0" -/* 2302 */ "trusted\0" -/* 2310 */ "an alias for the 'mark-distrusted' option\0" -/* 2352 */ "distrusted\0" -/* 2363 */ "Key generation:\0" -/* 2379 */ "Generate private-public key pair of given type\0" -/* 2426 */ "GENERATE_PRIVKEY\0" -/* 2443 */ "generate-privkey\0" -/* 2460 */ "Generate an RSA private-public key pair (deprecated)\0" -/* 2513 */ "GENERATE_RSA\0" -/* 2526 */ "generate-rsa\0" -/* 2539 */ "Generate a DSA private-public key pair (deprecated)\0" -/* 2591 */ "GENERATE_DSA\0" -/* 2604 */ "generate-dsa\0" -/* 2617 */ "Generate an ECDSA private-public key pair (deprecated)\0" -/* 2672 */ "GENERATE_ECC\0" -/* 2685 */ "generate-ecc\0" -/* 2698 */ "Specify the number of bits for the key generate\0" -/* 2746 */ "BITS\0" -/* 2751 */ "bits\0" -/* 2756 */ "Specify the curve used for EC key generation\0" -/* 2801 */ "CURVE\0" -/* 2807 */ "curve\0" -/* 2813 */ "Specify the security level\0" -/* 2840 */ "SEC_PARAM\0" -/* 2850 */ "sec-param\0" -/* 2860 */ "Writing objects:\0" -/* 2877 */ "Set the CKA_ID (in hex) for the specified by the URL object\0" -/* 2937 */ "SET_ID\0" -/* 2944 */ "set-id\0" -/* 2951 */ "Set the CKA_LABEL for the specified by the URL object\0" -/* 3005 */ "SET_LABEL\0" -/* 3015 */ "set-label\0" -/* 3025 */ "Writes the loaded objects to a PKCS #11 token\0" -/* 3071 */ "WRITE\0" -/* 3077 */ "write\0" -/* 3083 */ "Deletes the objects matching the given PKCS #11 URL\0" -/* 3135 */ "DELETE\0" -/* 3142 */ "delete\0" -/* 3149 */ "Sets a label for the write operation\0" -/* 3186 */ "LABEL\0" -/* 3192 */ "label\0" -/* 3198 */ "Sets an ID for the write operation\0" -/* 3233 */ "ID\0" -/* 3236 */ "id\0" -/* 3239 */ "Marks the generated key to be a wrapping key\0" -/* 3284 */ "MARK_WRAP\0" -/* 3294 */ "no-mark-wrap\0" -/* 3307 */ "no\0" -/* 3310 */ "Marks the object to be written as trusted\0" -/* 3352 */ "MARK_TRUSTED\0" -/* 3365 */ "no-mark-trusted\0" -/* 3381 */ "When retrieving objects, it requires the objects to be distrusted\n" +/* 885 */ "Tokens:\0" +/* 893 */ "List all available tokens\0" +/* 919 */ "LIST_TOKENS\0" +/* 931 */ "list-tokens\0" +/* 943 */ "List the URLs available tokens\0" +/* 974 */ "LIST_TOKEN_URLS\0" +/* 990 */ "list-token-urls\0" +/* 1006 */ "List all available mechanisms in a token\0" +/* 1047 */ "LIST_MECHANISMS\0" +/* 1063 */ "list-mechanisms\0" +/* 1079 */ "Initializes a PKCS #11 token\0" +/* 1108 */ "INITIALIZE\0" +/* 1119 */ "initialize\0" +/* 1130 */ "Initializes/Resets a PKCS #11 token user PIN\0" +/* 1175 */ "INITIALIZE_PIN\0" +/* 1190 */ "initialize-pin\0" +/* 1205 */ "Initializes/Resets a PKCS #11 token security officer PIN.\0" +/* 1263 */ "INITIALIZE_SO_PIN\0" +/* 1281 */ "initialize-so-pin\0" +/* 1299 */ "Specify the PIN to use on token operations\0" +/* 1342 */ "SET_PIN\0" +/* 1350 */ "set-pin\0" +/* 1358 */ "Specify the Security Officer's PIN to use on token initialization\0" +/* 1424 */ "SET_SO_PIN\0" +/* 1435 */ "set-so-pin\0" +/* 1446 */ "Object listing:\0" +/* 1462 */ "List all available objects in a token\0" +/* 1500 */ "LIST_ALL\0" +/* 1509 */ "list-all\0" +/* 1518 */ "List all available certificates in a token\0" +/* 1561 */ "LIST_ALL_CERTS\0" +/* 1576 */ "list-all-certs\0" +/* 1591 */ "List all certificates that have an associated private key\0" +/* 1649 */ "LIST_CERTS\0" +/* 1660 */ "list-certs\0" +/* 1671 */ "List all available private keys in a token\0" +/* 1714 */ "LIST_ALL_PRIVKEYS\0" +/* 1732 */ "list-all-privkeys\0" +/* 1750 */ "an alias for the 'list-all-privkeys' option\0" +/* 1794 */ "list-privkeys\0" +/* 1808 */ "list-keys\0" +/* 1818 */ "List all available certificates marked as trusted\0" +/* 1868 */ "LIST_ALL_TRUSTED\0" +/* 1885 */ "list-all-trusted\0" +/* 1902 */ "Export the object specified by the URL\0" +/* 1941 */ "EXPORT\0" +/* 1948 */ "export\0" +/* 1955 */ "Export the certificate object specified by the URL\0" +/* 2006 */ "EXPORT_STAPLED\0" +/* 2021 */ "export-stapled\0" +/* 2036 */ "Export the certificate specified by the URL and its chain of trust\0" +/* 2103 */ "EXPORT_CHAIN\0" +/* 2116 */ "export-chain\0" +/* 2129 */ "Export the public key for a private key\0" +/* 2169 */ "EXPORT_PUBKEY\0" +/* 2183 */ "export-pubkey\0" +/* 2197 */ "List information on an available object in a token\0" +/* 2248 */ "INFO\0" +/* 2253 */ "info\0" +/* 2258 */ "an alias for the 'mark-trusted' option\0" +/* 2297 */ "trusted\0" +/* 2305 */ "an alias for the 'mark-distrusted' option\0" +/* 2347 */ "distrusted\0" +/* 2358 */ "Key generation:\0" +/* 2374 */ "Generate private-public key pair of given type\0" +/* 2421 */ "GENERATE_PRIVKEY\0" +/* 2438 */ "generate-privkey\0" +/* 2455 */ "Generate an RSA private-public key pair (deprecated)\0" +/* 2508 */ "GENERATE_RSA\0" +/* 2521 */ "generate-rsa\0" +/* 2534 */ "Generate a DSA private-public key pair (deprecated)\0" +/* 2586 */ "GENERATE_DSA\0" +/* 2599 */ "generate-dsa\0" +/* 2612 */ "Generate an ECDSA private-public key pair (deprecated)\0" +/* 2667 */ "GENERATE_ECC\0" +/* 2680 */ "generate-ecc\0" +/* 2693 */ "Specify the number of bits for the key generate\0" +/* 2741 */ "BITS\0" +/* 2746 */ "bits\0" +/* 2751 */ "Specify the curve used for EC key generation\0" +/* 2796 */ "CURVE\0" +/* 2802 */ "curve\0" +/* 2808 */ "Specify the security level\0" +/* 2835 */ "SEC_PARAM\0" +/* 2845 */ "sec-param\0" +/* 2855 */ "Writing objects:\0" +/* 2872 */ "Set the CKA_ID (in hex) for the specified by the URL object\0" +/* 2932 */ "SET_ID\0" +/* 2939 */ "set-id\0" +/* 2946 */ "Set the CKA_LABEL for the specified by the URL object\0" +/* 3000 */ "SET_LABEL\0" +/* 3010 */ "set-label\0" +/* 3020 */ "Writes the loaded objects to a PKCS #11 token\0" +/* 3066 */ "WRITE\0" +/* 3072 */ "write\0" +/* 3078 */ "Deletes the objects matching the given PKCS #11 URL\0" +/* 3130 */ "DELETE\0" +/* 3137 */ "delete\0" +/* 3144 */ "Sets a label for the write operation\0" +/* 3181 */ "LABEL\0" +/* 3187 */ "label\0" +/* 3193 */ "Sets an ID for the write operation\0" +/* 3228 */ "ID\0" +/* 3231 */ "id\0" +/* 3234 */ "Marks the generated key to be a wrapping key\0" +/* 3279 */ "MARK_WRAP\0" +/* 3289 */ "no-mark-wrap\0" +/* 3302 */ "no\0" +/* 3305 */ "Marks the object to be written as trusted\0" +/* 3347 */ "MARK_TRUSTED\0" +/* 3360 */ "no-mark-trusted\0" +/* 3376 */ "When retrieving objects, it requires the objects to be distrusted\n" "(blacklisted)\0" -/* 3461 */ "MARK_DISTRUSTED\0" -/* 3477 */ "mark-distrusted\0" -/* 3493 */ "Marks the object to be written for decryption\0" -/* 3539 */ "MARK_DECRYPT\0" -/* 3552 */ "no-mark-decrypt\0" -/* 3568 */ "Marks the object to be written for signature generation\0" -/* 3624 */ "MARK_SIGN\0" -/* 3634 */ "no-mark-sign\0" -/* 3647 */ "Marks the object to be written as a CA\0" -/* 3686 */ "MARK_CA\0" -/* 3694 */ "no-mark-ca\0" -/* 3705 */ "Marks the object to be written as private\0" -/* 3747 */ "MARK_PRIVATE\0" -/* 3760 */ "no-mark-private\0" -/* 3776 */ "an alias for the 'mark-ca' option\0" -/* 3810 */ "ca\0" -/* 3813 */ "an alias for the 'mark-private' option\0" -/* 3852 */ "private\0" -/* 3860 */ "Provide a hex encoded secret key\0" -/* 3893 */ "SECRET_KEY\0" -/* 3904 */ "secret-key\0" -/* 3915 */ "Private key file to use\0" -/* 3939 */ "LOAD_PRIVKEY\0" -/* 3952 */ "load-privkey\0" -/* 3965 */ "Public key file to use\0" -/* 3988 */ "LOAD_PUBKEY\0" -/* 4000 */ "load-pubkey\0" -/* 4012 */ "Certificate file to use\0" -/* 4036 */ "LOAD_CERTIFICATE\0" -/* 4053 */ "load-certificate\0" -/* 4070 */ "Other options:\0" -/* 4085 */ "Enable debugging\0" -/* 4102 */ "DEBUG\0" -/* 4108 */ "debug\0" -/* 4114 */ "Output file\0" -/* 4126 */ "OUTFILE\0" -/* 4134 */ "outfile\0" -/* 4142 */ "Force (user) login to token\0" -/* 4170 */ "LOGIN\0" -/* 4176 */ "no-login\0" -/* 4185 */ "Force security officer login to token\0" -/* 4223 */ "SO_LOGIN\0" -/* 4232 */ "no-so-login\0" -/* 4244 */ "an alias for the 'so-login' option\0" -/* 4279 */ "admin-login\0" -/* 4291 */ "Tests the signature operation of the provided object\0" -/* 4344 */ "TEST_SIGN\0" -/* 4354 */ "test-sign\0" -/* 4364 */ "Sign with a specific signature algorithm\0" -/* 4405 */ "SIGN_PARAMS\0" -/* 4417 */ "sign-params\0" -/* 4429 */ "Hash algorithm to use for signing\0" -/* 4463 */ "HASH\0" -/* 4468 */ "hash\0" -/* 4473 */ "Generate random data\0" -/* 4494 */ "GENERATE_RANDOM\0" -/* 4510 */ "generate-random\0" -/* 4526 */ "Use PKCS #8 format for private keys\0" -/* 4562 */ "PKCS8\0" -/* 4568 */ "pkcs8\0" -/* 4574 */ "Use DER/RAW format for input\0" -/* 4603 */ "INDER\0" -/* 4609 */ "no-inder\0" -/* 4618 */ "an alias for the 'inder' option\0" -/* 4650 */ "inraw\0" -/* 4656 */ "Use DER format for output certificates, private keys, and DH parameters\0" -/* 4728 */ "OUTDER\0" -/* 4735 */ "no-outder\0" -/* 4745 */ "an alias for the 'outder' option\0" -/* 4778 */ "outraw\0" -/* 4785 */ "Specify the PKCS #11 provider library\0" -/* 4823 */ "PROVIDER\0" -/* 4832 */ "provider\0" -/* 4841 */ "Specify parameters for the PKCS #11 provider library (deprecated)\0" -/* 4907 */ "PROVIDER_OPTS\0" -/* 4921 */ "provider-opts\0" -/* 4935 */ "Print detailed URLs\0" -/* 4955 */ "DETAILED_URL\0" -/* 4968 */ "no-detailed-url\0" -/* 4984 */ "Print a compact listing using only the URLs\0" -/* 5028 */ "ONLY_URLS\0" -/* 5038 */ "only-urls\0" -/* 5048 */ "Disable all interaction with the tool\0" -/* 5086 */ "BATCH\0" -/* 5092 */ "batch\0" -/* 5098 */ "display extended usage information and exit\0" -/* 5142 */ "help\0" -/* 5147 */ "extended usage information passed thru pager\0" -/* 5192 */ "more-help\0" -/* 5202 */ "output version information and exit\0" -/* 5238 */ "version\0" -/* 5246 */ "P11TOOL\0" -/* 5254 */ "p11tool - GnuTLS PKCS #11 tool\n" +/* 3456 */ "MARK_DISTRUSTED\0" +/* 3472 */ "mark-distrusted\0" +/* 3488 */ "Marks the object to be written for decryption\0" +/* 3534 */ "MARK_DECRYPT\0" +/* 3547 */ "no-mark-decrypt\0" +/* 3563 */ "Marks the object to be written for signature generation\0" +/* 3619 */ "MARK_SIGN\0" +/* 3629 */ "no-mark-sign\0" +/* 3642 */ "Marks the object to be written as a CA\0" +/* 3681 */ "MARK_CA\0" +/* 3689 */ "no-mark-ca\0" +/* 3700 */ "Marks the object to be written as private\0" +/* 3742 */ "MARK_PRIVATE\0" +/* 3755 */ "no-mark-private\0" +/* 3771 */ "an alias for the 'mark-ca' option\0" +/* 3805 */ "ca\0" +/* 3808 */ "an alias for the 'mark-private' option\0" +/* 3847 */ "private\0" +/* 3855 */ "Provide a hex encoded secret key\0" +/* 3888 */ "SECRET_KEY\0" +/* 3899 */ "secret-key\0" +/* 3910 */ "Private key file to use\0" +/* 3934 */ "LOAD_PRIVKEY\0" +/* 3947 */ "load-privkey\0" +/* 3960 */ "Public key file to use\0" +/* 3983 */ "LOAD_PUBKEY\0" +/* 3995 */ "load-pubkey\0" +/* 4007 */ "Certificate file to use\0" +/* 4031 */ "LOAD_CERTIFICATE\0" +/* 4048 */ "load-certificate\0" +/* 4065 */ "Other options:\0" +/* 4080 */ "Enable debugging\0" +/* 4097 */ "DEBUG\0" +/* 4103 */ "debug\0" +/* 4109 */ "Output file\0" +/* 4121 */ "OUTFILE\0" +/* 4129 */ "outfile\0" +/* 4137 */ "Force (user) login to token\0" +/* 4165 */ "LOGIN\0" +/* 4171 */ "no-login\0" +/* 4180 */ "Force security officer login to token\0" +/* 4218 */ "SO_LOGIN\0" +/* 4227 */ "no-so-login\0" +/* 4239 */ "an alias for the 'so-login' option\0" +/* 4274 */ "admin-login\0" +/* 4286 */ "Tests the signature operation of the provided object\0" +/* 4339 */ "TEST_SIGN\0" +/* 4349 */ "test-sign\0" +/* 4359 */ "Sign with a specific signature algorithm\0" +/* 4400 */ "SIGN_PARAMS\0" +/* 4412 */ "sign-params\0" +/* 4424 */ "Hash algorithm to use for signing\0" +/* 4458 */ "HASH\0" +/* 4463 */ "hash\0" +/* 4468 */ "Generate random data\0" +/* 4489 */ "GENERATE_RANDOM\0" +/* 4505 */ "generate-random\0" +/* 4521 */ "Use PKCS #8 format for private keys\0" +/* 4557 */ "PKCS8\0" +/* 4563 */ "pkcs8\0" +/* 4569 */ "Use DER/RAW format for input\0" +/* 4598 */ "INDER\0" +/* 4604 */ "no-inder\0" +/* 4613 */ "an alias for the 'inder' option\0" +/* 4645 */ "inraw\0" +/* 4651 */ "Use DER format for output certificates, private keys, and DH parameters\0" +/* 4723 */ "OUTDER\0" +/* 4730 */ "no-outder\0" +/* 4740 */ "an alias for the 'outder' option\0" +/* 4773 */ "outraw\0" +/* 4780 */ "Specify the PKCS #11 provider library\0" +/* 4818 */ "PROVIDER\0" +/* 4827 */ "provider\0" +/* 4836 */ "Specify parameters for the PKCS #11 provider library (deprecated)\0" +/* 4902 */ "PROVIDER_OPTS\0" +/* 4916 */ "provider-opts\0" +/* 4930 */ "Print detailed URLs\0" +/* 4950 */ "DETAILED_URL\0" +/* 4963 */ "no-detailed-url\0" +/* 4979 */ "Print a compact listing using only the URLs\0" +/* 5023 */ "ONLY_URLS\0" +/* 5033 */ "only-urls\0" +/* 5043 */ "Disable all interaction with the tool\0" +/* 5081 */ "BATCH\0" +/* 5087 */ "batch\0" +/* 5093 */ "display extended usage information and exit\0" +/* 5137 */ "help\0" +/* 5142 */ "extended usage information passed thru pager\0" +/* 5187 */ "more-help\0" +/* 5197 */ "output version information and exit\0" +/* 5233 */ "version\0" +/* 5241 */ "P11TOOL\0" +/* 5249 */ "p11tool - GnuTLS PKCS #11 tool\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [url]\n\0" -/* 5349 */ "@PACKAGE_BUGREPORT@\0" -/* 5369 */ "\n\0" -/* 5371 */ "Program that allows operations on PKCS #11 smart cards and security\n" +/* 5344 */ "bugs@gnutls.org\0" +/* 5360 */ "\n\0" +/* 5362 */ "Program that allows operations on PKCS #11 smart cards and security\n" "modules.\n\n" "To use PKCS #11 tokens with GnuTLS the p11-kit configuration files need to\n" "be setup. That is create a .module file in /etc/pkcs11/modules with the\n" @@ -297,26 +297,26 @@ static char const p11tool_opt_strs[5995] = "the form 'load=/usr/lib/opensc-pkcs11.so'.\n\n" "You can provide the PIN to be used for the PKCS #11 operations with the\n" "environment variables GNUTLS_PIN and GNUTLS_SO_PIN.\n\0" -/* 5913 */ "p11tool @VERSION@\0" -/* 5931 */ "p11tool [options] [url]\n" +/* 5904 */ "p11tool 3.6.4\0" +/* 5918 */ "p11tool [options] [url]\n" "p11tool --help for usage instructions.\n"; /** * token_related_options option description: */ /** token_related_options option separation text */ -#define TOKEN_RELATED_OPTIONS_DESC (p11tool_opt_strs+891) +#define TOKEN_RELATED_OPTIONS_DESC (p11tool_opt_strs+885) #define TOKEN_RELATED_OPTIONS_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** * list-tokens option description: */ /** Descriptive text for the list-tokens option */ -#define LIST_TOKENS_DESC (p11tool_opt_strs+899) +#define LIST_TOKENS_DESC (p11tool_opt_strs+893) /** Upper-cased name for the list-tokens option */ -#define LIST_TOKENS_NAME (p11tool_opt_strs+925) +#define LIST_TOKENS_NAME (p11tool_opt_strs+919) /** Name string for the list-tokens option */ -#define LIST_TOKENS_name (p11tool_opt_strs+937) +#define LIST_TOKENS_name (p11tool_opt_strs+931) /** Compiled in flag settings for the list-tokens option */ #define LIST_TOKENS_FLAGS (OPTST_DISABLED) @@ -324,11 +324,11 @@ static char const p11tool_opt_strs[5995] = * list-token-urls option description: */ /** Descriptive text for the list-token-urls option */ -#define LIST_TOKEN_URLS_DESC (p11tool_opt_strs+949) +#define LIST_TOKEN_URLS_DESC (p11tool_opt_strs+943) /** Upper-cased name for the list-token-urls option */ -#define LIST_TOKEN_URLS_NAME (p11tool_opt_strs+980) +#define LIST_TOKEN_URLS_NAME (p11tool_opt_strs+974) /** Name string for the list-token-urls option */ -#define LIST_TOKEN_URLS_name (p11tool_opt_strs+996) +#define LIST_TOKEN_URLS_name (p11tool_opt_strs+990) /** Compiled in flag settings for the list-token-urls option */ #define LIST_TOKEN_URLS_FLAGS (OPTST_DISABLED) @@ -336,11 +336,11 @@ static char const p11tool_opt_strs[5995] = * list-mechanisms option description: */ /** Descriptive text for the list-mechanisms option */ -#define LIST_MECHANISMS_DESC (p11tool_opt_strs+1012) +#define LIST_MECHANISMS_DESC (p11tool_opt_strs+1006) /** Upper-cased name for the list-mechanisms option */ -#define LIST_MECHANISMS_NAME (p11tool_opt_strs+1053) +#define LIST_MECHANISMS_NAME (p11tool_opt_strs+1047) /** Name string for the list-mechanisms option */ -#define LIST_MECHANISMS_name (p11tool_opt_strs+1069) +#define LIST_MECHANISMS_name (p11tool_opt_strs+1063) /** Compiled in flag settings for the list-mechanisms option */ #define LIST_MECHANISMS_FLAGS (OPTST_DISABLED) @@ -348,11 +348,11 @@ static char const p11tool_opt_strs[5995] = * initialize option description: */ /** Descriptive text for the initialize option */ -#define INITIALIZE_DESC (p11tool_opt_strs+1085) +#define INITIALIZE_DESC (p11tool_opt_strs+1079) /** Upper-cased name for the initialize option */ -#define INITIALIZE_NAME (p11tool_opt_strs+1114) +#define INITIALIZE_NAME (p11tool_opt_strs+1108) /** Name string for the initialize option */ -#define INITIALIZE_name (p11tool_opt_strs+1125) +#define INITIALIZE_name (p11tool_opt_strs+1119) /** Compiled in flag settings for the initialize option */ #define INITIALIZE_FLAGS (OPTST_DISABLED) @@ -360,11 +360,11 @@ static char const p11tool_opt_strs[5995] = * initialize-pin option description: */ /** Descriptive text for the initialize-pin option */ -#define INITIALIZE_PIN_DESC (p11tool_opt_strs+1136) +#define INITIALIZE_PIN_DESC (p11tool_opt_strs+1130) /** Upper-cased name for the initialize-pin option */ -#define INITIALIZE_PIN_NAME (p11tool_opt_strs+1181) +#define INITIALIZE_PIN_NAME (p11tool_opt_strs+1175) /** Name string for the initialize-pin option */ -#define INITIALIZE_PIN_name (p11tool_opt_strs+1196) +#define INITIALIZE_PIN_name (p11tool_opt_strs+1190) /** Compiled in flag settings for the initialize-pin option */ #define INITIALIZE_PIN_FLAGS (OPTST_DISABLED) @@ -372,11 +372,11 @@ static char const p11tool_opt_strs[5995] = * initialize-so-pin option description: */ /** Descriptive text for the initialize-so-pin option */ -#define INITIALIZE_SO_PIN_DESC (p11tool_opt_strs+1211) +#define INITIALIZE_SO_PIN_DESC (p11tool_opt_strs+1205) /** Upper-cased name for the initialize-so-pin option */ -#define INITIALIZE_SO_PIN_NAME (p11tool_opt_strs+1268) +#define INITIALIZE_SO_PIN_NAME (p11tool_opt_strs+1263) /** Name string for the initialize-so-pin option */ -#define INITIALIZE_SO_PIN_name (p11tool_opt_strs+1286) +#define INITIALIZE_SO_PIN_name (p11tool_opt_strs+1281) /** Compiled in flag settings for the initialize-so-pin option */ #define INITIALIZE_SO_PIN_FLAGS (OPTST_DISABLED) @@ -384,11 +384,11 @@ static char const p11tool_opt_strs[5995] = * set-pin option description: */ /** Descriptive text for the set-pin option */ -#define SET_PIN_DESC (p11tool_opt_strs+1304) +#define SET_PIN_DESC (p11tool_opt_strs+1299) /** Upper-cased name for the set-pin option */ -#define SET_PIN_NAME (p11tool_opt_strs+1347) +#define SET_PIN_NAME (p11tool_opt_strs+1342) /** Name string for the set-pin option */ -#define SET_PIN_name (p11tool_opt_strs+1355) +#define SET_PIN_name (p11tool_opt_strs+1350) /** Compiled in flag settings for the set-pin option */ #define SET_PIN_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -397,11 +397,11 @@ static char const p11tool_opt_strs[5995] = * set-so-pin option description: */ /** Descriptive text for the set-so-pin option */ -#define SET_SO_PIN_DESC (p11tool_opt_strs+1363) +#define SET_SO_PIN_DESC (p11tool_opt_strs+1358) /** Upper-cased name for the set-so-pin option */ -#define SET_SO_PIN_NAME (p11tool_opt_strs+1429) +#define SET_SO_PIN_NAME (p11tool_opt_strs+1424) /** Name string for the set-so-pin option */ -#define SET_SO_PIN_name (p11tool_opt_strs+1440) +#define SET_SO_PIN_name (p11tool_opt_strs+1435) /** Compiled in flag settings for the set-so-pin option */ #define SET_SO_PIN_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -410,18 +410,18 @@ static char const p11tool_opt_strs[5995] = * object_list_related_options option description: */ /** object_list_related_options option separation text */ -#define OBJECT_LIST_RELATED_OPTIONS_DESC (p11tool_opt_strs+1451) +#define OBJECT_LIST_RELATED_OPTIONS_DESC (p11tool_opt_strs+1446) #define OBJECT_LIST_RELATED_OPTIONS_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** * list-all option description: */ /** Descriptive text for the list-all option */ -#define LIST_ALL_DESC (p11tool_opt_strs+1467) +#define LIST_ALL_DESC (p11tool_opt_strs+1462) /** Upper-cased name for the list-all option */ -#define LIST_ALL_NAME (p11tool_opt_strs+1505) +#define LIST_ALL_NAME (p11tool_opt_strs+1500) /** Name string for the list-all option */ -#define LIST_ALL_name (p11tool_opt_strs+1514) +#define LIST_ALL_name (p11tool_opt_strs+1509) /** Compiled in flag settings for the list-all option */ #define LIST_ALL_FLAGS (OPTST_DISABLED) @@ -429,11 +429,11 @@ static char const p11tool_opt_strs[5995] = * list-all-certs option description: */ /** Descriptive text for the list-all-certs option */ -#define LIST_ALL_CERTS_DESC (p11tool_opt_strs+1523) +#define LIST_ALL_CERTS_DESC (p11tool_opt_strs+1518) /** Upper-cased name for the list-all-certs option */ -#define LIST_ALL_CERTS_NAME (p11tool_opt_strs+1566) +#define LIST_ALL_CERTS_NAME (p11tool_opt_strs+1561) /** Name string for the list-all-certs option */ -#define LIST_ALL_CERTS_name (p11tool_opt_strs+1581) +#define LIST_ALL_CERTS_name (p11tool_opt_strs+1576) /** Compiled in flag settings for the list-all-certs option */ #define LIST_ALL_CERTS_FLAGS (OPTST_DISABLED) @@ -441,11 +441,11 @@ static char const p11tool_opt_strs[5995] = * list-certs option description: */ /** Descriptive text for the list-certs option */ -#define LIST_CERTS_DESC (p11tool_opt_strs+1596) +#define LIST_CERTS_DESC (p11tool_opt_strs+1591) /** Upper-cased name for the list-certs option */ -#define LIST_CERTS_NAME (p11tool_opt_strs+1654) +#define LIST_CERTS_NAME (p11tool_opt_strs+1649) /** Name string for the list-certs option */ -#define LIST_CERTS_name (p11tool_opt_strs+1665) +#define LIST_CERTS_name (p11tool_opt_strs+1660) /** Compiled in flag settings for the list-certs option */ #define LIST_CERTS_FLAGS (OPTST_DISABLED) @@ -453,11 +453,11 @@ static char const p11tool_opt_strs[5995] = * list-all-privkeys option description: */ /** Descriptive text for the list-all-privkeys option */ -#define LIST_ALL_PRIVKEYS_DESC (p11tool_opt_strs+1676) +#define LIST_ALL_PRIVKEYS_DESC (p11tool_opt_strs+1671) /** Upper-cased name for the list-all-privkeys option */ -#define LIST_ALL_PRIVKEYS_NAME (p11tool_opt_strs+1719) +#define LIST_ALL_PRIVKEYS_NAME (p11tool_opt_strs+1714) /** Name string for the list-all-privkeys option */ -#define LIST_ALL_PRIVKEYS_name (p11tool_opt_strs+1737) +#define LIST_ALL_PRIVKEYS_name (p11tool_opt_strs+1732) /** Compiled in flag settings for the list-all-privkeys option */ #define LIST_ALL_PRIVKEYS_FLAGS (OPTST_DISABLED) @@ -465,10 +465,10 @@ static char const p11tool_opt_strs[5995] = * list-privkeys option description: */ /** Descriptive text for the list-privkeys option */ -#define LIST_PRIVKEYS_DESC (p11tool_opt_strs+1755) +#define LIST_PRIVKEYS_DESC (p11tool_opt_strs+1750) #define LIST_PRIVKEYS_NAME NULL /** Unmodified name string for the list-privkeys option */ -#define LIST_PRIVKEYS_name (p11tool_opt_strs+1799) +#define LIST_PRIVKEYS_name (p11tool_opt_strs+1794) /** Compiled in flag settings for the list-privkeys option */ #define LIST_PRIVKEYS_FLAGS (LIST_ALL_PRIVKEYS_FLAGS | OPTST_ALIAS) @@ -476,10 +476,10 @@ static char const p11tool_opt_strs[5995] = * list-keys option description: */ /** Descriptive text for the list-keys option */ -#define LIST_KEYS_DESC (p11tool_opt_strs+1755) +#define LIST_KEYS_DESC (p11tool_opt_strs+1750) #define LIST_KEYS_NAME NULL /** Unmodified name string for the list-keys option */ -#define LIST_KEYS_name (p11tool_opt_strs+1813) +#define LIST_KEYS_name (p11tool_opt_strs+1808) /** Compiled in flag settings for the list-keys option */ #define LIST_KEYS_FLAGS (LIST_ALL_PRIVKEYS_FLAGS | OPTST_ALIAS) @@ -487,11 +487,11 @@ static char const p11tool_opt_strs[5995] = * list-all-trusted option description: */ /** Descriptive text for the list-all-trusted option */ -#define LIST_ALL_TRUSTED_DESC (p11tool_opt_strs+1823) +#define LIST_ALL_TRUSTED_DESC (p11tool_opt_strs+1818) /** Upper-cased name for the list-all-trusted option */ -#define LIST_ALL_TRUSTED_NAME (p11tool_opt_strs+1873) +#define LIST_ALL_TRUSTED_NAME (p11tool_opt_strs+1868) /** Name string for the list-all-trusted option */ -#define LIST_ALL_TRUSTED_name (p11tool_opt_strs+1890) +#define LIST_ALL_TRUSTED_name (p11tool_opt_strs+1885) /** Compiled in flag settings for the list-all-trusted option */ #define LIST_ALL_TRUSTED_FLAGS (OPTST_DISABLED) @@ -500,11 +500,11 @@ static char const p11tool_opt_strs[5995] = * "Must also have options" and "Incompatible options": */ /** Descriptive text for the export option */ -#define EXPORT_DESC (p11tool_opt_strs+1907) +#define EXPORT_DESC (p11tool_opt_strs+1902) /** Upper-cased name for the export option */ -#define EXPORT_NAME (p11tool_opt_strs+1946) +#define EXPORT_NAME (p11tool_opt_strs+1941) /** Name string for the export option */ -#define EXPORT_name (p11tool_opt_strs+1953) +#define EXPORT_name (p11tool_opt_strs+1948) /** Other options that appear in conjunction with the export option */ static int const aExportCantList[] = { INDEX_OPT_EXPORT_STAPLED, @@ -518,11 +518,11 @@ static int const aExportCantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the export-stapled option */ -#define EXPORT_STAPLED_DESC (p11tool_opt_strs+1960) +#define EXPORT_STAPLED_DESC (p11tool_opt_strs+1955) /** Upper-cased name for the export-stapled option */ -#define EXPORT_STAPLED_NAME (p11tool_opt_strs+2011) +#define EXPORT_STAPLED_NAME (p11tool_opt_strs+2006) /** Name string for the export-stapled option */ -#define EXPORT_STAPLED_name (p11tool_opt_strs+2026) +#define EXPORT_STAPLED_name (p11tool_opt_strs+2021) /** Other options that appear in conjunction with the export-stapled option */ static int const aExport_StapledCantList[] = { INDEX_OPT_EXPORT, @@ -536,11 +536,11 @@ static int const aExport_StapledCantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the export-chain option */ -#define EXPORT_CHAIN_DESC (p11tool_opt_strs+2041) +#define EXPORT_CHAIN_DESC (p11tool_opt_strs+2036) /** Upper-cased name for the export-chain option */ -#define EXPORT_CHAIN_NAME (p11tool_opt_strs+2108) +#define EXPORT_CHAIN_NAME (p11tool_opt_strs+2103) /** Name string for the export-chain option */ -#define EXPORT_CHAIN_name (p11tool_opt_strs+2121) +#define EXPORT_CHAIN_name (p11tool_opt_strs+2116) /** Other options that appear in conjunction with the export-chain option */ static int const aExport_ChainCantList[] = { INDEX_OPT_EXPORT_STAPLED, @@ -554,11 +554,11 @@ static int const aExport_ChainCantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the export-pubkey option */ -#define EXPORT_PUBKEY_DESC (p11tool_opt_strs+2134) +#define EXPORT_PUBKEY_DESC (p11tool_opt_strs+2129) /** Upper-cased name for the export-pubkey option */ -#define EXPORT_PUBKEY_NAME (p11tool_opt_strs+2174) +#define EXPORT_PUBKEY_NAME (p11tool_opt_strs+2169) /** Name string for the export-pubkey option */ -#define EXPORT_PUBKEY_name (p11tool_opt_strs+2188) +#define EXPORT_PUBKEY_name (p11tool_opt_strs+2183) /** Other options that appear in conjunction with the export-pubkey option */ static int const aExport_PubkeyCantList[] = { INDEX_OPT_EXPORT_STAPLED, @@ -571,11 +571,11 @@ static int const aExport_PubkeyCantList[] = { * info option description: */ /** Descriptive text for the info option */ -#define INFO_DESC (p11tool_opt_strs+2202) +#define INFO_DESC (p11tool_opt_strs+2197) /** Upper-cased name for the info option */ -#define INFO_NAME (p11tool_opt_strs+2253) +#define INFO_NAME (p11tool_opt_strs+2248) /** Name string for the info option */ -#define INFO_name (p11tool_opt_strs+2258) +#define INFO_name (p11tool_opt_strs+2253) /** Compiled in flag settings for the info option */ #define INFO_FLAGS (OPTST_DISABLED) @@ -583,10 +583,10 @@ static int const aExport_PubkeyCantList[] = { * trusted option description: */ /** Descriptive text for the trusted option */ -#define TRUSTED_DESC (p11tool_opt_strs+2263) +#define TRUSTED_DESC (p11tool_opt_strs+2258) #define TRUSTED_NAME NULL /** Unmodified name string for the trusted option */ -#define TRUSTED_name (p11tool_opt_strs+2302) +#define TRUSTED_name (p11tool_opt_strs+2297) /** Compiled in flag settings for the trusted option */ #define TRUSTED_FLAGS (MARK_TRUSTED_FLAGS | OPTST_ALIAS) @@ -594,10 +594,10 @@ static int const aExport_PubkeyCantList[] = { * distrusted option description: */ /** Descriptive text for the distrusted option */ -#define DISTRUSTED_DESC (p11tool_opt_strs+2310) +#define DISTRUSTED_DESC (p11tool_opt_strs+2305) #define DISTRUSTED_NAME NULL /** Unmodified name string for the distrusted option */ -#define DISTRUSTED_name (p11tool_opt_strs+2352) +#define DISTRUSTED_name (p11tool_opt_strs+2347) /** Compiled in flag settings for the distrusted option */ #define DISTRUSTED_FLAGS (MARK_DISTRUSTED_FLAGS | OPTST_ALIAS) @@ -605,18 +605,18 @@ static int const aExport_PubkeyCantList[] = { * keygen_related_options option description: */ /** keygen_related_options option separation text */ -#define KEYGEN_RELATED_OPTIONS_DESC (p11tool_opt_strs+2363) +#define KEYGEN_RELATED_OPTIONS_DESC (p11tool_opt_strs+2358) #define KEYGEN_RELATED_OPTIONS_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** * generate-privkey option description: */ /** Descriptive text for the generate-privkey option */ -#define GENERATE_PRIVKEY_DESC (p11tool_opt_strs+2379) +#define GENERATE_PRIVKEY_DESC (p11tool_opt_strs+2374) /** Upper-cased name for the generate-privkey option */ -#define GENERATE_PRIVKEY_NAME (p11tool_opt_strs+2426) +#define GENERATE_PRIVKEY_NAME (p11tool_opt_strs+2421) /** Name string for the generate-privkey option */ -#define GENERATE_PRIVKEY_name (p11tool_opt_strs+2443) +#define GENERATE_PRIVKEY_name (p11tool_opt_strs+2438) /** Compiled in flag settings for the generate-privkey option */ #define GENERATE_PRIVKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -625,11 +625,11 @@ static int const aExport_PubkeyCantList[] = { * generate-rsa option description: */ /** Descriptive text for the generate-rsa option */ -#define GENERATE_RSA_DESC (p11tool_opt_strs+2460) +#define GENERATE_RSA_DESC (p11tool_opt_strs+2455) /** Upper-cased name for the generate-rsa option */ -#define GENERATE_RSA_NAME (p11tool_opt_strs+2513) +#define GENERATE_RSA_NAME (p11tool_opt_strs+2508) /** Name string for the generate-rsa option */ -#define GENERATE_RSA_name (p11tool_opt_strs+2526) +#define GENERATE_RSA_name (p11tool_opt_strs+2521) /** Compiled in flag settings for the generate-rsa option */ #define GENERATE_RSA_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED) @@ -637,11 +637,11 @@ static int const aExport_PubkeyCantList[] = { * generate-dsa option description: */ /** Descriptive text for the generate-dsa option */ -#define GENERATE_DSA_DESC (p11tool_opt_strs+2539) +#define GENERATE_DSA_DESC (p11tool_opt_strs+2534) /** Upper-cased name for the generate-dsa option */ -#define GENERATE_DSA_NAME (p11tool_opt_strs+2591) +#define GENERATE_DSA_NAME (p11tool_opt_strs+2586) /** Name string for the generate-dsa option */ -#define GENERATE_DSA_name (p11tool_opt_strs+2604) +#define GENERATE_DSA_name (p11tool_opt_strs+2599) /** Compiled in flag settings for the generate-dsa option */ #define GENERATE_DSA_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED) @@ -649,11 +649,11 @@ static int const aExport_PubkeyCantList[] = { * generate-ecc option description: */ /** Descriptive text for the generate-ecc option */ -#define GENERATE_ECC_DESC (p11tool_opt_strs+2617) +#define GENERATE_ECC_DESC (p11tool_opt_strs+2612) /** Upper-cased name for the generate-ecc option */ -#define GENERATE_ECC_NAME (p11tool_opt_strs+2672) +#define GENERATE_ECC_NAME (p11tool_opt_strs+2667) /** Name string for the generate-ecc option */ -#define GENERATE_ECC_name (p11tool_opt_strs+2685) +#define GENERATE_ECC_name (p11tool_opt_strs+2680) /** Compiled in flag settings for the generate-ecc option */ #define GENERATE_ECC_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED) @@ -661,11 +661,11 @@ static int const aExport_PubkeyCantList[] = { * bits option description: */ /** Descriptive text for the bits option */ -#define BITS_DESC (p11tool_opt_strs+2698) +#define BITS_DESC (p11tool_opt_strs+2693) /** Upper-cased name for the bits option */ -#define BITS_NAME (p11tool_opt_strs+2746) +#define BITS_NAME (p11tool_opt_strs+2741) /** Name string for the bits option */ -#define BITS_name (p11tool_opt_strs+2751) +#define BITS_name (p11tool_opt_strs+2746) /** Compiled in flag settings for the bits option */ #define BITS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -674,11 +674,11 @@ static int const aExport_PubkeyCantList[] = { * curve option description: */ /** Descriptive text for the curve option */ -#define CURVE_DESC (p11tool_opt_strs+2756) +#define CURVE_DESC (p11tool_opt_strs+2751) /** Upper-cased name for the curve option */ -#define CURVE_NAME (p11tool_opt_strs+2801) +#define CURVE_NAME (p11tool_opt_strs+2796) /** Name string for the curve option */ -#define CURVE_name (p11tool_opt_strs+2807) +#define CURVE_name (p11tool_opt_strs+2802) /** Compiled in flag settings for the curve option */ #define CURVE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -687,11 +687,11 @@ static int const aExport_PubkeyCantList[] = { * sec-param option description: */ /** Descriptive text for the sec-param option */ -#define SEC_PARAM_DESC (p11tool_opt_strs+2813) +#define SEC_PARAM_DESC (p11tool_opt_strs+2808) /** Upper-cased name for the sec-param option */ -#define SEC_PARAM_NAME (p11tool_opt_strs+2840) +#define SEC_PARAM_NAME (p11tool_opt_strs+2835) /** Name string for the sec-param option */ -#define SEC_PARAM_name (p11tool_opt_strs+2850) +#define SEC_PARAM_name (p11tool_opt_strs+2845) /** Compiled in flag settings for the sec-param option */ #define SEC_PARAM_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -700,7 +700,7 @@ static int const aExport_PubkeyCantList[] = { * write_object_related_options option description: */ /** write_object_related_options option separation text */ -#define WRITE_OBJECT_RELATED_OPTIONS_DESC (p11tool_opt_strs+2860) +#define WRITE_OBJECT_RELATED_OPTIONS_DESC (p11tool_opt_strs+2855) #define WRITE_OBJECT_RELATED_OPTIONS_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** @@ -708,11 +708,11 @@ static int const aExport_PubkeyCantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the set-id option */ -#define SET_ID_DESC (p11tool_opt_strs+2877) +#define SET_ID_DESC (p11tool_opt_strs+2872) /** Upper-cased name for the set-id option */ -#define SET_ID_NAME (p11tool_opt_strs+2937) +#define SET_ID_NAME (p11tool_opt_strs+2932) /** Name string for the set-id option */ -#define SET_ID_name (p11tool_opt_strs+2944) +#define SET_ID_name (p11tool_opt_strs+2939) /** Other options that appear in conjunction with the set-id option */ static int const aSet_IdCantList[] = { INDEX_OPT_WRITE, NO_EQUIVALENT }; @@ -725,11 +725,11 @@ static int const aSet_IdCantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the set-label option */ -#define SET_LABEL_DESC (p11tool_opt_strs+2951) +#define SET_LABEL_DESC (p11tool_opt_strs+2946) /** Upper-cased name for the set-label option */ -#define SET_LABEL_NAME (p11tool_opt_strs+3005) +#define SET_LABEL_NAME (p11tool_opt_strs+3000) /** Name string for the set-label option */ -#define SET_LABEL_name (p11tool_opt_strs+3015) +#define SET_LABEL_name (p11tool_opt_strs+3010) /** Other options that appear in conjunction with the set-label option */ static int const aSet_LabelCantList[] = { INDEX_OPT_WRITE, @@ -742,11 +742,11 @@ static int const aSet_LabelCantList[] = { * write option description: */ /** Descriptive text for the write option */ -#define WRITE_DESC (p11tool_opt_strs+3025) +#define WRITE_DESC (p11tool_opt_strs+3020) /** Upper-cased name for the write option */ -#define WRITE_NAME (p11tool_opt_strs+3071) +#define WRITE_NAME (p11tool_opt_strs+3066) /** Name string for the write option */ -#define WRITE_name (p11tool_opt_strs+3077) +#define WRITE_name (p11tool_opt_strs+3072) /** Compiled in flag settings for the write option */ #define WRITE_FLAGS (OPTST_DISABLED) @@ -754,11 +754,11 @@ static int const aSet_LabelCantList[] = { * delete option description: */ /** Descriptive text for the delete option */ -#define DELETE_DESC (p11tool_opt_strs+3083) +#define DELETE_DESC (p11tool_opt_strs+3078) /** Upper-cased name for the delete option */ -#define DELETE_NAME (p11tool_opt_strs+3135) +#define DELETE_NAME (p11tool_opt_strs+3130) /** Name string for the delete option */ -#define DELETE_name (p11tool_opt_strs+3142) +#define DELETE_name (p11tool_opt_strs+3137) /** Compiled in flag settings for the delete option */ #define DELETE_FLAGS (OPTST_DISABLED) @@ -766,11 +766,11 @@ static int const aSet_LabelCantList[] = { * label option description: */ /** Descriptive text for the label option */ -#define LABEL_DESC (p11tool_opt_strs+3149) +#define LABEL_DESC (p11tool_opt_strs+3144) /** Upper-cased name for the label option */ -#define LABEL_NAME (p11tool_opt_strs+3186) +#define LABEL_NAME (p11tool_opt_strs+3181) /** Name string for the label option */ -#define LABEL_name (p11tool_opt_strs+3192) +#define LABEL_name (p11tool_opt_strs+3187) /** Compiled in flag settings for the label option */ #define LABEL_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -779,11 +779,11 @@ static int const aSet_LabelCantList[] = { * id option description: */ /** Descriptive text for the id option */ -#define ID_DESC (p11tool_opt_strs+3198) +#define ID_DESC (p11tool_opt_strs+3193) /** Upper-cased name for the id option */ -#define ID_NAME (p11tool_opt_strs+3233) +#define ID_NAME (p11tool_opt_strs+3228) /** Name string for the id option */ -#define ID_name (p11tool_opt_strs+3236) +#define ID_name (p11tool_opt_strs+3231) /** Compiled in flag settings for the id option */ #define ID_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -792,13 +792,13 @@ static int const aSet_LabelCantList[] = { * mark-wrap option description: */ /** Descriptive text for the mark-wrap option */ -#define MARK_WRAP_DESC (p11tool_opt_strs+3239) +#define MARK_WRAP_DESC (p11tool_opt_strs+3234) /** Upper-cased name for the mark-wrap option */ -#define MARK_WRAP_NAME (p11tool_opt_strs+3284) +#define MARK_WRAP_NAME (p11tool_opt_strs+3279) /** disablement name for the mark-wrap option */ -#define NOT_MARK_WRAP_name (p11tool_opt_strs+3294) +#define NOT_MARK_WRAP_name (p11tool_opt_strs+3289) /** disablement prefix for the mark-wrap option */ -#define NOT_MARK_WRAP_PFX (p11tool_opt_strs+3307) +#define NOT_MARK_WRAP_PFX (p11tool_opt_strs+3302) /** Name string for the mark-wrap option */ #define MARK_WRAP_name (NOT_MARK_WRAP_name + 3) /** Compiled in flag settings for the mark-wrap option */ @@ -809,13 +809,13 @@ static int const aSet_LabelCantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the mark-trusted option */ -#define MARK_TRUSTED_DESC (p11tool_opt_strs+3310) +#define MARK_TRUSTED_DESC (p11tool_opt_strs+3305) /** Upper-cased name for the mark-trusted option */ -#define MARK_TRUSTED_NAME (p11tool_opt_strs+3352) +#define MARK_TRUSTED_NAME (p11tool_opt_strs+3347) /** disablement name for the mark-trusted option */ -#define NOT_MARK_TRUSTED_name (p11tool_opt_strs+3365) +#define NOT_MARK_TRUSTED_name (p11tool_opt_strs+3360) /** disablement prefix for the mark-trusted option */ -#define NOT_MARK_TRUSTED_PFX (p11tool_opt_strs+3307) +#define NOT_MARK_TRUSTED_PFX (p11tool_opt_strs+3302) /** Name string for the mark-trusted option */ #define MARK_TRUSTED_name (NOT_MARK_TRUSTED_name + 3) /** Other options that appear in conjunction with the mark-trusted option */ @@ -829,11 +829,11 @@ static int const aMark_TrustedCantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the mark-distrusted option */ -#define MARK_DISTRUSTED_DESC (p11tool_opt_strs+3381) +#define MARK_DISTRUSTED_DESC (p11tool_opt_strs+3376) /** Upper-cased name for the mark-distrusted option */ -#define MARK_DISTRUSTED_NAME (p11tool_opt_strs+3461) +#define MARK_DISTRUSTED_NAME (p11tool_opt_strs+3456) /** Name string for the mark-distrusted option */ -#define MARK_DISTRUSTED_name (p11tool_opt_strs+3477) +#define MARK_DISTRUSTED_name (p11tool_opt_strs+3472) /** Other options that appear in conjunction with the mark-distrusted option */ static int const aMark_DistrustedCantList[] = { INDEX_OPT_MARK_TRUSTED, NO_EQUIVALENT }; @@ -844,13 +844,13 @@ static int const aMark_DistrustedCantList[] = { * mark-decrypt option description: */ /** Descriptive text for the mark-decrypt option */ -#define MARK_DECRYPT_DESC (p11tool_opt_strs+3493) +#define MARK_DECRYPT_DESC (p11tool_opt_strs+3488) /** Upper-cased name for the mark-decrypt option */ -#define MARK_DECRYPT_NAME (p11tool_opt_strs+3539) +#define MARK_DECRYPT_NAME (p11tool_opt_strs+3534) /** disablement name for the mark-decrypt option */ -#define NOT_MARK_DECRYPT_name (p11tool_opt_strs+3552) +#define NOT_MARK_DECRYPT_name (p11tool_opt_strs+3547) /** disablement prefix for the mark-decrypt option */ -#define NOT_MARK_DECRYPT_PFX (p11tool_opt_strs+3307) +#define NOT_MARK_DECRYPT_PFX (p11tool_opt_strs+3302) /** Name string for the mark-decrypt option */ #define MARK_DECRYPT_name (NOT_MARK_DECRYPT_name + 3) /** Compiled in flag settings for the mark-decrypt option */ @@ -860,13 +860,13 @@ static int const aMark_DistrustedCantList[] = { * mark-sign option description: */ /** Descriptive text for the mark-sign option */ -#define MARK_SIGN_DESC (p11tool_opt_strs+3568) +#define MARK_SIGN_DESC (p11tool_opt_strs+3563) /** Upper-cased name for the mark-sign option */ -#define MARK_SIGN_NAME (p11tool_opt_strs+3624) +#define MARK_SIGN_NAME (p11tool_opt_strs+3619) /** disablement name for the mark-sign option */ -#define NOT_MARK_SIGN_name (p11tool_opt_strs+3634) +#define NOT_MARK_SIGN_name (p11tool_opt_strs+3629) /** disablement prefix for the mark-sign option */ -#define NOT_MARK_SIGN_PFX (p11tool_opt_strs+3307) +#define NOT_MARK_SIGN_PFX (p11tool_opt_strs+3302) /** Name string for the mark-sign option */ #define MARK_SIGN_name (NOT_MARK_SIGN_name + 3) /** Compiled in flag settings for the mark-sign option */ @@ -876,13 +876,13 @@ static int const aMark_DistrustedCantList[] = { * mark-ca option description: */ /** Descriptive text for the mark-ca option */ -#define MARK_CA_DESC (p11tool_opt_strs+3647) +#define MARK_CA_DESC (p11tool_opt_strs+3642) /** Upper-cased name for the mark-ca option */ -#define MARK_CA_NAME (p11tool_opt_strs+3686) +#define MARK_CA_NAME (p11tool_opt_strs+3681) /** disablement name for the mark-ca option */ -#define NOT_MARK_CA_name (p11tool_opt_strs+3694) +#define NOT_MARK_CA_name (p11tool_opt_strs+3689) /** disablement prefix for the mark-ca option */ -#define NOT_MARK_CA_PFX (p11tool_opt_strs+3307) +#define NOT_MARK_CA_PFX (p11tool_opt_strs+3302) /** Name string for the mark-ca option */ #define MARK_CA_name (NOT_MARK_CA_name + 3) /** Compiled in flag settings for the mark-ca option */ @@ -892,13 +892,13 @@ static int const aMark_DistrustedCantList[] = { * mark-private option description: */ /** Descriptive text for the mark-private option */ -#define MARK_PRIVATE_DESC (p11tool_opt_strs+3705) +#define MARK_PRIVATE_DESC (p11tool_opt_strs+3700) /** Upper-cased name for the mark-private option */ -#define MARK_PRIVATE_NAME (p11tool_opt_strs+3747) +#define MARK_PRIVATE_NAME (p11tool_opt_strs+3742) /** disablement name for the mark-private option */ -#define NOT_MARK_PRIVATE_name (p11tool_opt_strs+3760) +#define NOT_MARK_PRIVATE_name (p11tool_opt_strs+3755) /** disablement prefix for the mark-private option */ -#define NOT_MARK_PRIVATE_PFX (p11tool_opt_strs+3307) +#define NOT_MARK_PRIVATE_PFX (p11tool_opt_strs+3302) /** Name string for the mark-private option */ #define MARK_PRIVATE_name (NOT_MARK_PRIVATE_name + 3) /** Compiled in flag settings for the mark-private option */ @@ -908,10 +908,10 @@ static int const aMark_DistrustedCantList[] = { * ca option description: */ /** Descriptive text for the ca option */ -#define CA_DESC (p11tool_opt_strs+3776) +#define CA_DESC (p11tool_opt_strs+3771) #define CA_NAME NULL /** Unmodified name string for the ca option */ -#define CA_name (p11tool_opt_strs+3810) +#define CA_name (p11tool_opt_strs+3805) /** Compiled in flag settings for the ca option */ #define CA_FLAGS (MARK_CA_FLAGS | OPTST_ALIAS) @@ -919,10 +919,10 @@ static int const aMark_DistrustedCantList[] = { * private option description: */ /** Descriptive text for the private option */ -#define PRIVATE_DESC (p11tool_opt_strs+3813) +#define PRIVATE_DESC (p11tool_opt_strs+3808) #define PRIVATE_NAME NULL /** Unmodified name string for the private option */ -#define PRIVATE_name (p11tool_opt_strs+3852) +#define PRIVATE_name (p11tool_opt_strs+3847) /** Compiled in flag settings for the private option */ #define PRIVATE_FLAGS (MARK_PRIVATE_FLAGS | OPTST_ALIAS) @@ -930,11 +930,11 @@ static int const aMark_DistrustedCantList[] = { * secret-key option description: */ /** Descriptive text for the secret-key option */ -#define SECRET_KEY_DESC (p11tool_opt_strs+3860) +#define SECRET_KEY_DESC (p11tool_opt_strs+3855) /** Upper-cased name for the secret-key option */ -#define SECRET_KEY_NAME (p11tool_opt_strs+3893) +#define SECRET_KEY_NAME (p11tool_opt_strs+3888) /** Name string for the secret-key option */ -#define SECRET_KEY_name (p11tool_opt_strs+3904) +#define SECRET_KEY_name (p11tool_opt_strs+3899) /** Compiled in flag settings for the secret-key option */ #define SECRET_KEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -943,11 +943,11 @@ static int const aMark_DistrustedCantList[] = { * load-privkey option description: */ /** Descriptive text for the load-privkey option */ -#define LOAD_PRIVKEY_DESC (p11tool_opt_strs+3915) +#define LOAD_PRIVKEY_DESC (p11tool_opt_strs+3910) /** Upper-cased name for the load-privkey option */ -#define LOAD_PRIVKEY_NAME (p11tool_opt_strs+3939) +#define LOAD_PRIVKEY_NAME (p11tool_opt_strs+3934) /** Name string for the load-privkey option */ -#define LOAD_PRIVKEY_name (p11tool_opt_strs+3952) +#define LOAD_PRIVKEY_name (p11tool_opt_strs+3947) /** Compiled in flag settings for the load-privkey option */ #define LOAD_PRIVKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -956,11 +956,11 @@ static int const aMark_DistrustedCantList[] = { * load-pubkey option description: */ /** Descriptive text for the load-pubkey option */ -#define LOAD_PUBKEY_DESC (p11tool_opt_strs+3965) +#define LOAD_PUBKEY_DESC (p11tool_opt_strs+3960) /** Upper-cased name for the load-pubkey option */ -#define LOAD_PUBKEY_NAME (p11tool_opt_strs+3988) +#define LOAD_PUBKEY_NAME (p11tool_opt_strs+3983) /** Name string for the load-pubkey option */ -#define LOAD_PUBKEY_name (p11tool_opt_strs+4000) +#define LOAD_PUBKEY_name (p11tool_opt_strs+3995) /** Compiled in flag settings for the load-pubkey option */ #define LOAD_PUBKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -969,11 +969,11 @@ static int const aMark_DistrustedCantList[] = { * load-certificate option description: */ /** Descriptive text for the load-certificate option */ -#define LOAD_CERTIFICATE_DESC (p11tool_opt_strs+4012) +#define LOAD_CERTIFICATE_DESC (p11tool_opt_strs+4007) /** Upper-cased name for the load-certificate option */ -#define LOAD_CERTIFICATE_NAME (p11tool_opt_strs+4036) +#define LOAD_CERTIFICATE_NAME (p11tool_opt_strs+4031) /** Name string for the load-certificate option */ -#define LOAD_CERTIFICATE_name (p11tool_opt_strs+4053) +#define LOAD_CERTIFICATE_name (p11tool_opt_strs+4048) /** Compiled in flag settings for the load-certificate option */ #define LOAD_CERTIFICATE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -982,18 +982,18 @@ static int const aMark_DistrustedCantList[] = { * other_options option description: */ /** other_options option separation text */ -#define OTHER_OPTIONS_DESC (p11tool_opt_strs+4070) +#define OTHER_OPTIONS_DESC (p11tool_opt_strs+4065) #define OTHER_OPTIONS_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** * debug option description: */ /** Descriptive text for the debug option */ -#define DEBUG_DESC (p11tool_opt_strs+4085) +#define DEBUG_DESC (p11tool_opt_strs+4080) /** Upper-cased name for the debug option */ -#define DEBUG_NAME (p11tool_opt_strs+4102) +#define DEBUG_NAME (p11tool_opt_strs+4097) /** Name string for the debug option */ -#define DEBUG_name (p11tool_opt_strs+4108) +#define DEBUG_name (p11tool_opt_strs+4103) /** Compiled in flag settings for the debug option */ #define DEBUG_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -1002,11 +1002,11 @@ static int const aMark_DistrustedCantList[] = { * outfile option description: */ /** Descriptive text for the outfile option */ -#define OUTFILE_DESC (p11tool_opt_strs+4114) +#define OUTFILE_DESC (p11tool_opt_strs+4109) /** Upper-cased name for the outfile option */ -#define OUTFILE_NAME (p11tool_opt_strs+4126) +#define OUTFILE_NAME (p11tool_opt_strs+4121) /** Name string for the outfile option */ -#define OUTFILE_name (p11tool_opt_strs+4134) +#define OUTFILE_name (p11tool_opt_strs+4129) /** Compiled in flag settings for the outfile option */ #define OUTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1015,13 +1015,13 @@ static int const aMark_DistrustedCantList[] = { * login option description: */ /** Descriptive text for the login option */ -#define LOGIN_DESC (p11tool_opt_strs+4142) +#define LOGIN_DESC (p11tool_opt_strs+4137) /** Upper-cased name for the login option */ -#define LOGIN_NAME (p11tool_opt_strs+4170) +#define LOGIN_NAME (p11tool_opt_strs+4165) /** disablement name for the login option */ -#define NOT_LOGIN_name (p11tool_opt_strs+4176) +#define NOT_LOGIN_name (p11tool_opt_strs+4171) /** disablement prefix for the login option */ -#define NOT_LOGIN_PFX (p11tool_opt_strs+3307) +#define NOT_LOGIN_PFX (p11tool_opt_strs+3302) /** Name string for the login option */ #define LOGIN_name (NOT_LOGIN_name + 3) /** Compiled in flag settings for the login option */ @@ -1031,13 +1031,13 @@ static int const aMark_DistrustedCantList[] = { * so-login option description: */ /** Descriptive text for the so-login option */ -#define SO_LOGIN_DESC (p11tool_opt_strs+4185) +#define SO_LOGIN_DESC (p11tool_opt_strs+4180) /** Upper-cased name for the so-login option */ -#define SO_LOGIN_NAME (p11tool_opt_strs+4223) +#define SO_LOGIN_NAME (p11tool_opt_strs+4218) /** disablement name for the so-login option */ -#define NOT_SO_LOGIN_name (p11tool_opt_strs+4232) +#define NOT_SO_LOGIN_name (p11tool_opt_strs+4227) /** disablement prefix for the so-login option */ -#define NOT_SO_LOGIN_PFX (p11tool_opt_strs+3307) +#define NOT_SO_LOGIN_PFX (p11tool_opt_strs+3302) /** Name string for the so-login option */ #define SO_LOGIN_name (NOT_SO_LOGIN_name + 3) /** Compiled in flag settings for the so-login option */ @@ -1047,10 +1047,10 @@ static int const aMark_DistrustedCantList[] = { * admin-login option description: */ /** Descriptive text for the admin-login option */ -#define ADMIN_LOGIN_DESC (p11tool_opt_strs+4244) +#define ADMIN_LOGIN_DESC (p11tool_opt_strs+4239) #define ADMIN_LOGIN_NAME NULL /** Unmodified name string for the admin-login option */ -#define ADMIN_LOGIN_name (p11tool_opt_strs+4279) +#define ADMIN_LOGIN_name (p11tool_opt_strs+4274) /** Compiled in flag settings for the admin-login option */ #define ADMIN_LOGIN_FLAGS (SO_LOGIN_FLAGS | OPTST_ALIAS) @@ -1058,11 +1058,11 @@ static int const aMark_DistrustedCantList[] = { * test-sign option description: */ /** Descriptive text for the test-sign option */ -#define TEST_SIGN_DESC (p11tool_opt_strs+4291) +#define TEST_SIGN_DESC (p11tool_opt_strs+4286) /** Upper-cased name for the test-sign option */ -#define TEST_SIGN_NAME (p11tool_opt_strs+4344) +#define TEST_SIGN_NAME (p11tool_opt_strs+4339) /** Name string for the test-sign option */ -#define TEST_SIGN_name (p11tool_opt_strs+4354) +#define TEST_SIGN_name (p11tool_opt_strs+4349) /** Compiled in flag settings for the test-sign option */ #define TEST_SIGN_FLAGS (OPTST_DISABLED) @@ -1070,11 +1070,11 @@ static int const aMark_DistrustedCantList[] = { * sign-params option description: */ /** Descriptive text for the sign-params option */ -#define SIGN_PARAMS_DESC (p11tool_opt_strs+4364) +#define SIGN_PARAMS_DESC (p11tool_opt_strs+4359) /** Upper-cased name for the sign-params option */ -#define SIGN_PARAMS_NAME (p11tool_opt_strs+4405) +#define SIGN_PARAMS_NAME (p11tool_opt_strs+4400) /** Name string for the sign-params option */ -#define SIGN_PARAMS_name (p11tool_opt_strs+4417) +#define SIGN_PARAMS_name (p11tool_opt_strs+4412) /** Compiled in flag settings for the sign-params option */ #define SIGN_PARAMS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1083,11 +1083,11 @@ static int const aMark_DistrustedCantList[] = { * hash option description: */ /** Descriptive text for the hash option */ -#define HASH_DESC (p11tool_opt_strs+4429) +#define HASH_DESC (p11tool_opt_strs+4424) /** Upper-cased name for the hash option */ -#define HASH_NAME (p11tool_opt_strs+4463) +#define HASH_NAME (p11tool_opt_strs+4458) /** Name string for the hash option */ -#define HASH_name (p11tool_opt_strs+4468) +#define HASH_name (p11tool_opt_strs+4463) /** Compiled in flag settings for the hash option */ #define HASH_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1096,11 +1096,11 @@ static int const aMark_DistrustedCantList[] = { * generate-random option description: */ /** Descriptive text for the generate-random option */ -#define GENERATE_RANDOM_DESC (p11tool_opt_strs+4473) +#define GENERATE_RANDOM_DESC (p11tool_opt_strs+4468) /** Upper-cased name for the generate-random option */ -#define GENERATE_RANDOM_NAME (p11tool_opt_strs+4494) +#define GENERATE_RANDOM_NAME (p11tool_opt_strs+4489) /** Name string for the generate-random option */ -#define GENERATE_RANDOM_name (p11tool_opt_strs+4510) +#define GENERATE_RANDOM_name (p11tool_opt_strs+4505) /** Compiled in flag settings for the generate-random option */ #define GENERATE_RANDOM_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -1109,11 +1109,11 @@ static int const aMark_DistrustedCantList[] = { * pkcs8 option description: */ /** Descriptive text for the pkcs8 option */ -#define PKCS8_DESC (p11tool_opt_strs+4526) +#define PKCS8_DESC (p11tool_opt_strs+4521) /** Upper-cased name for the pkcs8 option */ -#define PKCS8_NAME (p11tool_opt_strs+4562) +#define PKCS8_NAME (p11tool_opt_strs+4557) /** Name string for the pkcs8 option */ -#define PKCS8_name (p11tool_opt_strs+4568) +#define PKCS8_name (p11tool_opt_strs+4563) /** Compiled in flag settings for the pkcs8 option */ #define PKCS8_FLAGS (OPTST_DISABLED) @@ -1121,13 +1121,13 @@ static int const aMark_DistrustedCantList[] = { * inder option description: */ /** Descriptive text for the inder option */ -#define INDER_DESC (p11tool_opt_strs+4574) +#define INDER_DESC (p11tool_opt_strs+4569) /** Upper-cased name for the inder option */ -#define INDER_NAME (p11tool_opt_strs+4603) +#define INDER_NAME (p11tool_opt_strs+4598) /** disablement name for the inder option */ -#define NOT_INDER_name (p11tool_opt_strs+4609) +#define NOT_INDER_name (p11tool_opt_strs+4604) /** disablement prefix for the inder option */ -#define NOT_INDER_PFX (p11tool_opt_strs+3307) +#define NOT_INDER_PFX (p11tool_opt_strs+3302) /** Name string for the inder option */ #define INDER_name (NOT_INDER_name + 3) /** Compiled in flag settings for the inder option */ @@ -1137,10 +1137,10 @@ static int const aMark_DistrustedCantList[] = { * inraw option description: */ /** Descriptive text for the inraw option */ -#define INRAW_DESC (p11tool_opt_strs+4618) +#define INRAW_DESC (p11tool_opt_strs+4613) #define INRAW_NAME NULL /** Unmodified name string for the inraw option */ -#define INRAW_name (p11tool_opt_strs+4650) +#define INRAW_name (p11tool_opt_strs+4645) /** Compiled in flag settings for the inraw option */ #define INRAW_FLAGS (INDER_FLAGS | OPTST_ALIAS) @@ -1148,13 +1148,13 @@ static int const aMark_DistrustedCantList[] = { * outder option description: */ /** Descriptive text for the outder option */ -#define OUTDER_DESC (p11tool_opt_strs+4656) +#define OUTDER_DESC (p11tool_opt_strs+4651) /** Upper-cased name for the outder option */ -#define OUTDER_NAME (p11tool_opt_strs+4728) +#define OUTDER_NAME (p11tool_opt_strs+4723) /** disablement name for the outder option */ -#define NOT_OUTDER_name (p11tool_opt_strs+4735) +#define NOT_OUTDER_name (p11tool_opt_strs+4730) /** disablement prefix for the outder option */ -#define NOT_OUTDER_PFX (p11tool_opt_strs+3307) +#define NOT_OUTDER_PFX (p11tool_opt_strs+3302) /** Name string for the outder option */ #define OUTDER_name (NOT_OUTDER_name + 3) /** Compiled in flag settings for the outder option */ @@ -1164,10 +1164,10 @@ static int const aMark_DistrustedCantList[] = { * outraw option description: */ /** Descriptive text for the outraw option */ -#define OUTRAW_DESC (p11tool_opt_strs+4745) +#define OUTRAW_DESC (p11tool_opt_strs+4740) #define OUTRAW_NAME NULL /** Unmodified name string for the outraw option */ -#define OUTRAW_name (p11tool_opt_strs+4778) +#define OUTRAW_name (p11tool_opt_strs+4773) /** Compiled in flag settings for the outraw option */ #define OUTRAW_FLAGS (OUTDER_FLAGS | OPTST_ALIAS) @@ -1175,11 +1175,11 @@ static int const aMark_DistrustedCantList[] = { * provider option description: */ /** Descriptive text for the provider option */ -#define PROVIDER_DESC (p11tool_opt_strs+4785) +#define PROVIDER_DESC (p11tool_opt_strs+4780) /** Upper-cased name for the provider option */ -#define PROVIDER_NAME (p11tool_opt_strs+4823) +#define PROVIDER_NAME (p11tool_opt_strs+4818) /** Name string for the provider option */ -#define PROVIDER_name (p11tool_opt_strs+4832) +#define PROVIDER_name (p11tool_opt_strs+4827) /** Compiled in flag settings for the provider option */ #define PROVIDER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -1188,11 +1188,11 @@ static int const aMark_DistrustedCantList[] = { * provider-opts option description: */ /** Descriptive text for the provider-opts option */ -#define PROVIDER_OPTS_DESC (p11tool_opt_strs+4841) +#define PROVIDER_OPTS_DESC (p11tool_opt_strs+4836) /** Upper-cased name for the provider-opts option */ -#define PROVIDER_OPTS_NAME (p11tool_opt_strs+4907) +#define PROVIDER_OPTS_NAME (p11tool_opt_strs+4902) /** Name string for the provider-opts option */ -#define PROVIDER_OPTS_name (p11tool_opt_strs+4921) +#define PROVIDER_OPTS_name (p11tool_opt_strs+4916) /** Compiled in flag settings for the provider-opts option */ #define PROVIDER_OPTS_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -1201,13 +1201,13 @@ static int const aMark_DistrustedCantList[] = { * detailed-url option description: */ /** Descriptive text for the detailed-url option */ -#define DETAILED_URL_DESC (p11tool_opt_strs+4935) +#define DETAILED_URL_DESC (p11tool_opt_strs+4930) /** Upper-cased name for the detailed-url option */ -#define DETAILED_URL_NAME (p11tool_opt_strs+4955) +#define DETAILED_URL_NAME (p11tool_opt_strs+4950) /** disablement name for the detailed-url option */ -#define NOT_DETAILED_URL_name (p11tool_opt_strs+4968) +#define NOT_DETAILED_URL_name (p11tool_opt_strs+4963) /** disablement prefix for the detailed-url option */ -#define NOT_DETAILED_URL_PFX (p11tool_opt_strs+3307) +#define NOT_DETAILED_URL_PFX (p11tool_opt_strs+3302) /** Name string for the detailed-url option */ #define DETAILED_URL_name (NOT_DETAILED_URL_name + 3) /** Compiled in flag settings for the detailed-url option */ @@ -1217,11 +1217,11 @@ static int const aMark_DistrustedCantList[] = { * only-urls option description: */ /** Descriptive text for the only-urls option */ -#define ONLY_URLS_DESC (p11tool_opt_strs+4984) +#define ONLY_URLS_DESC (p11tool_opt_strs+4979) /** Upper-cased name for the only-urls option */ -#define ONLY_URLS_NAME (p11tool_opt_strs+5028) +#define ONLY_URLS_NAME (p11tool_opt_strs+5023) /** Name string for the only-urls option */ -#define ONLY_URLS_name (p11tool_opt_strs+5038) +#define ONLY_URLS_name (p11tool_opt_strs+5033) /** Compiled in flag settings for the only-urls option */ #define ONLY_URLS_FLAGS (OPTST_DISABLED) @@ -1229,22 +1229,22 @@ static int const aMark_DistrustedCantList[] = { * batch option description: */ /** Descriptive text for the batch option */ -#define BATCH_DESC (p11tool_opt_strs+5048) +#define BATCH_DESC (p11tool_opt_strs+5043) /** Upper-cased name for the batch option */ -#define BATCH_NAME (p11tool_opt_strs+5086) +#define BATCH_NAME (p11tool_opt_strs+5081) /** Name string for the batch option */ -#define BATCH_name (p11tool_opt_strs+5092) +#define BATCH_name (p11tool_opt_strs+5087) /** Compiled in flag settings for the batch option */ #define BATCH_FLAGS (OPTST_DISABLED) /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (p11tool_opt_strs+5098) -#define HELP_name (p11tool_opt_strs+5142) +#define HELP_DESC (p11tool_opt_strs+5093) +#define HELP_name (p11tool_opt_strs+5137) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (p11tool_opt_strs+5147) -#define MORE_HELP_name (p11tool_opt_strs+5192) +#define MORE_HELP_DESC (p11tool_opt_strs+5142) +#define MORE_HELP_name (p11tool_opt_strs+5187) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -1257,8 +1257,8 @@ static int const aMark_DistrustedCantList[] = { # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (p11tool_opt_strs+5202) -#define VER_name (p11tool_opt_strs+5238) +#define VER_DESC (p11tool_opt_strs+5197) +#define VER_name (p11tool_opt_strs+5233) /** * Declare option callback procedures */ @@ -2188,21 +2188,21 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of p11tool. */ -#define zPROGNAME (p11tool_opt_strs+5246) +#define zPROGNAME (p11tool_opt_strs+5241) /** Reference to the title line for p11tool usage. */ -#define zUsageTitle (p11tool_opt_strs+5254) +#define zUsageTitle (p11tool_opt_strs+5249) /** There is no p11tool configuration file. */ #define zRcName NULL /** There are no directories to search for p11tool config files. */ #define apzHomeList NULL /** The p11tool program bug email address. */ -#define zBugsAddr (p11tool_opt_strs+5349) +#define zBugsAddr (p11tool_opt_strs+5344) /** Clarification/explanation of what p11tool does. */ -#define zExplain (p11tool_opt_strs+5369) +#define zExplain (p11tool_opt_strs+5360) /** Extra detail explaining what p11tool does. */ -#define zDetail (p11tool_opt_strs+5371) +#define zDetail (p11tool_opt_strs+5362) /** The full version string for p11tool. */ -#define zFullVersion (p11tool_opt_strs+5913) +#define zFullVersion (p11tool_opt_strs+5904) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -2214,7 +2214,7 @@ static tOptDesc optDesc[OPTION_CT] = { #endif /* ENABLE_NLS */ #define p11tool_full_usage (NULL) -#define p11tool_short_usage (p11tool_opt_strs+5931) +#define p11tool_short_usage (p11tool_opt_strs+5918) #endif /* not defined __doxygen__ */ @@ -2714,8 +2714,8 @@ static void bogus_function(void) { translate option names. */ /* referenced via p11toolOptions.pzCopyright */ - puts(_("p11tool @VERSION@\n\ -Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n\ + puts(_("p11tool 3.6.4\n\ +Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the GNU General Public License,\n\ version 3 or later <http://gnu.org/licenses/gpl.html>\n")); @@ -2751,7 +2751,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.\n")); puts(_("Initializes/Resets a PKCS #11 token user PIN")); /* referenced via p11toolOptions.pOptDesc->pzText */ - puts(_("Initializes/Resets a PKCS #11 token security officer PIN")); + puts(_("Initializes/Resets a PKCS #11 token security officer PIN.")); /* referenced via p11toolOptions.pOptDesc->pzText */ puts(_("Specify the PIN to use on token operations")); @@ -2977,7 +2977,7 @@ the form 'load=/usr/lib/opensc-pkcs11.so'.\n\n")); environment variables GNUTLS_PIN and GNUTLS_SO_PIN.\n")); /* referenced via p11toolOptions.pzFullVersion */ - puts(_("p11tool @VERSION@")); + puts(_("p11tool 3.6.4")); /* referenced via p11toolOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/src/p11tool-args.h.bak b/src/p11tool-args.h.bak index 7d0ca4dc3f..44a599324a 100644 --- a/src/p11tool-args.h.bak +++ b/src/p11tool-args.h.bak @@ -19,7 +19,7 @@ * The p11tool program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -140,9 +140,9 @@ typedef enum { /** count of all options for p11tool */ #define OPTION_CT 75 /** p11tool version */ -#define P11TOOL_VERSION "@VERSION@" +#define P11TOOL_VERSION "3.6.4" /** Full p11tool version text */ -#define P11TOOL_FULL_VERSION "p11tool @VERSION@" +#define P11TOOL_FULL_VERSION "p11tool 3.6.4" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/src/psktool-args.c.bak b/src/psktool-args.c.bak index 46851f20cd..8dde572da8 100644 --- a/src/psktool-args.c.bak +++ b/src/psktool-args.c.bak @@ -19,7 +19,7 @@ * The psktool program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -53,7 +53,7 @@ extern "C" { #endif extern FILE * option_usage_fp; #define zCopyright (psktool_opt_strs+0) -#define zLicenseDescrip (psktool_opt_strs+288) +#define zLicenseDescrip (psktool_opt_strs+282) #ifndef NULL @@ -63,13 +63,13 @@ extern FILE * option_usage_fp; /** * static const strings for psktool options */ -static char const psktool_opt_strs[1600] = -/* 0 */ "psktool @VERSION@\n" - "Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n" +static char const psktool_opt_strs[1586] = +/* 0 */ "psktool 3.6.4\n" + "Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the GNU General Public License,\n" "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0" -/* 288 */ "psktool is free software: you can redistribute it and/or modify it under\n" +/* 282 */ "psktool is free software: you can redistribute it and/or modify it under\n" "the terms of the GNU General Public License as published by the Free\n" "Software Foundation, either version 3 of the License, or (at your option)\n" "any later version.\n\n" @@ -79,46 +79,46 @@ static char const psktool_opt_strs[1600] = "details.\n\n" "You should have received a copy of the GNU General Public License along\n" "with this program. If not, see <http://www.gnu.org/licenses/>.\n\0" -/* 891 */ "Enable debugging\0" -/* 908 */ "DEBUG\0" -/* 914 */ "debug\0" -/* 920 */ "Specify the key size in bytes (default is 32-bytes or 256-bits)\0" -/* 984 */ "KEYSIZE\0" -/* 992 */ "keysize\0" -/* 1000 */ "Specify the username to use\0" -/* 1028 */ "USERNAME\0" -/* 1037 */ "username\0" -/* 1046 */ "Specify a pre-shared key file\0" -/* 1076 */ "PSKFILE\0" -/* 1084 */ "pskfile\0" -/* 1092 */ "an alias for the 'pskfile' option (deprecated)\0" -/* 1139 */ "passwd\0" -/* 1146 */ "display extended usage information and exit\0" -/* 1190 */ "help\0" -/* 1195 */ "extended usage information passed thru pager\0" -/* 1240 */ "more-help\0" -/* 1250 */ "output version information and exit\0" -/* 1286 */ "version\0" -/* 1294 */ "PSKTOOL\0" -/* 1302 */ "psktool - GnuTLS PSK tool\n" +/* 885 */ "Enable debugging\0" +/* 902 */ "DEBUG\0" +/* 908 */ "debug\0" +/* 914 */ "Specify the key size in bytes (default is 32-bytes or 256-bits)\0" +/* 978 */ "KEYSIZE\0" +/* 986 */ "keysize\0" +/* 994 */ "Specify the username to use\0" +/* 1022 */ "USERNAME\0" +/* 1031 */ "username\0" +/* 1040 */ "Specify a pre-shared key file\0" +/* 1070 */ "PSKFILE\0" +/* 1078 */ "pskfile\0" +/* 1086 */ "an alias for the 'pskfile' option (deprecated)\0" +/* 1133 */ "passwd\0" +/* 1140 */ "display extended usage information and exit\0" +/* 1184 */ "help\0" +/* 1189 */ "extended usage information passed thru pager\0" +/* 1234 */ "more-help\0" +/* 1244 */ "output version information and exit\0" +/* 1280 */ "version\0" +/* 1288 */ "PSKTOOL\0" +/* 1296 */ "psktool - GnuTLS PSK tool\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0" -/* 1386 */ "@PACKAGE_BUGREPORT@\0" -/* 1406 */ "\n\0" -/* 1408 */ "Program that generates random keys for use with TLS-PSK. The keys are\n" +/* 1380 */ "bugs@gnutls.org\0" +/* 1396 */ "\n\0" +/* 1398 */ "Program that generates random keys for use with TLS-PSK. The keys are\n" "stored in hexadecimal format in a key file.\n\0" -/* 1524 */ "psktool @VERSION@\0" -/* 1542 */ "psktool [options]\n" +/* 1514 */ "psktool 3.6.4\0" +/* 1528 */ "psktool [options]\n" "psktool --help for usage instructions.\n"; /** * debug option description: */ /** Descriptive text for the debug option */ -#define DEBUG_DESC (psktool_opt_strs+891) +#define DEBUG_DESC (psktool_opt_strs+885) /** Upper-cased name for the debug option */ -#define DEBUG_NAME (psktool_opt_strs+908) +#define DEBUG_NAME (psktool_opt_strs+902) /** Name string for the debug option */ -#define DEBUG_name (psktool_opt_strs+914) +#define DEBUG_name (psktool_opt_strs+908) /** Compiled in flag settings for the debug option */ #define DEBUG_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -127,11 +127,11 @@ static char const psktool_opt_strs[1600] = * keysize option description: */ /** Descriptive text for the keysize option */ -#define KEYSIZE_DESC (psktool_opt_strs+920) +#define KEYSIZE_DESC (psktool_opt_strs+914) /** Upper-cased name for the keysize option */ -#define KEYSIZE_NAME (psktool_opt_strs+984) +#define KEYSIZE_NAME (psktool_opt_strs+978) /** Name string for the keysize option */ -#define KEYSIZE_name (psktool_opt_strs+992) +#define KEYSIZE_name (psktool_opt_strs+986) /** Compiled in flag settings for the keysize option */ #define KEYSIZE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -140,11 +140,11 @@ static char const psktool_opt_strs[1600] = * username option description: */ /** Descriptive text for the username option */ -#define USERNAME_DESC (psktool_opt_strs+1000) +#define USERNAME_DESC (psktool_opt_strs+994) /** Upper-cased name for the username option */ -#define USERNAME_NAME (psktool_opt_strs+1028) +#define USERNAME_NAME (psktool_opt_strs+1022) /** Name string for the username option */ -#define USERNAME_name (psktool_opt_strs+1037) +#define USERNAME_name (psktool_opt_strs+1031) /** Compiled in flag settings for the username option */ #define USERNAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -153,11 +153,11 @@ static char const psktool_opt_strs[1600] = * pskfile option description: */ /** Descriptive text for the pskfile option */ -#define PSKFILE_DESC (psktool_opt_strs+1046) +#define PSKFILE_DESC (psktool_opt_strs+1040) /** Upper-cased name for the pskfile option */ -#define PSKFILE_NAME (psktool_opt_strs+1076) +#define PSKFILE_NAME (psktool_opt_strs+1070) /** Name string for the pskfile option */ -#define PSKFILE_name (psktool_opt_strs+1084) +#define PSKFILE_name (psktool_opt_strs+1078) /** Compiled in flag settings for the pskfile option */ #define PSKFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -166,21 +166,21 @@ static char const psktool_opt_strs[1600] = * passwd option description: */ /** Descriptive text for the passwd option */ -#define PASSWD_DESC (psktool_opt_strs+1092) +#define PASSWD_DESC (psktool_opt_strs+1086) #define PASSWD_NAME NULL /** Unmodified name string for the passwd option */ -#define PASSWD_name (psktool_opt_strs+1139) +#define PASSWD_name (psktool_opt_strs+1133) /** Compiled in flag settings for the passwd option */ #define PASSWD_FLAGS (PSKFILE_FLAGS | OPTST_ALIAS | OPTST_DEPRECATED) /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (psktool_opt_strs+1146) -#define HELP_name (psktool_opt_strs+1190) +#define HELP_DESC (psktool_opt_strs+1140) +#define HELP_name (psktool_opt_strs+1184) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (psktool_opt_strs+1195) -#define MORE_HELP_name (psktool_opt_strs+1240) +#define MORE_HELP_DESC (psktool_opt_strs+1189) +#define MORE_HELP_name (psktool_opt_strs+1234) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -193,8 +193,8 @@ static char const psktool_opt_strs[1600] = # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (psktool_opt_strs+1250) -#define VER_name (psktool_opt_strs+1286) +#define VER_DESC (psktool_opt_strs+1244) +#define VER_name (psktool_opt_strs+1280) /** * Declare option callback procedures */ @@ -316,21 +316,21 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of psktool. */ -#define zPROGNAME (psktool_opt_strs+1294) +#define zPROGNAME (psktool_opt_strs+1288) /** Reference to the title line for psktool usage. */ -#define zUsageTitle (psktool_opt_strs+1302) +#define zUsageTitle (psktool_opt_strs+1296) /** There is no psktool configuration file. */ #define zRcName NULL /** There are no directories to search for psktool config files. */ #define apzHomeList NULL /** The psktool program bug email address. */ -#define zBugsAddr (psktool_opt_strs+1386) +#define zBugsAddr (psktool_opt_strs+1380) /** Clarification/explanation of what psktool does. */ -#define zExplain (psktool_opt_strs+1406) +#define zExplain (psktool_opt_strs+1396) /** Extra detail explaining what psktool does. */ -#define zDetail (psktool_opt_strs+1408) +#define zDetail (psktool_opt_strs+1398) /** The full version string for psktool. */ -#define zFullVersion (psktool_opt_strs+1524) +#define zFullVersion (psktool_opt_strs+1514) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -342,7 +342,7 @@ static tOptDesc optDesc[OPTION_CT] = { #endif /* ENABLE_NLS */ #define psktool_full_usage (NULL) -#define psktool_short_usage (psktool_opt_strs+1542) +#define psktool_short_usage (psktool_opt_strs+1528) #endif /* not defined __doxygen__ */ @@ -652,8 +652,8 @@ static void bogus_function(void) { translate option names. */ /* referenced via psktoolOptions.pzCopyright */ - puts(_("psktool @VERSION@\n\ -Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n\ + puts(_("psktool 3.6.4\n\ +Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the GNU General Public License,\n\ version 3 or later <http://gnu.org/licenses/gpl.html>\n")); @@ -706,7 +706,7 @@ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n")); stored in hexadecimal format in a key file.\n")); /* referenced via psktoolOptions.pzFullVersion */ - puts(_("psktool @VERSION@")); + puts(_("psktool 3.6.4")); /* referenced via psktoolOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/src/psktool-args.h.bak b/src/psktool-args.h.bak index 2f2881ba2f..bc54dee0a6 100644 --- a/src/psktool-args.h.bak +++ b/src/psktool-args.h.bak @@ -19,7 +19,7 @@ * The psktool program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -78,9 +78,9 @@ typedef enum { /** count of all options for psktool */ #define OPTION_CT 8 /** psktool version */ -#define PSKTOOL_VERSION "@VERSION@" +#define PSKTOOL_VERSION "3.6.4" /** Full psktool version text */ -#define PSKTOOL_FULL_VERSION "psktool @VERSION@" +#define PSKTOOL_FULL_VERSION "psktool 3.6.4" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/src/serv-args.c.bak b/src/serv-args.c.bak index e0896afbc3..27e8e91353 100644 --- a/src/serv-args.c.bak +++ b/src/serv-args.c.bak @@ -19,7 +19,7 @@ * The gnutls-serv program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -53,7 +53,7 @@ extern "C" { #endif extern FILE * option_usage_fp; #define zCopyright (gnutls_serv_opt_strs+0) -#define zLicenseDescrip (gnutls_serv_opt_strs+292) +#define zLicenseDescrip (gnutls_serv_opt_strs+286) #ifndef NULL @@ -63,13 +63,13 @@ extern FILE * option_usage_fp; /** * static const strings for gnutls-serv options */ -static char const gnutls_serv_opt_strs[3442] = -/* 0 */ "gnutls-serv @VERSION@\n" - "Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n" +static char const gnutls_serv_opt_strs[3428] = +/* 0 */ "gnutls-serv 3.6.4\n" + "Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the GNU General Public License,\n" "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0" -/* 292 */ "gnutls-serv is free software: you can redistribute it and/or modify it\n" +/* 286 */ "gnutls-serv is free software: you can redistribute it and/or modify it\n" "under the terms of the GNU General Public License as published by the Free\n" "Software Foundation, either version 3 of the License, or (at your option)\n" "any later version.\n\n" @@ -79,145 +79,145 @@ static char const gnutls_serv_opt_strs[3442] = "more details.\n\n" "You should have received a copy of the GNU General Public License along\n" "with this program. If not, see <http://www.gnu.org/licenses/>.\n\0" -/* 903 */ "Enable debugging\0" -/* 920 */ "DEBUG\0" -/* 926 */ "debug\0" -/* 932 */ "Server's hostname for server name extension\0" -/* 976 */ "SNI_HOSTNAME\0" -/* 989 */ "sni-hostname\0" -/* 1002 */ "Send fatal alert on sni-hostname mismatch\0" -/* 1044 */ "SNI_HOSTNAME_FATAL\0" -/* 1063 */ "sni-hostname-fatal\0" -/* 1082 */ "Specify ALPN protocol to be enabled by the server\0" -/* 1132 */ "ALPN\0" -/* 1137 */ "alpn\0" -/* 1142 */ "Send fatal alert on non-matching ALPN name\0" -/* 1185 */ "ALPN_FATAL\0" -/* 1196 */ "alpn-fatal\0" -/* 1207 */ "Don't accept session tickets\0" -/* 1236 */ "NOTICKET\0" -/* 1245 */ "noticket\0" -/* 1254 */ "Don't require cookie on DTLS sessions\0" -/* 1292 */ "NOCOOKIE\0" -/* 1301 */ "nocookie\0" -/* 1310 */ "Generate Diffie-Hellman parameters\0" -/* 1345 */ "GENERATE\0" -/* 1354 */ "generate\0" -/* 1363 */ "Suppress some messages\0" -/* 1386 */ "QUIET\0" -/* 1392 */ "quiet\0" -/* 1398 */ "Do not use a resumption database\0" -/* 1431 */ "NODB\0" -/* 1436 */ "nodb\0" -/* 1441 */ "Act as an HTTP server\0" -/* 1463 */ "HTTP\0" -/* 1468 */ "http\0" -/* 1473 */ "Act as an Echo server\0" -/* 1495 */ "ECHO\0" -/* 1500 */ "echo\0" -/* 1505 */ "Use DTLS (datagram TLS) over UDP\0" -/* 1538 */ "UDP\0" -/* 1542 */ "udp\0" -/* 1546 */ "Set MTU for datagram TLS\0" -/* 1571 */ "MTU\0" -/* 1575 */ "mtu\0" -/* 1579 */ "Offer SRTP profiles\0" -/* 1599 */ "SRTP_PROFILES\0" -/* 1613 */ "srtp-profiles\0" -/* 1627 */ "Do not request a client certificate\0" -/* 1663 */ "DISABLE_CLIENT_CERT\0" -/* 1683 */ "disable-client-cert\0" -/* 1703 */ "Require a client certificate\0" -/* 1732 */ "REQUIRE_CLIENT_CERT\0" -/* 1752 */ "require-client-cert\0" -/* 1772 */ "If a client certificate is sent then verify it.\0" -/* 1820 */ "VERIFY_CLIENT_CERT\0" -/* 1839 */ "verify-client-cert\0" -/* 1858 */ "Activate heartbeat support\0" -/* 1885 */ "HEARTBEAT\0" -/* 1895 */ "heartbeat\0" -/* 1905 */ "Use DER format for certificates to read from\0" -/* 1950 */ "X509FMTDER\0" -/* 1961 */ "x509fmtder\0" -/* 1972 */ "Priorities string\0" -/* 1990 */ "PRIORITY\0" -/* 1999 */ "priority\0" -/* 2008 */ "DH params file to use\0" -/* 2030 */ "DHPARAMS\0" -/* 2039 */ "dhparams\0" -/* 2048 */ "Certificate file or PKCS #11 URL to use\0" -/* 2088 */ "X509CAFILE\0" -/* 2099 */ "x509cafile\0" -/* 2110 */ "CRL file to use\0" -/* 2126 */ "X509CRLFILE\0" -/* 2138 */ "x509crlfile\0" -/* 2150 */ "PGP Key file to use (deprecated)\0" -/* 2183 */ "PGPKEYFILE\0" -/* 2194 */ "pgpkeyfile\0" -/* 2205 */ "X.509 key file or PKCS #11 URL to use\0" -/* 2243 */ "X509KEYFILE\0" -/* 2255 */ "x509keyfile\0" -/* 2267 */ "X.509 Certificate file or PKCS #11 URL to use\0" -/* 2313 */ "X509CERTFILE\0" -/* 2326 */ "x509certfile\0" -/* 2339 */ "an alias for the 'x509keyfile' option (deprecated)\0" -/* 2390 */ "x509dsakeyfile\0" -/* 2405 */ "an alias for the 'x509certfile' option (deprecated)\0" -/* 2457 */ "x509dsacertfile\0" -/* 2473 */ "x509ecckeyfile\0" -/* 2488 */ "x509ecccertfile\0" -/* 2504 */ "SRP password file to use\0" -/* 2529 */ "SRPPASSWD\0" -/* 2539 */ "srppasswd\0" -/* 2549 */ "SRP password configuration file to use\0" -/* 2588 */ "SRPPASSWDCONF\0" -/* 2602 */ "srppasswdconf\0" -/* 2616 */ "PSK password file to use\0" -/* 2641 */ "PSKPASSWD\0" -/* 2651 */ "pskpasswd\0" -/* 2661 */ "PSK identity hint to use\0" -/* 2686 */ "PSKHINT\0" -/* 2694 */ "pskhint\0" -/* 2702 */ "The OCSP response to send to client\0" -/* 2738 */ "OCSP_RESPONSE\0" -/* 2752 */ "ocsp-response\0" -/* 2766 */ "Ignore any errors when setting the OCSP response\0" -/* 2815 */ "IGNORE_OCSP_RESPONSE_ERRORS\0" -/* 2843 */ "ignore-ocsp-response-errors\0" -/* 2871 */ "The port to connect to\0" -/* 2894 */ "PORT\0" -/* 2899 */ "port\0" -/* 2904 */ "Print a list of the supported algorithms and modes\0" -/* 2955 */ "LIST\0" -/* 2960 */ "list\0" -/* 2965 */ "Specify the PKCS #11 provider library\0" -/* 3003 */ "PROVIDER\0" -/* 3012 */ "provider\0" -/* 3021 */ "display extended usage information and exit\0" -/* 3065 */ "help\0" -/* 3070 */ "extended usage information passed thru pager\0" -/* 3115 */ "more-help\0" -/* 3125 */ "output version information and exit\0" -/* 3161 */ "version\0" -/* 3169 */ "GNUTLS_SERV\0" -/* 3181 */ "gnutls-serv - GnuTLS server\n" +/* 897 */ "Enable debugging\0" +/* 914 */ "DEBUG\0" +/* 920 */ "debug\0" +/* 926 */ "Server's hostname for server name extension\0" +/* 970 */ "SNI_HOSTNAME\0" +/* 983 */ "sni-hostname\0" +/* 996 */ "Send fatal alert on sni-hostname mismatch\0" +/* 1038 */ "SNI_HOSTNAME_FATAL\0" +/* 1057 */ "sni-hostname-fatal\0" +/* 1076 */ "Specify ALPN protocol to be enabled by the server\0" +/* 1126 */ "ALPN\0" +/* 1131 */ "alpn\0" +/* 1136 */ "Send fatal alert on non-matching ALPN name\0" +/* 1179 */ "ALPN_FATAL\0" +/* 1190 */ "alpn-fatal\0" +/* 1201 */ "Don't accept session tickets\0" +/* 1230 */ "NOTICKET\0" +/* 1239 */ "noticket\0" +/* 1248 */ "Don't require cookie on DTLS sessions\0" +/* 1286 */ "NOCOOKIE\0" +/* 1295 */ "nocookie\0" +/* 1304 */ "Generate Diffie-Hellman parameters\0" +/* 1339 */ "GENERATE\0" +/* 1348 */ "generate\0" +/* 1357 */ "Suppress some messages\0" +/* 1380 */ "QUIET\0" +/* 1386 */ "quiet\0" +/* 1392 */ "Do not use a resumption database\0" +/* 1425 */ "NODB\0" +/* 1430 */ "nodb\0" +/* 1435 */ "Act as an HTTP server\0" +/* 1457 */ "HTTP\0" +/* 1462 */ "http\0" +/* 1467 */ "Act as an Echo server\0" +/* 1489 */ "ECHO\0" +/* 1494 */ "echo\0" +/* 1499 */ "Use DTLS (datagram TLS) over UDP\0" +/* 1532 */ "UDP\0" +/* 1536 */ "udp\0" +/* 1540 */ "Set MTU for datagram TLS\0" +/* 1565 */ "MTU\0" +/* 1569 */ "mtu\0" +/* 1573 */ "Offer SRTP profiles\0" +/* 1593 */ "SRTP_PROFILES\0" +/* 1607 */ "srtp-profiles\0" +/* 1621 */ "Do not request a client certificate\0" +/* 1657 */ "DISABLE_CLIENT_CERT\0" +/* 1677 */ "disable-client-cert\0" +/* 1697 */ "Require a client certificate\0" +/* 1726 */ "REQUIRE_CLIENT_CERT\0" +/* 1746 */ "require-client-cert\0" +/* 1766 */ "If a client certificate is sent then verify it.\0" +/* 1814 */ "VERIFY_CLIENT_CERT\0" +/* 1833 */ "verify-client-cert\0" +/* 1852 */ "Activate heartbeat support\0" +/* 1879 */ "HEARTBEAT\0" +/* 1889 */ "heartbeat\0" +/* 1899 */ "Use DER format for certificates to read from\0" +/* 1944 */ "X509FMTDER\0" +/* 1955 */ "x509fmtder\0" +/* 1966 */ "Priorities string\0" +/* 1984 */ "PRIORITY\0" +/* 1993 */ "priority\0" +/* 2002 */ "DH params file to use\0" +/* 2024 */ "DHPARAMS\0" +/* 2033 */ "dhparams\0" +/* 2042 */ "Certificate file or PKCS #11 URL to use\0" +/* 2082 */ "X509CAFILE\0" +/* 2093 */ "x509cafile\0" +/* 2104 */ "CRL file to use\0" +/* 2120 */ "X509CRLFILE\0" +/* 2132 */ "x509crlfile\0" +/* 2144 */ "PGP Key file to use (deprecated)\0" +/* 2177 */ "PGPKEYFILE\0" +/* 2188 */ "pgpkeyfile\0" +/* 2199 */ "X.509 key file or PKCS #11 URL to use\0" +/* 2237 */ "X509KEYFILE\0" +/* 2249 */ "x509keyfile\0" +/* 2261 */ "X.509 Certificate file or PKCS #11 URL to use\0" +/* 2307 */ "X509CERTFILE\0" +/* 2320 */ "x509certfile\0" +/* 2333 */ "an alias for the 'x509keyfile' option (deprecated)\0" +/* 2384 */ "x509dsakeyfile\0" +/* 2399 */ "an alias for the 'x509certfile' option (deprecated)\0" +/* 2451 */ "x509dsacertfile\0" +/* 2467 */ "x509ecckeyfile\0" +/* 2482 */ "x509ecccertfile\0" +/* 2498 */ "SRP password file to use\0" +/* 2523 */ "SRPPASSWD\0" +/* 2533 */ "srppasswd\0" +/* 2543 */ "SRP password configuration file to use\0" +/* 2582 */ "SRPPASSWDCONF\0" +/* 2596 */ "srppasswdconf\0" +/* 2610 */ "PSK password file to use\0" +/* 2635 */ "PSKPASSWD\0" +/* 2645 */ "pskpasswd\0" +/* 2655 */ "PSK identity hint to use\0" +/* 2680 */ "PSKHINT\0" +/* 2688 */ "pskhint\0" +/* 2696 */ "The OCSP response to send to client\0" +/* 2732 */ "OCSP_RESPONSE\0" +/* 2746 */ "ocsp-response\0" +/* 2760 */ "Ignore any errors when setting the OCSP response\0" +/* 2809 */ "IGNORE_OCSP_RESPONSE_ERRORS\0" +/* 2837 */ "ignore-ocsp-response-errors\0" +/* 2865 */ "The port to connect to\0" +/* 2888 */ "PORT\0" +/* 2893 */ "port\0" +/* 2898 */ "Print a list of the supported algorithms and modes\0" +/* 2949 */ "LIST\0" +/* 2954 */ "list\0" +/* 2959 */ "Specify the PKCS #11 provider library\0" +/* 2997 */ "PROVIDER\0" +/* 3006 */ "provider\0" +/* 3015 */ "display extended usage information and exit\0" +/* 3059 */ "help\0" +/* 3064 */ "extended usage information passed thru pager\0" +/* 3109 */ "more-help\0" +/* 3119 */ "output version information and exit\0" +/* 3155 */ "version\0" +/* 3163 */ "GNUTLS_SERV\0" +/* 3175 */ "gnutls-serv - GnuTLS server\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0" -/* 3267 */ "@PACKAGE_BUGREPORT@\0" -/* 3287 */ "\n\0" -/* 3289 */ "Server program that listens to incoming TLS connections.\n\0" -/* 3347 */ "gnutls-serv @VERSION@\0" -/* 3369 */ "Usage: gnutls-serv [options]\n" +/* 3261 */ "bugs@gnutls.org\0" +/* 3277 */ "\n\0" +/* 3279 */ "Server program that listens to incoming TLS connections.\n\0" +/* 3337 */ "gnutls-serv 3.6.4\0" +/* 3355 */ "Usage: gnutls-serv [options]\n" "gnutls-serv --help for usage instructions.\n"; /** * debug option description: */ /** Descriptive text for the debug option */ -#define DEBUG_DESC (gnutls_serv_opt_strs+903) +#define DEBUG_DESC (gnutls_serv_opt_strs+897) /** Upper-cased name for the debug option */ -#define DEBUG_NAME (gnutls_serv_opt_strs+920) +#define DEBUG_NAME (gnutls_serv_opt_strs+914) /** Name string for the debug option */ -#define DEBUG_name (gnutls_serv_opt_strs+926) +#define DEBUG_name (gnutls_serv_opt_strs+920) /** Compiled in flag settings for the debug option */ #define DEBUG_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -226,11 +226,11 @@ static char const gnutls_serv_opt_strs[3442] = * sni-hostname option description: */ /** Descriptive text for the sni-hostname option */ -#define SNI_HOSTNAME_DESC (gnutls_serv_opt_strs+932) +#define SNI_HOSTNAME_DESC (gnutls_serv_opt_strs+926) /** Upper-cased name for the sni-hostname option */ -#define SNI_HOSTNAME_NAME (gnutls_serv_opt_strs+976) +#define SNI_HOSTNAME_NAME (gnutls_serv_opt_strs+970) /** Name string for the sni-hostname option */ -#define SNI_HOSTNAME_name (gnutls_serv_opt_strs+989) +#define SNI_HOSTNAME_name (gnutls_serv_opt_strs+983) /** Compiled in flag settings for the sni-hostname option */ #define SNI_HOSTNAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -239,11 +239,11 @@ static char const gnutls_serv_opt_strs[3442] = * sni-hostname-fatal option description: */ /** Descriptive text for the sni-hostname-fatal option */ -#define SNI_HOSTNAME_FATAL_DESC (gnutls_serv_opt_strs+1002) +#define SNI_HOSTNAME_FATAL_DESC (gnutls_serv_opt_strs+996) /** Upper-cased name for the sni-hostname-fatal option */ -#define SNI_HOSTNAME_FATAL_NAME (gnutls_serv_opt_strs+1044) +#define SNI_HOSTNAME_FATAL_NAME (gnutls_serv_opt_strs+1038) /** Name string for the sni-hostname-fatal option */ -#define SNI_HOSTNAME_FATAL_name (gnutls_serv_opt_strs+1063) +#define SNI_HOSTNAME_FATAL_name (gnutls_serv_opt_strs+1057) /** Compiled in flag settings for the sni-hostname-fatal option */ #define SNI_HOSTNAME_FATAL_FLAGS (OPTST_DISABLED) @@ -251,11 +251,11 @@ static char const gnutls_serv_opt_strs[3442] = * alpn option description: */ /** Descriptive text for the alpn option */ -#define ALPN_DESC (gnutls_serv_opt_strs+1082) +#define ALPN_DESC (gnutls_serv_opt_strs+1076) /** Upper-cased name for the alpn option */ -#define ALPN_NAME (gnutls_serv_opt_strs+1132) +#define ALPN_NAME (gnutls_serv_opt_strs+1126) /** Name string for the alpn option */ -#define ALPN_name (gnutls_serv_opt_strs+1137) +#define ALPN_name (gnutls_serv_opt_strs+1131) /** Compiled in flag settings for the alpn option */ #define ALPN_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -264,11 +264,11 @@ static char const gnutls_serv_opt_strs[3442] = * alpn-fatal option description: */ /** Descriptive text for the alpn-fatal option */ -#define ALPN_FATAL_DESC (gnutls_serv_opt_strs+1142) +#define ALPN_FATAL_DESC (gnutls_serv_opt_strs+1136) /** Upper-cased name for the alpn-fatal option */ -#define ALPN_FATAL_NAME (gnutls_serv_opt_strs+1185) +#define ALPN_FATAL_NAME (gnutls_serv_opt_strs+1179) /** Name string for the alpn-fatal option */ -#define ALPN_FATAL_name (gnutls_serv_opt_strs+1196) +#define ALPN_FATAL_name (gnutls_serv_opt_strs+1190) /** Compiled in flag settings for the alpn-fatal option */ #define ALPN_FATAL_FLAGS (OPTST_DISABLED) @@ -276,11 +276,11 @@ static char const gnutls_serv_opt_strs[3442] = * noticket option description: */ /** Descriptive text for the noticket option */ -#define NOTICKET_DESC (gnutls_serv_opt_strs+1207) +#define NOTICKET_DESC (gnutls_serv_opt_strs+1201) /** Upper-cased name for the noticket option */ -#define NOTICKET_NAME (gnutls_serv_opt_strs+1236) +#define NOTICKET_NAME (gnutls_serv_opt_strs+1230) /** Name string for the noticket option */ -#define NOTICKET_name (gnutls_serv_opt_strs+1245) +#define NOTICKET_name (gnutls_serv_opt_strs+1239) /** Compiled in flag settings for the noticket option */ #define NOTICKET_FLAGS (OPTST_DISABLED) @@ -288,11 +288,11 @@ static char const gnutls_serv_opt_strs[3442] = * nocookie option description: */ /** Descriptive text for the nocookie option */ -#define NOCOOKIE_DESC (gnutls_serv_opt_strs+1254) +#define NOCOOKIE_DESC (gnutls_serv_opt_strs+1248) /** Upper-cased name for the nocookie option */ -#define NOCOOKIE_NAME (gnutls_serv_opt_strs+1292) +#define NOCOOKIE_NAME (gnutls_serv_opt_strs+1286) /** Name string for the nocookie option */ -#define NOCOOKIE_name (gnutls_serv_opt_strs+1301) +#define NOCOOKIE_name (gnutls_serv_opt_strs+1295) /** Compiled in flag settings for the nocookie option */ #define NOCOOKIE_FLAGS (OPTST_DISABLED) @@ -300,11 +300,11 @@ static char const gnutls_serv_opt_strs[3442] = * generate option description: */ /** Descriptive text for the generate option */ -#define GENERATE_DESC (gnutls_serv_opt_strs+1310) +#define GENERATE_DESC (gnutls_serv_opt_strs+1304) /** Upper-cased name for the generate option */ -#define GENERATE_NAME (gnutls_serv_opt_strs+1345) +#define GENERATE_NAME (gnutls_serv_opt_strs+1339) /** Name string for the generate option */ -#define GENERATE_name (gnutls_serv_opt_strs+1354) +#define GENERATE_name (gnutls_serv_opt_strs+1348) /** Compiled in flag settings for the generate option */ #define GENERATE_FLAGS (OPTST_DISABLED) @@ -312,11 +312,11 @@ static char const gnutls_serv_opt_strs[3442] = * quiet option description: */ /** Descriptive text for the quiet option */ -#define QUIET_DESC (gnutls_serv_opt_strs+1363) +#define QUIET_DESC (gnutls_serv_opt_strs+1357) /** Upper-cased name for the quiet option */ -#define QUIET_NAME (gnutls_serv_opt_strs+1386) +#define QUIET_NAME (gnutls_serv_opt_strs+1380) /** Name string for the quiet option */ -#define QUIET_name (gnutls_serv_opt_strs+1392) +#define QUIET_name (gnutls_serv_opt_strs+1386) /** Compiled in flag settings for the quiet option */ #define QUIET_FLAGS (OPTST_DISABLED) @@ -324,11 +324,11 @@ static char const gnutls_serv_opt_strs[3442] = * nodb option description: */ /** Descriptive text for the nodb option */ -#define NODB_DESC (gnutls_serv_opt_strs+1398) +#define NODB_DESC (gnutls_serv_opt_strs+1392) /** Upper-cased name for the nodb option */ -#define NODB_NAME (gnutls_serv_opt_strs+1431) +#define NODB_NAME (gnutls_serv_opt_strs+1425) /** Name string for the nodb option */ -#define NODB_name (gnutls_serv_opt_strs+1436) +#define NODB_name (gnutls_serv_opt_strs+1430) /** Compiled in flag settings for the nodb option */ #define NODB_FLAGS (OPTST_DISABLED) @@ -336,11 +336,11 @@ static char const gnutls_serv_opt_strs[3442] = * http option description: */ /** Descriptive text for the http option */ -#define HTTP_DESC (gnutls_serv_opt_strs+1441) +#define HTTP_DESC (gnutls_serv_opt_strs+1435) /** Upper-cased name for the http option */ -#define HTTP_NAME (gnutls_serv_opt_strs+1463) +#define HTTP_NAME (gnutls_serv_opt_strs+1457) /** Name string for the http option */ -#define HTTP_name (gnutls_serv_opt_strs+1468) +#define HTTP_name (gnutls_serv_opt_strs+1462) /** Compiled in flag settings for the http option */ #define HTTP_FLAGS (OPTST_DISABLED) @@ -348,11 +348,11 @@ static char const gnutls_serv_opt_strs[3442] = * echo option description: */ /** Descriptive text for the echo option */ -#define ECHO_DESC (gnutls_serv_opt_strs+1473) +#define ECHO_DESC (gnutls_serv_opt_strs+1467) /** Upper-cased name for the echo option */ -#define ECHO_NAME (gnutls_serv_opt_strs+1495) +#define ECHO_NAME (gnutls_serv_opt_strs+1489) /** Name string for the echo option */ -#define ECHO_name (gnutls_serv_opt_strs+1500) +#define ECHO_name (gnutls_serv_opt_strs+1494) /** Compiled in flag settings for the echo option */ #define ECHO_FLAGS (OPTST_DISABLED) @@ -360,11 +360,11 @@ static char const gnutls_serv_opt_strs[3442] = * udp option description: */ /** Descriptive text for the udp option */ -#define UDP_DESC (gnutls_serv_opt_strs+1505) +#define UDP_DESC (gnutls_serv_opt_strs+1499) /** Upper-cased name for the udp option */ -#define UDP_NAME (gnutls_serv_opt_strs+1538) +#define UDP_NAME (gnutls_serv_opt_strs+1532) /** Name string for the udp option */ -#define UDP_name (gnutls_serv_opt_strs+1542) +#define UDP_name (gnutls_serv_opt_strs+1536) /** Compiled in flag settings for the udp option */ #define UDP_FLAGS (OPTST_DISABLED) @@ -372,11 +372,11 @@ static char const gnutls_serv_opt_strs[3442] = * mtu option description: */ /** Descriptive text for the mtu option */ -#define MTU_DESC (gnutls_serv_opt_strs+1546) +#define MTU_DESC (gnutls_serv_opt_strs+1540) /** Upper-cased name for the mtu option */ -#define MTU_NAME (gnutls_serv_opt_strs+1571) +#define MTU_NAME (gnutls_serv_opt_strs+1565) /** Name string for the mtu option */ -#define MTU_name (gnutls_serv_opt_strs+1575) +#define MTU_name (gnutls_serv_opt_strs+1569) /** Compiled in flag settings for the mtu option */ #define MTU_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -385,11 +385,11 @@ static char const gnutls_serv_opt_strs[3442] = * srtp_profiles option description: */ /** Descriptive text for the srtp_profiles option */ -#define SRTP_PROFILES_DESC (gnutls_serv_opt_strs+1579) +#define SRTP_PROFILES_DESC (gnutls_serv_opt_strs+1573) /** Upper-cased name for the srtp_profiles option */ -#define SRTP_PROFILES_NAME (gnutls_serv_opt_strs+1599) +#define SRTP_PROFILES_NAME (gnutls_serv_opt_strs+1593) /** Name string for the srtp_profiles option */ -#define SRTP_PROFILES_name (gnutls_serv_opt_strs+1613) +#define SRTP_PROFILES_name (gnutls_serv_opt_strs+1607) /** Compiled in flag settings for the srtp_profiles option */ #define SRTP_PROFILES_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -399,11 +399,11 @@ static char const gnutls_serv_opt_strs[3442] = * "Must also have options" and "Incompatible options": */ /** Descriptive text for the disable-client-cert option */ -#define DISABLE_CLIENT_CERT_DESC (gnutls_serv_opt_strs+1627) +#define DISABLE_CLIENT_CERT_DESC (gnutls_serv_opt_strs+1621) /** Upper-cased name for the disable-client-cert option */ -#define DISABLE_CLIENT_CERT_NAME (gnutls_serv_opt_strs+1663) +#define DISABLE_CLIENT_CERT_NAME (gnutls_serv_opt_strs+1657) /** Name string for the disable-client-cert option */ -#define DISABLE_CLIENT_CERT_name (gnutls_serv_opt_strs+1683) +#define DISABLE_CLIENT_CERT_name (gnutls_serv_opt_strs+1677) /** Other options that appear in conjunction with the disable-client-cert option */ static int const aDisable_Client_CertCantList[] = { INDEX_OPT_REQUIRE_CLIENT_CERT, NO_EQUIVALENT }; @@ -414,11 +414,11 @@ static int const aDisable_Client_CertCantList[] = { * require-client-cert option description: */ /** Descriptive text for the require-client-cert option */ -#define REQUIRE_CLIENT_CERT_DESC (gnutls_serv_opt_strs+1703) +#define REQUIRE_CLIENT_CERT_DESC (gnutls_serv_opt_strs+1697) /** Upper-cased name for the require-client-cert option */ -#define REQUIRE_CLIENT_CERT_NAME (gnutls_serv_opt_strs+1732) +#define REQUIRE_CLIENT_CERT_NAME (gnutls_serv_opt_strs+1726) /** Name string for the require-client-cert option */ -#define REQUIRE_CLIENT_CERT_name (gnutls_serv_opt_strs+1752) +#define REQUIRE_CLIENT_CERT_name (gnutls_serv_opt_strs+1746) /** Compiled in flag settings for the require-client-cert option */ #define REQUIRE_CLIENT_CERT_FLAGS (OPTST_DISABLED) @@ -426,11 +426,11 @@ static int const aDisable_Client_CertCantList[] = { * verify-client-cert option description: */ /** Descriptive text for the verify-client-cert option */ -#define VERIFY_CLIENT_CERT_DESC (gnutls_serv_opt_strs+1772) +#define VERIFY_CLIENT_CERT_DESC (gnutls_serv_opt_strs+1766) /** Upper-cased name for the verify-client-cert option */ -#define VERIFY_CLIENT_CERT_NAME (gnutls_serv_opt_strs+1820) +#define VERIFY_CLIENT_CERT_NAME (gnutls_serv_opt_strs+1814) /** Name string for the verify-client-cert option */ -#define VERIFY_CLIENT_CERT_name (gnutls_serv_opt_strs+1839) +#define VERIFY_CLIENT_CERT_name (gnutls_serv_opt_strs+1833) /** Compiled in flag settings for the verify-client-cert option */ #define VERIFY_CLIENT_CERT_FLAGS (OPTST_DISABLED) @@ -438,11 +438,11 @@ static int const aDisable_Client_CertCantList[] = { * heartbeat option description: */ /** Descriptive text for the heartbeat option */ -#define HEARTBEAT_DESC (gnutls_serv_opt_strs+1858) +#define HEARTBEAT_DESC (gnutls_serv_opt_strs+1852) /** Upper-cased name for the heartbeat option */ -#define HEARTBEAT_NAME (gnutls_serv_opt_strs+1885) +#define HEARTBEAT_NAME (gnutls_serv_opt_strs+1879) /** Name string for the heartbeat option */ -#define HEARTBEAT_name (gnutls_serv_opt_strs+1895) +#define HEARTBEAT_name (gnutls_serv_opt_strs+1889) /** Compiled in flag settings for the heartbeat option */ #define HEARTBEAT_FLAGS (OPTST_DISABLED) @@ -450,11 +450,11 @@ static int const aDisable_Client_CertCantList[] = { * x509fmtder option description: */ /** Descriptive text for the x509fmtder option */ -#define X509FMTDER_DESC (gnutls_serv_opt_strs+1905) +#define X509FMTDER_DESC (gnutls_serv_opt_strs+1899) /** Upper-cased name for the x509fmtder option */ -#define X509FMTDER_NAME (gnutls_serv_opt_strs+1950) +#define X509FMTDER_NAME (gnutls_serv_opt_strs+1944) /** Name string for the x509fmtder option */ -#define X509FMTDER_name (gnutls_serv_opt_strs+1961) +#define X509FMTDER_name (gnutls_serv_opt_strs+1955) /** Compiled in flag settings for the x509fmtder option */ #define X509FMTDER_FLAGS (OPTST_DISABLED) @@ -462,11 +462,11 @@ static int const aDisable_Client_CertCantList[] = { * priority option description: */ /** Descriptive text for the priority option */ -#define PRIORITY_DESC (gnutls_serv_opt_strs+1972) +#define PRIORITY_DESC (gnutls_serv_opt_strs+1966) /** Upper-cased name for the priority option */ -#define PRIORITY_NAME (gnutls_serv_opt_strs+1990) +#define PRIORITY_NAME (gnutls_serv_opt_strs+1984) /** Name string for the priority option */ -#define PRIORITY_name (gnutls_serv_opt_strs+1999) +#define PRIORITY_name (gnutls_serv_opt_strs+1993) /** Compiled in flag settings for the priority option */ #define PRIORITY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -475,11 +475,11 @@ static int const aDisable_Client_CertCantList[] = { * dhparams option description: */ /** Descriptive text for the dhparams option */ -#define DHPARAMS_DESC (gnutls_serv_opt_strs+2008) +#define DHPARAMS_DESC (gnutls_serv_opt_strs+2002) /** Upper-cased name for the dhparams option */ -#define DHPARAMS_NAME (gnutls_serv_opt_strs+2030) +#define DHPARAMS_NAME (gnutls_serv_opt_strs+2024) /** Name string for the dhparams option */ -#define DHPARAMS_name (gnutls_serv_opt_strs+2039) +#define DHPARAMS_name (gnutls_serv_opt_strs+2033) /** Compiled in flag settings for the dhparams option */ #define DHPARAMS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -488,11 +488,11 @@ static int const aDisable_Client_CertCantList[] = { * x509cafile option description: */ /** Descriptive text for the x509cafile option */ -#define X509CAFILE_DESC (gnutls_serv_opt_strs+2048) +#define X509CAFILE_DESC (gnutls_serv_opt_strs+2042) /** Upper-cased name for the x509cafile option */ -#define X509CAFILE_NAME (gnutls_serv_opt_strs+2088) +#define X509CAFILE_NAME (gnutls_serv_opt_strs+2082) /** Name string for the x509cafile option */ -#define X509CAFILE_name (gnutls_serv_opt_strs+2099) +#define X509CAFILE_name (gnutls_serv_opt_strs+2093) /** Compiled in flag settings for the x509cafile option */ #define X509CAFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -501,11 +501,11 @@ static int const aDisable_Client_CertCantList[] = { * x509crlfile option description: */ /** Descriptive text for the x509crlfile option */ -#define X509CRLFILE_DESC (gnutls_serv_opt_strs+2110) +#define X509CRLFILE_DESC (gnutls_serv_opt_strs+2104) /** Upper-cased name for the x509crlfile option */ -#define X509CRLFILE_NAME (gnutls_serv_opt_strs+2126) +#define X509CRLFILE_NAME (gnutls_serv_opt_strs+2120) /** Name string for the x509crlfile option */ -#define X509CRLFILE_name (gnutls_serv_opt_strs+2138) +#define X509CRLFILE_name (gnutls_serv_opt_strs+2132) /** Compiled in flag settings for the x509crlfile option */ #define X509CRLFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -514,11 +514,11 @@ static int const aDisable_Client_CertCantList[] = { * pgpkeyfile option description: */ /** Descriptive text for the pgpkeyfile option */ -#define PGPKEYFILE_DESC (gnutls_serv_opt_strs+2150) +#define PGPKEYFILE_DESC (gnutls_serv_opt_strs+2144) /** Upper-cased name for the pgpkeyfile option */ -#define PGPKEYFILE_NAME (gnutls_serv_opt_strs+2183) +#define PGPKEYFILE_NAME (gnutls_serv_opt_strs+2177) /** Name string for the pgpkeyfile option */ -#define PGPKEYFILE_name (gnutls_serv_opt_strs+2194) +#define PGPKEYFILE_name (gnutls_serv_opt_strs+2188) /** Compiled in flag settings for the pgpkeyfile option */ #define PGPKEYFILE_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -527,11 +527,11 @@ static int const aDisable_Client_CertCantList[] = { * x509keyfile option description: */ /** Descriptive text for the x509keyfile option */ -#define X509KEYFILE_DESC (gnutls_serv_opt_strs+2205) +#define X509KEYFILE_DESC (gnutls_serv_opt_strs+2199) /** Upper-cased name for the x509keyfile option */ -#define X509KEYFILE_NAME (gnutls_serv_opt_strs+2243) +#define X509KEYFILE_NAME (gnutls_serv_opt_strs+2237) /** Name string for the x509keyfile option */ -#define X509KEYFILE_name (gnutls_serv_opt_strs+2255) +#define X509KEYFILE_name (gnutls_serv_opt_strs+2249) /** Compiled in flag settings for the x509keyfile option */ #define X509KEYFILE_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -540,11 +540,11 @@ static int const aDisable_Client_CertCantList[] = { * x509certfile option description: */ /** Descriptive text for the x509certfile option */ -#define X509CERTFILE_DESC (gnutls_serv_opt_strs+2267) +#define X509CERTFILE_DESC (gnutls_serv_opt_strs+2261) /** Upper-cased name for the x509certfile option */ -#define X509CERTFILE_NAME (gnutls_serv_opt_strs+2313) +#define X509CERTFILE_NAME (gnutls_serv_opt_strs+2307) /** Name string for the x509certfile option */ -#define X509CERTFILE_name (gnutls_serv_opt_strs+2326) +#define X509CERTFILE_name (gnutls_serv_opt_strs+2320) /** Compiled in flag settings for the x509certfile option */ #define X509CERTFILE_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -553,10 +553,10 @@ static int const aDisable_Client_CertCantList[] = { * x509dsakeyfile option description: */ /** Descriptive text for the x509dsakeyfile option */ -#define X509DSAKEYFILE_DESC (gnutls_serv_opt_strs+2339) +#define X509DSAKEYFILE_DESC (gnutls_serv_opt_strs+2333) #define X509DSAKEYFILE_NAME NULL /** Unmodified name string for the x509dsakeyfile option */ -#define X509DSAKEYFILE_name (gnutls_serv_opt_strs+2390) +#define X509DSAKEYFILE_name (gnutls_serv_opt_strs+2384) /** Compiled in flag settings for the x509dsakeyfile option */ #define X509DSAKEYFILE_FLAGS (X509KEYFILE_FLAGS | OPTST_ALIAS | OPTST_DEPRECATED) @@ -564,10 +564,10 @@ static int const aDisable_Client_CertCantList[] = { * x509dsacertfile option description: */ /** Descriptive text for the x509dsacertfile option */ -#define X509DSACERTFILE_DESC (gnutls_serv_opt_strs+2405) +#define X509DSACERTFILE_DESC (gnutls_serv_opt_strs+2399) #define X509DSACERTFILE_NAME NULL /** Unmodified name string for the x509dsacertfile option */ -#define X509DSACERTFILE_name (gnutls_serv_opt_strs+2457) +#define X509DSACERTFILE_name (gnutls_serv_opt_strs+2451) /** Compiled in flag settings for the x509dsacertfile option */ #define X509DSACERTFILE_FLAGS (X509CERTFILE_FLAGS | OPTST_ALIAS | OPTST_DEPRECATED) @@ -575,10 +575,10 @@ static int const aDisable_Client_CertCantList[] = { * x509ecckeyfile option description: */ /** Descriptive text for the x509ecckeyfile option */ -#define X509ECCKEYFILE_DESC (gnutls_serv_opt_strs+2339) +#define X509ECCKEYFILE_DESC (gnutls_serv_opt_strs+2333) #define X509ECCKEYFILE_NAME NULL /** Unmodified name string for the x509ecckeyfile option */ -#define X509ECCKEYFILE_name (gnutls_serv_opt_strs+2473) +#define X509ECCKEYFILE_name (gnutls_serv_opt_strs+2467) /** Compiled in flag settings for the x509ecckeyfile option */ #define X509ECCKEYFILE_FLAGS (X509KEYFILE_FLAGS | OPTST_ALIAS | OPTST_DEPRECATED) @@ -586,10 +586,10 @@ static int const aDisable_Client_CertCantList[] = { * x509ecccertfile option description: */ /** Descriptive text for the x509ecccertfile option */ -#define X509ECCCERTFILE_DESC (gnutls_serv_opt_strs+2405) +#define X509ECCCERTFILE_DESC (gnutls_serv_opt_strs+2399) #define X509ECCCERTFILE_NAME NULL /** Unmodified name string for the x509ecccertfile option */ -#define X509ECCCERTFILE_name (gnutls_serv_opt_strs+2488) +#define X509ECCCERTFILE_name (gnutls_serv_opt_strs+2482) /** Compiled in flag settings for the x509ecccertfile option */ #define X509ECCCERTFILE_FLAGS (X509CERTFILE_FLAGS | OPTST_ALIAS | OPTST_DEPRECATED) @@ -597,11 +597,11 @@ static int const aDisable_Client_CertCantList[] = { * srppasswd option description: */ /** Descriptive text for the srppasswd option */ -#define SRPPASSWD_DESC (gnutls_serv_opt_strs+2504) +#define SRPPASSWD_DESC (gnutls_serv_opt_strs+2498) /** Upper-cased name for the srppasswd option */ -#define SRPPASSWD_NAME (gnutls_serv_opt_strs+2529) +#define SRPPASSWD_NAME (gnutls_serv_opt_strs+2523) /** Name string for the srppasswd option */ -#define SRPPASSWD_name (gnutls_serv_opt_strs+2539) +#define SRPPASSWD_name (gnutls_serv_opt_strs+2533) /** Compiled in flag settings for the srppasswd option */ #define SRPPASSWD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -610,11 +610,11 @@ static int const aDisable_Client_CertCantList[] = { * srppasswdconf option description: */ /** Descriptive text for the srppasswdconf option */ -#define SRPPASSWDCONF_DESC (gnutls_serv_opt_strs+2549) +#define SRPPASSWDCONF_DESC (gnutls_serv_opt_strs+2543) /** Upper-cased name for the srppasswdconf option */ -#define SRPPASSWDCONF_NAME (gnutls_serv_opt_strs+2588) +#define SRPPASSWDCONF_NAME (gnutls_serv_opt_strs+2582) /** Name string for the srppasswdconf option */ -#define SRPPASSWDCONF_name (gnutls_serv_opt_strs+2602) +#define SRPPASSWDCONF_name (gnutls_serv_opt_strs+2596) /** Compiled in flag settings for the srppasswdconf option */ #define SRPPASSWDCONF_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -623,11 +623,11 @@ static int const aDisable_Client_CertCantList[] = { * pskpasswd option description: */ /** Descriptive text for the pskpasswd option */ -#define PSKPASSWD_DESC (gnutls_serv_opt_strs+2616) +#define PSKPASSWD_DESC (gnutls_serv_opt_strs+2610) /** Upper-cased name for the pskpasswd option */ -#define PSKPASSWD_NAME (gnutls_serv_opt_strs+2641) +#define PSKPASSWD_NAME (gnutls_serv_opt_strs+2635) /** Name string for the pskpasswd option */ -#define PSKPASSWD_name (gnutls_serv_opt_strs+2651) +#define PSKPASSWD_name (gnutls_serv_opt_strs+2645) /** Compiled in flag settings for the pskpasswd option */ #define PSKPASSWD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -636,11 +636,11 @@ static int const aDisable_Client_CertCantList[] = { * pskhint option description: */ /** Descriptive text for the pskhint option */ -#define PSKHINT_DESC (gnutls_serv_opt_strs+2661) +#define PSKHINT_DESC (gnutls_serv_opt_strs+2655) /** Upper-cased name for the pskhint option */ -#define PSKHINT_NAME (gnutls_serv_opt_strs+2686) +#define PSKHINT_NAME (gnutls_serv_opt_strs+2680) /** Name string for the pskhint option */ -#define PSKHINT_name (gnutls_serv_opt_strs+2694) +#define PSKHINT_name (gnutls_serv_opt_strs+2688) /** Compiled in flag settings for the pskhint option */ #define PSKHINT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -649,11 +649,11 @@ static int const aDisable_Client_CertCantList[] = { * ocsp-response option description: */ /** Descriptive text for the ocsp-response option */ -#define OCSP_RESPONSE_DESC (gnutls_serv_opt_strs+2702) +#define OCSP_RESPONSE_DESC (gnutls_serv_opt_strs+2696) /** Upper-cased name for the ocsp-response option */ -#define OCSP_RESPONSE_NAME (gnutls_serv_opt_strs+2738) +#define OCSP_RESPONSE_NAME (gnutls_serv_opt_strs+2732) /** Name string for the ocsp-response option */ -#define OCSP_RESPONSE_name (gnutls_serv_opt_strs+2752) +#define OCSP_RESPONSE_name (gnutls_serv_opt_strs+2746) /** Compiled in flag settings for the ocsp-response option */ #define OCSP_RESPONSE_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -662,11 +662,11 @@ static int const aDisable_Client_CertCantList[] = { * ignore-ocsp-response-errors option description: */ /** Descriptive text for the ignore-ocsp-response-errors option */ -#define IGNORE_OCSP_RESPONSE_ERRORS_DESC (gnutls_serv_opt_strs+2766) +#define IGNORE_OCSP_RESPONSE_ERRORS_DESC (gnutls_serv_opt_strs+2760) /** Upper-cased name for the ignore-ocsp-response-errors option */ -#define IGNORE_OCSP_RESPONSE_ERRORS_NAME (gnutls_serv_opt_strs+2815) +#define IGNORE_OCSP_RESPONSE_ERRORS_NAME (gnutls_serv_opt_strs+2809) /** Name string for the ignore-ocsp-response-errors option */ -#define IGNORE_OCSP_RESPONSE_ERRORS_name (gnutls_serv_opt_strs+2843) +#define IGNORE_OCSP_RESPONSE_ERRORS_name (gnutls_serv_opt_strs+2837) /** Compiled in flag settings for the ignore-ocsp-response-errors option */ #define IGNORE_OCSP_RESPONSE_ERRORS_FLAGS (OPTST_DISABLED) @@ -674,11 +674,11 @@ static int const aDisable_Client_CertCantList[] = { * port option description: */ /** Descriptive text for the port option */ -#define PORT_DESC (gnutls_serv_opt_strs+2871) +#define PORT_DESC (gnutls_serv_opt_strs+2865) /** Upper-cased name for the port option */ -#define PORT_NAME (gnutls_serv_opt_strs+2894) +#define PORT_NAME (gnutls_serv_opt_strs+2888) /** Name string for the port option */ -#define PORT_name (gnutls_serv_opt_strs+2899) +#define PORT_name (gnutls_serv_opt_strs+2893) /** Compiled in flag settings for the port option */ #define PORT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -687,11 +687,11 @@ static int const aDisable_Client_CertCantList[] = { * list option description: */ /** Descriptive text for the list option */ -#define LIST_DESC (gnutls_serv_opt_strs+2904) +#define LIST_DESC (gnutls_serv_opt_strs+2898) /** Upper-cased name for the list option */ -#define LIST_NAME (gnutls_serv_opt_strs+2955) +#define LIST_NAME (gnutls_serv_opt_strs+2949) /** Name string for the list option */ -#define LIST_name (gnutls_serv_opt_strs+2960) +#define LIST_name (gnutls_serv_opt_strs+2954) /** Compiled in flag settings for the list option */ #define LIST_FLAGS (OPTST_DISABLED) @@ -699,11 +699,11 @@ static int const aDisable_Client_CertCantList[] = { * provider option description: */ /** Descriptive text for the provider option */ -#define PROVIDER_DESC (gnutls_serv_opt_strs+2965) +#define PROVIDER_DESC (gnutls_serv_opt_strs+2959) /** Upper-cased name for the provider option */ -#define PROVIDER_NAME (gnutls_serv_opt_strs+3003) +#define PROVIDER_NAME (gnutls_serv_opt_strs+2997) /** Name string for the provider option */ -#define PROVIDER_name (gnutls_serv_opt_strs+3012) +#define PROVIDER_name (gnutls_serv_opt_strs+3006) /** Compiled in flag settings for the provider option */ #define PROVIDER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -711,11 +711,11 @@ static int const aDisable_Client_CertCantList[] = { /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (gnutls_serv_opt_strs+3021) -#define HELP_name (gnutls_serv_opt_strs+3065) +#define HELP_DESC (gnutls_serv_opt_strs+3015) +#define HELP_name (gnutls_serv_opt_strs+3059) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (gnutls_serv_opt_strs+3070) -#define MORE_HELP_name (gnutls_serv_opt_strs+3115) +#define MORE_HELP_DESC (gnutls_serv_opt_strs+3064) +#define MORE_HELP_name (gnutls_serv_opt_strs+3109) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -728,8 +728,8 @@ static int const aDisable_Client_CertCantList[] = { # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (gnutls_serv_opt_strs+3125) -#define VER_name (gnutls_serv_opt_strs+3161) +#define VER_DESC (gnutls_serv_opt_strs+3119) +#define VER_name (gnutls_serv_opt_strs+3155) /** * Declare option callback procedures */ @@ -1275,21 +1275,21 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of gnutls-serv. */ -#define zPROGNAME (gnutls_serv_opt_strs+3169) +#define zPROGNAME (gnutls_serv_opt_strs+3163) /** Reference to the title line for gnutls-serv usage. */ -#define zUsageTitle (gnutls_serv_opt_strs+3181) +#define zUsageTitle (gnutls_serv_opt_strs+3175) /** There is no gnutls-serv configuration file. */ #define zRcName NULL /** There are no directories to search for gnutls-serv config files. */ #define apzHomeList NULL /** The gnutls-serv program bug email address. */ -#define zBugsAddr (gnutls_serv_opt_strs+3267) +#define zBugsAddr (gnutls_serv_opt_strs+3261) /** Clarification/explanation of what gnutls-serv does. */ -#define zExplain (gnutls_serv_opt_strs+3287) +#define zExplain (gnutls_serv_opt_strs+3277) /** Extra detail explaining what gnutls-serv does. */ -#define zDetail (gnutls_serv_opt_strs+3289) +#define zDetail (gnutls_serv_opt_strs+3279) /** The full version string for gnutls-serv. */ -#define zFullVersion (gnutls_serv_opt_strs+3347) +#define zFullVersion (gnutls_serv_opt_strs+3337) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -1301,7 +1301,7 @@ static tOptDesc optDesc[OPTION_CT] = { #endif /* ENABLE_NLS */ #define gnutls_serv_full_usage (NULL) -#define gnutls_serv_short_usage (gnutls_serv_opt_strs+3369) +#define gnutls_serv_short_usage (gnutls_serv_opt_strs+3355) #endif /* not defined __doxygen__ */ @@ -1827,8 +1827,8 @@ static void bogus_function(void) { translate option names. */ /* referenced via gnutls_servOptions.pzCopyright */ - puts(_("gnutls-serv @VERSION@\n\ -Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n\ + puts(_("gnutls-serv 3.6.4\n\ +Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the GNU General Public License,\n\ version 3 or later <http://gnu.org/licenses/gpl.html>\n")); @@ -1985,7 +1985,7 @@ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n")); puts(_("Server program that listens to incoming TLS connections.\n")); /* referenced via gnutls_servOptions.pzFullVersion */ - puts(_("gnutls-serv @VERSION@")); + puts(_("gnutls-serv 3.6.4")); /* referenced via gnutls_servOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/src/serv-args.h.bak b/src/serv-args.h.bak index 9fc588411e..a2244c351c 100644 --- a/src/serv-args.h.bak +++ b/src/serv-args.h.bak @@ -19,7 +19,7 @@ * The gnutls-serv program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -113,9 +113,9 @@ typedef enum { /** count of all options for gnutls-serv */ #define OPTION_CT 43 /** gnutls-serv version */ -#define GNUTLS_SERV_VERSION "@VERSION@" +#define GNUTLS_SERV_VERSION "3.6.4" /** Full gnutls-serv version text */ -#define GNUTLS_SERV_FULL_VERSION "gnutls-serv @VERSION@" +#define GNUTLS_SERV_FULL_VERSION "gnutls-serv 3.6.4" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/src/srptool-args.c.bak b/src/srptool-args.c.bak index 493cf9b4e7..ccf9686253 100644 --- a/src/srptool-args.c.bak +++ b/src/srptool-args.c.bak @@ -19,7 +19,7 @@ * The srptool program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -53,7 +53,7 @@ extern "C" { #endif extern FILE * option_usage_fp; #define zCopyright (srptool_opt_strs+0) -#define zLicenseDescrip (srptool_opt_strs+288) +#define zLicenseDescrip (srptool_opt_strs+282) #ifndef NULL @@ -63,13 +63,13 @@ extern FILE * option_usage_fp; /** * static const strings for srptool options */ -static char const srptool_opt_strs[2037] = -/* 0 */ "srptool @VERSION@\n" - "Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n" +static char const srptool_opt_strs[2023] = +/* 0 */ "srptool 3.6.4\n" + "Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the GNU General Public License,\n" "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0" -/* 288 */ "srptool is free software: you can redistribute it and/or modify it under\n" +/* 282 */ "srptool is free software: you can redistribute it and/or modify it under\n" "the terms of the GNU General Public License as published by the Free\n" "Software Foundation, either version 3 of the License, or (at your option)\n" "any later version.\n\n" @@ -79,60 +79,60 @@ static char const srptool_opt_strs[2037] = "details.\n\n" "You should have received a copy of the GNU General Public License along\n" "with this program. If not, see <http://www.gnu.org/licenses/>.\n\0" -/* 891 */ "Enable debugging\0" -/* 908 */ "DEBUG\0" -/* 914 */ "debug\0" -/* 920 */ "specify the index of the group parameters in tpasswd.conf to use\0" -/* 985 */ "INDEX\0" -/* 991 */ "index\0" -/* 997 */ "specify a username\0" -/* 1016 */ "USERNAME\0" -/* 1025 */ "username\0" -/* 1034 */ "specify a password file\0" -/* 1058 */ "PASSWD\0" -/* 1065 */ "passwd\0" -/* 1072 */ "specify salt size\0" -/* 1090 */ "SALT\0" -/* 1095 */ "salt\0" -/* 1100 */ "just verify the password.\0" -/* 1126 */ "VERIFY\0" -/* 1133 */ "verify\0" -/* 1140 */ "specify a password conf file.\0" -/* 1170 */ "PASSWD_CONF\0" -/* 1182 */ "passwd-conf\0" -/* 1194 */ "Generate a password configuration file.\0" -/* 1234 */ "CREATE_CONF\0" -/* 1246 */ "create-conf\0" -/* 1258 */ "display extended usage information and exit\0" -/* 1302 */ "help\0" -/* 1307 */ "extended usage information passed thru pager\0" -/* 1352 */ "more-help\0" -/* 1362 */ "output version information and exit\0" -/* 1398 */ "version\0" -/* 1406 */ "SRPTOOL\0" -/* 1414 */ "srptool - GnuTLS SRP tool\n" +/* 885 */ "Enable debugging\0" +/* 902 */ "DEBUG\0" +/* 908 */ "debug\0" +/* 914 */ "specify the index of the group parameters in tpasswd.conf to use\0" +/* 979 */ "INDEX\0" +/* 985 */ "index\0" +/* 991 */ "specify a username\0" +/* 1010 */ "USERNAME\0" +/* 1019 */ "username\0" +/* 1028 */ "specify a password file\0" +/* 1052 */ "PASSWD\0" +/* 1059 */ "passwd\0" +/* 1066 */ "specify salt size\0" +/* 1084 */ "SALT\0" +/* 1089 */ "salt\0" +/* 1094 */ "just verify the password.\0" +/* 1120 */ "VERIFY\0" +/* 1127 */ "verify\0" +/* 1134 */ "specify a password conf file.\0" +/* 1164 */ "PASSWD_CONF\0" +/* 1176 */ "passwd-conf\0" +/* 1188 */ "Generate a password configuration file.\0" +/* 1228 */ "CREATE_CONF\0" +/* 1240 */ "create-conf\0" +/* 1252 */ "display extended usage information and exit\0" +/* 1296 */ "help\0" +/* 1301 */ "extended usage information passed thru pager\0" +/* 1346 */ "more-help\0" +/* 1356 */ "output version information and exit\0" +/* 1392 */ "version\0" +/* 1400 */ "SRPTOOL\0" +/* 1408 */ "srptool - GnuTLS SRP tool\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0" -/* 1498 */ "@PACKAGE_BUGREPORT@\0" -/* 1518 */ "\n\0" -/* 1520 */ "Simple program that emulates the programs in the Stanford SRP (Secure\n" +/* 1492 */ "bugs@gnutls.org\0" +/* 1508 */ "\n\0" +/* 1510 */ "Simple program that emulates the programs in the Stanford SRP (Secure\n" "Remote Password) libraries using GnuTLS. It is intended for use in places\n" "where you don't expect SRP authentication to be the used for system users.\n\n" "In brief, to use SRP you need to create two files. These are the password\n" "file that holds the users and the verifiers associated with them and the\n" "configuration file to hold the group parameters (called tpasswd.conf).\n\0" -/* 1961 */ "srptool @VERSION@\0" -/* 1979 */ "srptool [options]\n" +/* 1951 */ "srptool 3.6.4\0" +/* 1965 */ "srptool [options]\n" "srptool --help for usage instructions.\n"; /** * debug option description: */ /** Descriptive text for the debug option */ -#define DEBUG_DESC (srptool_opt_strs+891) +#define DEBUG_DESC (srptool_opt_strs+885) /** Upper-cased name for the debug option */ -#define DEBUG_NAME (srptool_opt_strs+908) +#define DEBUG_NAME (srptool_opt_strs+902) /** Name string for the debug option */ -#define DEBUG_name (srptool_opt_strs+914) +#define DEBUG_name (srptool_opt_strs+908) /** Compiled in flag settings for the debug option */ #define DEBUG_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -141,11 +141,11 @@ static char const srptool_opt_strs[2037] = * index option description: */ /** Descriptive text for the index option */ -#define INDEX_DESC (srptool_opt_strs+920) +#define INDEX_DESC (srptool_opt_strs+914) /** Upper-cased name for the index option */ -#define INDEX_NAME (srptool_opt_strs+985) +#define INDEX_NAME (srptool_opt_strs+979) /** Name string for the index option */ -#define INDEX_name (srptool_opt_strs+991) +#define INDEX_name (srptool_opt_strs+985) /** The compiled in default value for the index option argument */ #define INDEX_DFT_ARG ((char const*)3) /** Compiled in flag settings for the index option */ @@ -156,11 +156,11 @@ static char const srptool_opt_strs[2037] = * username option description: */ /** Descriptive text for the username option */ -#define USERNAME_DESC (srptool_opt_strs+997) +#define USERNAME_DESC (srptool_opt_strs+991) /** Upper-cased name for the username option */ -#define USERNAME_NAME (srptool_opt_strs+1016) +#define USERNAME_NAME (srptool_opt_strs+1010) /** Name string for the username option */ -#define USERNAME_name (srptool_opt_strs+1025) +#define USERNAME_name (srptool_opt_strs+1019) /** Compiled in flag settings for the username option */ #define USERNAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -169,11 +169,11 @@ static char const srptool_opt_strs[2037] = * passwd option description: */ /** Descriptive text for the passwd option */ -#define PASSWD_DESC (srptool_opt_strs+1034) +#define PASSWD_DESC (srptool_opt_strs+1028) /** Upper-cased name for the passwd option */ -#define PASSWD_NAME (srptool_opt_strs+1058) +#define PASSWD_NAME (srptool_opt_strs+1052) /** Name string for the passwd option */ -#define PASSWD_name (srptool_opt_strs+1065) +#define PASSWD_name (srptool_opt_strs+1059) /** Compiled in flag settings for the passwd option */ #define PASSWD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -182,11 +182,11 @@ static char const srptool_opt_strs[2037] = * salt option description: */ /** Descriptive text for the salt option */ -#define SALT_DESC (srptool_opt_strs+1072) +#define SALT_DESC (srptool_opt_strs+1066) /** Upper-cased name for the salt option */ -#define SALT_NAME (srptool_opt_strs+1090) +#define SALT_NAME (srptool_opt_strs+1084) /** Name string for the salt option */ -#define SALT_name (srptool_opt_strs+1095) +#define SALT_name (srptool_opt_strs+1089) /** Compiled in flag settings for the salt option */ #define SALT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -195,11 +195,11 @@ static char const srptool_opt_strs[2037] = * verify option description: */ /** Descriptive text for the verify option */ -#define VERIFY_DESC (srptool_opt_strs+1100) +#define VERIFY_DESC (srptool_opt_strs+1094) /** Upper-cased name for the verify option */ -#define VERIFY_NAME (srptool_opt_strs+1126) +#define VERIFY_NAME (srptool_opt_strs+1120) /** Name string for the verify option */ -#define VERIFY_name (srptool_opt_strs+1133) +#define VERIFY_name (srptool_opt_strs+1127) /** Compiled in flag settings for the verify option */ #define VERIFY_FLAGS (OPTST_DISABLED) @@ -207,11 +207,11 @@ static char const srptool_opt_strs[2037] = * passwd-conf option description: */ /** Descriptive text for the passwd-conf option */ -#define PASSWD_CONF_DESC (srptool_opt_strs+1140) +#define PASSWD_CONF_DESC (srptool_opt_strs+1134) /** Upper-cased name for the passwd-conf option */ -#define PASSWD_CONF_NAME (srptool_opt_strs+1170) +#define PASSWD_CONF_NAME (srptool_opt_strs+1164) /** Name string for the passwd-conf option */ -#define PASSWD_CONF_name (srptool_opt_strs+1182) +#define PASSWD_CONF_name (srptool_opt_strs+1176) /** Compiled in flag settings for the passwd-conf option */ #define PASSWD_CONF_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -220,11 +220,11 @@ static char const srptool_opt_strs[2037] = * create-conf option description: */ /** Descriptive text for the create-conf option */ -#define CREATE_CONF_DESC (srptool_opt_strs+1194) +#define CREATE_CONF_DESC (srptool_opt_strs+1188) /** Upper-cased name for the create-conf option */ -#define CREATE_CONF_NAME (srptool_opt_strs+1234) +#define CREATE_CONF_NAME (srptool_opt_strs+1228) /** Name string for the create-conf option */ -#define CREATE_CONF_name (srptool_opt_strs+1246) +#define CREATE_CONF_name (srptool_opt_strs+1240) /** Compiled in flag settings for the create-conf option */ #define CREATE_CONF_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -232,11 +232,11 @@ static char const srptool_opt_strs[2037] = /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (srptool_opt_strs+1258) -#define HELP_name (srptool_opt_strs+1302) +#define HELP_DESC (srptool_opt_strs+1252) +#define HELP_name (srptool_opt_strs+1296) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (srptool_opt_strs+1307) -#define MORE_HELP_name (srptool_opt_strs+1352) +#define MORE_HELP_DESC (srptool_opt_strs+1301) +#define MORE_HELP_name (srptool_opt_strs+1346) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -249,8 +249,8 @@ static char const srptool_opt_strs[2037] = # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (srptool_opt_strs+1362) -#define VER_name (srptool_opt_strs+1398) +#define VER_DESC (srptool_opt_strs+1356) +#define VER_name (srptool_opt_strs+1392) /** * Declare option callback procedures */ @@ -408,21 +408,21 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of srptool. */ -#define zPROGNAME (srptool_opt_strs+1406) +#define zPROGNAME (srptool_opt_strs+1400) /** Reference to the title line for srptool usage. */ -#define zUsageTitle (srptool_opt_strs+1414) +#define zUsageTitle (srptool_opt_strs+1408) /** There is no srptool configuration file. */ #define zRcName NULL /** There are no directories to search for srptool config files. */ #define apzHomeList NULL /** The srptool program bug email address. */ -#define zBugsAddr (srptool_opt_strs+1498) +#define zBugsAddr (srptool_opt_strs+1492) /** Clarification/explanation of what srptool does. */ -#define zExplain (srptool_opt_strs+1518) +#define zExplain (srptool_opt_strs+1508) /** Extra detail explaining what srptool does. */ -#define zDetail (srptool_opt_strs+1520) +#define zDetail (srptool_opt_strs+1510) /** The full version string for srptool. */ -#define zFullVersion (srptool_opt_strs+1961) +#define zFullVersion (srptool_opt_strs+1951) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -434,7 +434,7 @@ static tOptDesc optDesc[OPTION_CT] = { #endif /* ENABLE_NLS */ #define srptool_full_usage (NULL) -#define srptool_short_usage (srptool_opt_strs+1979) +#define srptool_short_usage (srptool_opt_strs+1965) #endif /* not defined __doxygen__ */ @@ -693,8 +693,8 @@ static void bogus_function(void) { translate option names. */ /* referenced via srptoolOptions.pzCopyright */ - puts(_("srptool @VERSION@\n\ -Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n\ + puts(_("srptool 3.6.4\n\ +Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the GNU General Public License,\n\ version 3 or later <http://gnu.org/licenses/gpl.html>\n")); @@ -760,7 +760,7 @@ file that holds the users and the verifiers associated with them and the\n\ configuration file to hold the group parameters (called tpasswd.conf).\n")); /* referenced via srptoolOptions.pzFullVersion */ - puts(_("srptool @VERSION@")); + puts(_("srptool 3.6.4")); /* referenced via srptoolOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/src/srptool-args.h.bak b/src/srptool-args.h.bak index 6abdea8796..081150a615 100644 --- a/src/srptool-args.h.bak +++ b/src/srptool-args.h.bak @@ -19,7 +19,7 @@ * The srptool program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -81,9 +81,9 @@ typedef enum { /** count of all options for srptool */ #define OPTION_CT 11 /** srptool version */ -#define SRPTOOL_VERSION "@VERSION@" +#define SRPTOOL_VERSION "3.6.4" /** Full srptool version text */ -#define SRPTOOL_FULL_VERSION "srptool @VERSION@" +#define SRPTOOL_FULL_VERSION "srptool 3.6.4" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/src/systemkey-args.c.bak b/src/systemkey-args.c.bak index 7f0f872ab5..784017a946 100644 --- a/src/systemkey-args.c.bak +++ b/src/systemkey-args.c.bak @@ -19,7 +19,7 @@ * The systemkey-tool program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -53,7 +53,7 @@ extern "C" { #endif extern FILE * option_usage_fp; #define zCopyright (systemkey_tool_opt_strs+0) -#define zLicenseDescrip (systemkey_tool_opt_strs+295) +#define zLicenseDescrip (systemkey_tool_opt_strs+289) #ifndef NULL @@ -63,13 +63,13 @@ extern FILE * option_usage_fp; /** * static const strings for systemkey-tool options */ -static char const systemkey_tool_opt_strs[1642] = -/* 0 */ "systemkey-tool @VERSION@\n" - "Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n" +static char const systemkey_tool_opt_strs[1628] = +/* 0 */ "systemkey-tool 3.6.4\n" + "Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the GNU General Public License,\n" "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0" -/* 295 */ "systemkey-tool is free software: you can redistribute it and/or modify it\n" +/* 289 */ "systemkey-tool is free software: you can redistribute it and/or modify it\n" "under the terms of the GNU General Public License as published by the Free\n" "Software Foundation, either version 3 of the License, or (at your option)\n" "any later version.\n\n" @@ -79,54 +79,54 @@ static char const systemkey_tool_opt_strs[1642] = "for more details.\n\n" "You should have received a copy of the GNU General Public License along\n" "with this program. If not, see <http://www.gnu.org/licenses/>.\n\0" -/* 912 */ "Enable debugging\0" -/* 929 */ "DEBUG\0" -/* 935 */ "debug\0" -/* 941 */ "Input file\0" -/* 952 */ "INFILE\0" -/* 959 */ "infile\0" -/* 966 */ "Output file\0" -/* 978 */ "OUTFILE\0" -/* 986 */ "outfile\0" -/* 994 */ "Lists all stored keys.\0" -/* 1017 */ "LIST\0" -/* 1022 */ "list\0" -/* 1027 */ "Delete the key identified by the given URL.\0" -/* 1071 */ "DELETE\0" -/* 1078 */ "delete\0" -/* 1085 */ "Use the DER format for keys.\0" -/* 1114 */ "INDER\0" -/* 1120 */ "no-inder\0" -/* 1129 */ "no\0" -/* 1132 */ "Use DER format for output keys\0" -/* 1163 */ "OUTDER\0" -/* 1170 */ "no-outder\0" -/* 1180 */ "display extended usage information and exit\0" -/* 1224 */ "help\0" -/* 1229 */ "extended usage information passed thru pager\0" -/* 1274 */ "more-help\0" -/* 1284 */ "output version information and exit\0" -/* 1320 */ "version\0" -/* 1328 */ "SYSTEMKEY_TOOL\0" -/* 1343 */ "systemkey-tool - GnuTLS system key tool\n" +/* 906 */ "Enable debugging\0" +/* 923 */ "DEBUG\0" +/* 929 */ "debug\0" +/* 935 */ "Input file\0" +/* 946 */ "INFILE\0" +/* 953 */ "infile\0" +/* 960 */ "Output file\0" +/* 972 */ "OUTFILE\0" +/* 980 */ "outfile\0" +/* 988 */ "Lists all stored keys.\0" +/* 1011 */ "LIST\0" +/* 1016 */ "list\0" +/* 1021 */ "Delete the key identified by the given URL.\0" +/* 1065 */ "DELETE\0" +/* 1072 */ "delete\0" +/* 1079 */ "Use the DER format for keys.\0" +/* 1108 */ "INDER\0" +/* 1114 */ "no-inder\0" +/* 1123 */ "no\0" +/* 1126 */ "Use DER format for output keys\0" +/* 1157 */ "OUTDER\0" +/* 1164 */ "no-outder\0" +/* 1174 */ "display extended usage information and exit\0" +/* 1218 */ "help\0" +/* 1223 */ "extended usage information passed thru pager\0" +/* 1268 */ "more-help\0" +/* 1278 */ "output version information and exit\0" +/* 1314 */ "version\0" +/* 1322 */ "SYSTEMKEY_TOOL\0" +/* 1337 */ "systemkey-tool - GnuTLS system key tool\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0" -/* 1441 */ "@PACKAGE_BUGREPORT@\0" -/* 1461 */ "\n\0" -/* 1463 */ "Program that allows handling user keys as stored in the system in a uniform\n" +/* 1435 */ "bugs@gnutls.org\0" +/* 1451 */ "\n\0" +/* 1453 */ "Program that allows handling user keys as stored in the system in a uniform\n" "way.\n\0" -/* 1545 */ "systemkey-tool @VERSION@\0" -/* 1570 */ "systemkey-tool [options]\n" +/* 1535 */ "systemkey-tool 3.6.4\0" +/* 1556 */ "systemkey-tool [options]\n" "systemkey-tool --help for usage instructions.\n"; /** * debug option description: */ /** Descriptive text for the debug option */ -#define DEBUG_DESC (systemkey_tool_opt_strs+912) +#define DEBUG_DESC (systemkey_tool_opt_strs+906) /** Upper-cased name for the debug option */ -#define DEBUG_NAME (systemkey_tool_opt_strs+929) +#define DEBUG_NAME (systemkey_tool_opt_strs+923) /** Name string for the debug option */ -#define DEBUG_name (systemkey_tool_opt_strs+935) +#define DEBUG_name (systemkey_tool_opt_strs+929) /** Compiled in flag settings for the debug option */ #define DEBUG_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -135,11 +135,11 @@ static char const systemkey_tool_opt_strs[1642] = * infile option description: */ /** Descriptive text for the infile option */ -#define INFILE_DESC (systemkey_tool_opt_strs+941) +#define INFILE_DESC (systemkey_tool_opt_strs+935) /** Upper-cased name for the infile option */ -#define INFILE_NAME (systemkey_tool_opt_strs+952) +#define INFILE_NAME (systemkey_tool_opt_strs+946) /** Name string for the infile option */ -#define INFILE_name (systemkey_tool_opt_strs+959) +#define INFILE_name (systemkey_tool_opt_strs+953) /** Compiled in flag settings for the infile option */ #define INFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -148,11 +148,11 @@ static char const systemkey_tool_opt_strs[1642] = * outfile option description: */ /** Descriptive text for the outfile option */ -#define OUTFILE_DESC (systemkey_tool_opt_strs+966) +#define OUTFILE_DESC (systemkey_tool_opt_strs+960) /** Upper-cased name for the outfile option */ -#define OUTFILE_NAME (systemkey_tool_opt_strs+978) +#define OUTFILE_NAME (systemkey_tool_opt_strs+972) /** Name string for the outfile option */ -#define OUTFILE_name (systemkey_tool_opt_strs+986) +#define OUTFILE_name (systemkey_tool_opt_strs+980) /** Compiled in flag settings for the outfile option */ #define OUTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -161,11 +161,11 @@ static char const systemkey_tool_opt_strs[1642] = * list option description: */ /** Descriptive text for the list option */ -#define LIST_DESC (systemkey_tool_opt_strs+994) +#define LIST_DESC (systemkey_tool_opt_strs+988) /** Upper-cased name for the list option */ -#define LIST_NAME (systemkey_tool_opt_strs+1017) +#define LIST_NAME (systemkey_tool_opt_strs+1011) /** Name string for the list option */ -#define LIST_name (systemkey_tool_opt_strs+1022) +#define LIST_name (systemkey_tool_opt_strs+1016) /** Compiled in flag settings for the list option */ #define LIST_FLAGS (OPTST_DISABLED) @@ -173,11 +173,11 @@ static char const systemkey_tool_opt_strs[1642] = * delete option description: */ /** Descriptive text for the delete option */ -#define DELETE_DESC (systemkey_tool_opt_strs+1027) +#define DELETE_DESC (systemkey_tool_opt_strs+1021) /** Upper-cased name for the delete option */ -#define DELETE_NAME (systemkey_tool_opt_strs+1071) +#define DELETE_NAME (systemkey_tool_opt_strs+1065) /** Name string for the delete option */ -#define DELETE_name (systemkey_tool_opt_strs+1078) +#define DELETE_name (systemkey_tool_opt_strs+1072) /** Compiled in flag settings for the delete option */ #define DELETE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -186,13 +186,13 @@ static char const systemkey_tool_opt_strs[1642] = * inder option description: */ /** Descriptive text for the inder option */ -#define INDER_DESC (systemkey_tool_opt_strs+1085) +#define INDER_DESC (systemkey_tool_opt_strs+1079) /** Upper-cased name for the inder option */ -#define INDER_NAME (systemkey_tool_opt_strs+1114) +#define INDER_NAME (systemkey_tool_opt_strs+1108) /** disablement name for the inder option */ -#define NOT_INDER_name (systemkey_tool_opt_strs+1120) +#define NOT_INDER_name (systemkey_tool_opt_strs+1114) /** disablement prefix for the inder option */ -#define NOT_INDER_PFX (systemkey_tool_opt_strs+1129) +#define NOT_INDER_PFX (systemkey_tool_opt_strs+1123) /** Name string for the inder option */ #define INDER_name (NOT_INDER_name + 3) /** Compiled in flag settings for the inder option */ @@ -202,13 +202,13 @@ static char const systemkey_tool_opt_strs[1642] = * outder option description: */ /** Descriptive text for the outder option */ -#define OUTDER_DESC (systemkey_tool_opt_strs+1132) +#define OUTDER_DESC (systemkey_tool_opt_strs+1126) /** Upper-cased name for the outder option */ -#define OUTDER_NAME (systemkey_tool_opt_strs+1163) +#define OUTDER_NAME (systemkey_tool_opt_strs+1157) /** disablement name for the outder option */ -#define NOT_OUTDER_name (systemkey_tool_opt_strs+1170) +#define NOT_OUTDER_name (systemkey_tool_opt_strs+1164) /** disablement prefix for the outder option */ -#define NOT_OUTDER_PFX (systemkey_tool_opt_strs+1129) +#define NOT_OUTDER_PFX (systemkey_tool_opt_strs+1123) /** Name string for the outder option */ #define OUTDER_name (NOT_OUTDER_name + 3) /** Compiled in flag settings for the outder option */ @@ -217,11 +217,11 @@ static char const systemkey_tool_opt_strs[1642] = /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (systemkey_tool_opt_strs+1180) -#define HELP_name (systemkey_tool_opt_strs+1224) +#define HELP_DESC (systemkey_tool_opt_strs+1174) +#define HELP_name (systemkey_tool_opt_strs+1218) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (systemkey_tool_opt_strs+1229) -#define MORE_HELP_name (systemkey_tool_opt_strs+1274) +#define MORE_HELP_DESC (systemkey_tool_opt_strs+1223) +#define MORE_HELP_name (systemkey_tool_opt_strs+1268) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -234,8 +234,8 @@ static char const systemkey_tool_opt_strs[1642] = # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (systemkey_tool_opt_strs+1284) -#define VER_name (systemkey_tool_opt_strs+1320) +#define VER_DESC (systemkey_tool_opt_strs+1278) +#define VER_name (systemkey_tool_opt_strs+1314) /** * Declare option callback procedures */ @@ -381,21 +381,21 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of systemkey-tool. */ -#define zPROGNAME (systemkey_tool_opt_strs+1328) +#define zPROGNAME (systemkey_tool_opt_strs+1322) /** Reference to the title line for systemkey-tool usage. */ -#define zUsageTitle (systemkey_tool_opt_strs+1343) +#define zUsageTitle (systemkey_tool_opt_strs+1337) /** There is no systemkey-tool configuration file. */ #define zRcName NULL /** There are no directories to search for systemkey-tool config files. */ #define apzHomeList NULL /** The systemkey-tool program bug email address. */ -#define zBugsAddr (systemkey_tool_opt_strs+1441) +#define zBugsAddr (systemkey_tool_opt_strs+1435) /** Clarification/explanation of what systemkey-tool does. */ -#define zExplain (systemkey_tool_opt_strs+1461) +#define zExplain (systemkey_tool_opt_strs+1451) /** Extra detail explaining what systemkey-tool does. */ -#define zDetail (systemkey_tool_opt_strs+1463) +#define zDetail (systemkey_tool_opt_strs+1453) /** The full version string for systemkey-tool. */ -#define zFullVersion (systemkey_tool_opt_strs+1545) +#define zFullVersion (systemkey_tool_opt_strs+1535) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -407,7 +407,7 @@ static tOptDesc optDesc[OPTION_CT] = { #endif /* ENABLE_NLS */ #define systemkey_tool_full_usage (NULL) -#define systemkey_tool_short_usage (systemkey_tool_opt_strs+1570) +#define systemkey_tool_short_usage (systemkey_tool_opt_strs+1556) #endif /* not defined __doxygen__ */ @@ -691,8 +691,8 @@ static void bogus_function(void) { translate option names. */ /* referenced via systemkey_toolOptions.pzCopyright */ - puts(_("systemkey-tool @VERSION@\n\ -Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n\ + puts(_("systemkey-tool 3.6.4\n\ +Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the GNU General Public License,\n\ version 3 or later <http://gnu.org/licenses/gpl.html>\n")); @@ -751,7 +751,7 @@ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n")); way.\n")); /* referenced via systemkey_toolOptions.pzFullVersion */ - puts(_("systemkey-tool @VERSION@")); + puts(_("systemkey-tool 3.6.4")); /* referenced via systemkey_toolOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/src/systemkey-args.h.bak b/src/systemkey-args.h.bak index a7972151fa..4678fca678 100644 --- a/src/systemkey-args.h.bak +++ b/src/systemkey-args.h.bak @@ -19,7 +19,7 @@ * The systemkey-tool program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -80,9 +80,9 @@ typedef enum { /** count of all options for systemkey-tool */ #define OPTION_CT 10 /** systemkey-tool version */ -#define SYSTEMKEY_TOOL_VERSION "@VERSION@" +#define SYSTEMKEY_TOOL_VERSION "3.6.4" /** Full systemkey-tool version text */ -#define SYSTEMKEY_TOOL_FULL_VERSION "systemkey-tool @VERSION@" +#define SYSTEMKEY_TOOL_FULL_VERSION "systemkey-tool 3.6.4" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/src/tpmtool-args.c.bak b/src/tpmtool-args.c.bak index d5c9168330..07a45acdfb 100644 --- a/src/tpmtool-args.c.bak +++ b/src/tpmtool-args.c.bak @@ -19,7 +19,7 @@ * The tpmtool program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -53,7 +53,7 @@ extern "C" { #endif extern FILE * option_usage_fp; #define zCopyright (tpmtool_opt_strs+0) -#define zLicenseDescrip (tpmtool_opt_strs+288) +#define zLicenseDescrip (tpmtool_opt_strs+282) #ifndef NULL @@ -63,13 +63,13 @@ extern FILE * option_usage_fp; /** * static const strings for tpmtool options */ -static char const tpmtool_opt_strs[2191] = -/* 0 */ "tpmtool @VERSION@\n" - "Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n" +static char const tpmtool_opt_strs[2177] = +/* 0 */ "tpmtool 3.6.4\n" + "Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the GNU General Public License,\n" "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0" -/* 288 */ "tpmtool is free software: you can redistribute it and/or modify it under\n" +/* 282 */ "tpmtool is free software: you can redistribute it and/or modify it under\n" "the terms of the GNU General Public License as published by the Free\n" "Software Foundation, either version 3 of the License, or (at your option)\n" "any later version.\n\n" @@ -79,83 +79,83 @@ static char const tpmtool_opt_strs[2191] = "details.\n\n" "You should have received a copy of the GNU General Public License along\n" "with this program. If not, see <http://www.gnu.org/licenses/>.\n\0" -/* 891 */ "Enable debugging\0" -/* 908 */ "DEBUG\0" -/* 914 */ "debug\0" -/* 920 */ "Input file\0" -/* 931 */ "INFILE\0" -/* 938 */ "infile\0" -/* 945 */ "Output file\0" -/* 957 */ "OUTFILE\0" -/* 965 */ "outfile\0" -/* 973 */ "Generate an RSA private-public key pair\0" -/* 1013 */ "GENERATE_RSA\0" -/* 1026 */ "generate-rsa\0" -/* 1039 */ "Any generated key will be registered in the TPM\0" -/* 1087 */ "REGISTER\0" -/* 1096 */ "register\0" -/* 1105 */ "Any generated key will be a signing key\0" -/* 1145 */ "SIGNING\0" -/* 1153 */ "signing\0" -/* 1161 */ "Any generated key will be a legacy key\0" -/* 1200 */ "LEGACY\0" -/* 1207 */ "legacy\0" -/* 1214 */ "Any registered key will be a user key\0" -/* 1252 */ "USER\0" -/* 1257 */ "user\0" -/* 1262 */ "Any registered key will be a system key\0" -/* 1302 */ "SYSTEM\0" -/* 1309 */ "system\0" -/* 1316 */ "Prints the public key of the provided key\0" -/* 1358 */ "PUBKEY\0" -/* 1365 */ "pubkey\0" -/* 1372 */ "Lists all stored keys in the TPM\0" -/* 1405 */ "LIST\0" -/* 1410 */ "list\0" -/* 1415 */ "Delete the key identified by the given URL (UUID).\0" -/* 1466 */ "DELETE\0" -/* 1473 */ "delete\0" -/* 1480 */ "Tests the signature operation of the provided object\0" -/* 1533 */ "TEST_SIGN\0" -/* 1543 */ "test-sign\0" -/* 1553 */ "Specify the security level [low, legacy, medium, high, ultra].\0" -/* 1616 */ "SEC_PARAM\0" -/* 1626 */ "sec-param\0" -/* 1636 */ "Specify the number of bits for key generate\0" -/* 1680 */ "BITS\0" -/* 1685 */ "bits\0" -/* 1690 */ "Use the DER format for keys.\0" -/* 1719 */ "INDER\0" -/* 1725 */ "no-inder\0" -/* 1734 */ "no\0" -/* 1737 */ "Use DER format for output keys\0" -/* 1768 */ "OUTDER\0" -/* 1775 */ "no-outder\0" -/* 1785 */ "display extended usage information and exit\0" -/* 1829 */ "help\0" -/* 1834 */ "extended usage information passed thru pager\0" -/* 1879 */ "more-help\0" -/* 1889 */ "output version information and exit\0" -/* 1925 */ "version\0" -/* 1933 */ "TPMTOOL\0" -/* 1941 */ "tpmtool - GnuTLS TPM tool\n" +/* 885 */ "Enable debugging\0" +/* 902 */ "DEBUG\0" +/* 908 */ "debug\0" +/* 914 */ "Input file\0" +/* 925 */ "INFILE\0" +/* 932 */ "infile\0" +/* 939 */ "Output file\0" +/* 951 */ "OUTFILE\0" +/* 959 */ "outfile\0" +/* 967 */ "Generate an RSA private-public key pair\0" +/* 1007 */ "GENERATE_RSA\0" +/* 1020 */ "generate-rsa\0" +/* 1033 */ "Any generated key will be registered in the TPM\0" +/* 1081 */ "REGISTER\0" +/* 1090 */ "register\0" +/* 1099 */ "Any generated key will be a signing key\0" +/* 1139 */ "SIGNING\0" +/* 1147 */ "signing\0" +/* 1155 */ "Any generated key will be a legacy key\0" +/* 1194 */ "LEGACY\0" +/* 1201 */ "legacy\0" +/* 1208 */ "Any registered key will be a user key\0" +/* 1246 */ "USER\0" +/* 1251 */ "user\0" +/* 1256 */ "Any registered key will be a system key\0" +/* 1296 */ "SYSTEM\0" +/* 1303 */ "system\0" +/* 1310 */ "Prints the public key of the provided key\0" +/* 1352 */ "PUBKEY\0" +/* 1359 */ "pubkey\0" +/* 1366 */ "Lists all stored keys in the TPM\0" +/* 1399 */ "LIST\0" +/* 1404 */ "list\0" +/* 1409 */ "Delete the key identified by the given URL (UUID).\0" +/* 1460 */ "DELETE\0" +/* 1467 */ "delete\0" +/* 1474 */ "Tests the signature operation of the provided object\0" +/* 1527 */ "TEST_SIGN\0" +/* 1537 */ "test-sign\0" +/* 1547 */ "Specify the security level [low, legacy, medium, high, ultra].\0" +/* 1610 */ "SEC_PARAM\0" +/* 1620 */ "sec-param\0" +/* 1630 */ "Specify the number of bits for key generate\0" +/* 1674 */ "BITS\0" +/* 1679 */ "bits\0" +/* 1684 */ "Use the DER format for keys.\0" +/* 1713 */ "INDER\0" +/* 1719 */ "no-inder\0" +/* 1728 */ "no\0" +/* 1731 */ "Use DER format for output keys\0" +/* 1762 */ "OUTDER\0" +/* 1769 */ "no-outder\0" +/* 1779 */ "display extended usage information and exit\0" +/* 1823 */ "help\0" +/* 1828 */ "extended usage information passed thru pager\0" +/* 1873 */ "more-help\0" +/* 1883 */ "output version information and exit\0" +/* 1919 */ "version\0" +/* 1927 */ "TPMTOOL\0" +/* 1935 */ "tpmtool - GnuTLS TPM tool\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0" -/* 2025 */ "@PACKAGE_BUGREPORT@\0" -/* 2045 */ "\n\0" -/* 2047 */ "Program that allows handling cryptographic data from the TPM chip.\n\0" -/* 2115 */ "tpmtool @VERSION@\0" -/* 2133 */ "tpmtool [options]\n" +/* 2019 */ "bugs@gnutls.org\0" +/* 2035 */ "\n\0" +/* 2037 */ "Program that allows handling cryptographic data from the TPM chip.\n\0" +/* 2105 */ "tpmtool 3.6.4\0" +/* 2119 */ "tpmtool [options]\n" "tpmtool --help for usage instructions.\n"; /** * debug option description: */ /** Descriptive text for the debug option */ -#define DEBUG_DESC (tpmtool_opt_strs+891) +#define DEBUG_DESC (tpmtool_opt_strs+885) /** Upper-cased name for the debug option */ -#define DEBUG_NAME (tpmtool_opt_strs+908) +#define DEBUG_NAME (tpmtool_opt_strs+902) /** Name string for the debug option */ -#define DEBUG_name (tpmtool_opt_strs+914) +#define DEBUG_name (tpmtool_opt_strs+908) /** Compiled in flag settings for the debug option */ #define DEBUG_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -164,11 +164,11 @@ static char const tpmtool_opt_strs[2191] = * infile option description: */ /** Descriptive text for the infile option */ -#define INFILE_DESC (tpmtool_opt_strs+920) +#define INFILE_DESC (tpmtool_opt_strs+914) /** Upper-cased name for the infile option */ -#define INFILE_NAME (tpmtool_opt_strs+931) +#define INFILE_NAME (tpmtool_opt_strs+925) /** Name string for the infile option */ -#define INFILE_name (tpmtool_opt_strs+938) +#define INFILE_name (tpmtool_opt_strs+932) /** Compiled in flag settings for the infile option */ #define INFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -177,11 +177,11 @@ static char const tpmtool_opt_strs[2191] = * outfile option description: */ /** Descriptive text for the outfile option */ -#define OUTFILE_DESC (tpmtool_opt_strs+945) +#define OUTFILE_DESC (tpmtool_opt_strs+939) /** Upper-cased name for the outfile option */ -#define OUTFILE_NAME (tpmtool_opt_strs+957) +#define OUTFILE_NAME (tpmtool_opt_strs+951) /** Name string for the outfile option */ -#define OUTFILE_name (tpmtool_opt_strs+965) +#define OUTFILE_name (tpmtool_opt_strs+959) /** Compiled in flag settings for the outfile option */ #define OUTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -190,11 +190,11 @@ static char const tpmtool_opt_strs[2191] = * generate-rsa option description: */ /** Descriptive text for the generate-rsa option */ -#define GENERATE_RSA_DESC (tpmtool_opt_strs+973) +#define GENERATE_RSA_DESC (tpmtool_opt_strs+967) /** Upper-cased name for the generate-rsa option */ -#define GENERATE_RSA_NAME (tpmtool_opt_strs+1013) +#define GENERATE_RSA_NAME (tpmtool_opt_strs+1007) /** Name string for the generate-rsa option */ -#define GENERATE_RSA_name (tpmtool_opt_strs+1026) +#define GENERATE_RSA_name (tpmtool_opt_strs+1020) /** Compiled in flag settings for the generate-rsa option */ #define GENERATE_RSA_FLAGS (OPTST_DISABLED) @@ -203,11 +203,11 @@ static char const tpmtool_opt_strs[2191] = * "Must also have options" and "Incompatible options": */ /** Descriptive text for the register option */ -#define REGISTER_DESC (tpmtool_opt_strs+1039) +#define REGISTER_DESC (tpmtool_opt_strs+1033) /** Upper-cased name for the register option */ -#define REGISTER_NAME (tpmtool_opt_strs+1087) +#define REGISTER_NAME (tpmtool_opt_strs+1081) /** Name string for the register option */ -#define REGISTER_name (tpmtool_opt_strs+1096) +#define REGISTER_name (tpmtool_opt_strs+1090) /** Other options that are required by the register option */ static int const aRegisterMustList[] = { INDEX_OPT_GENERATE_RSA, NO_EQUIVALENT }; @@ -219,11 +219,11 @@ static int const aRegisterMustList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the signing option */ -#define SIGNING_DESC (tpmtool_opt_strs+1105) +#define SIGNING_DESC (tpmtool_opt_strs+1099) /** Upper-cased name for the signing option */ -#define SIGNING_NAME (tpmtool_opt_strs+1145) +#define SIGNING_NAME (tpmtool_opt_strs+1139) /** Name string for the signing option */ -#define SIGNING_name (tpmtool_opt_strs+1153) +#define SIGNING_name (tpmtool_opt_strs+1147) /** Other options that are required by the signing option */ static int const aSigningMustList[] = { INDEX_OPT_GENERATE_RSA, NO_EQUIVALENT }; @@ -238,11 +238,11 @@ static int const aSigningCantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the legacy option */ -#define LEGACY_DESC (tpmtool_opt_strs+1161) +#define LEGACY_DESC (tpmtool_opt_strs+1155) /** Upper-cased name for the legacy option */ -#define LEGACY_NAME (tpmtool_opt_strs+1200) +#define LEGACY_NAME (tpmtool_opt_strs+1194) /** Name string for the legacy option */ -#define LEGACY_name (tpmtool_opt_strs+1207) +#define LEGACY_name (tpmtool_opt_strs+1201) /** Other options that are required by the legacy option */ static int const aLegacyMustList[] = { INDEX_OPT_GENERATE_RSA, NO_EQUIVALENT }; @@ -257,11 +257,11 @@ static int const aLegacyCantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the user option */ -#define USER_DESC (tpmtool_opt_strs+1214) +#define USER_DESC (tpmtool_opt_strs+1208) /** Upper-cased name for the user option */ -#define USER_NAME (tpmtool_opt_strs+1252) +#define USER_NAME (tpmtool_opt_strs+1246) /** Name string for the user option */ -#define USER_name (tpmtool_opt_strs+1257) +#define USER_name (tpmtool_opt_strs+1251) /** Other options that are required by the user option */ static int const aUserMustList[] = { INDEX_OPT_REGISTER, NO_EQUIVALENT }; @@ -276,11 +276,11 @@ static int const aUserCantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the system option */ -#define SYSTEM_DESC (tpmtool_opt_strs+1262) +#define SYSTEM_DESC (tpmtool_opt_strs+1256) /** Upper-cased name for the system option */ -#define SYSTEM_NAME (tpmtool_opt_strs+1302) +#define SYSTEM_NAME (tpmtool_opt_strs+1296) /** Name string for the system option */ -#define SYSTEM_name (tpmtool_opt_strs+1309) +#define SYSTEM_name (tpmtool_opt_strs+1303) /** Other options that are required by the system option */ static int const aSystemMustList[] = { INDEX_OPT_REGISTER, NO_EQUIVALENT }; @@ -294,11 +294,11 @@ static int const aSystemCantList[] = { * pubkey option description: */ /** Descriptive text for the pubkey option */ -#define PUBKEY_DESC (tpmtool_opt_strs+1316) +#define PUBKEY_DESC (tpmtool_opt_strs+1310) /** Upper-cased name for the pubkey option */ -#define PUBKEY_NAME (tpmtool_opt_strs+1358) +#define PUBKEY_NAME (tpmtool_opt_strs+1352) /** Name string for the pubkey option */ -#define PUBKEY_name (tpmtool_opt_strs+1365) +#define PUBKEY_name (tpmtool_opt_strs+1359) /** Compiled in flag settings for the pubkey option */ #define PUBKEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -307,11 +307,11 @@ static int const aSystemCantList[] = { * list option description: */ /** Descriptive text for the list option */ -#define LIST_DESC (tpmtool_opt_strs+1372) +#define LIST_DESC (tpmtool_opt_strs+1366) /** Upper-cased name for the list option */ -#define LIST_NAME (tpmtool_opt_strs+1405) +#define LIST_NAME (tpmtool_opt_strs+1399) /** Name string for the list option */ -#define LIST_name (tpmtool_opt_strs+1410) +#define LIST_name (tpmtool_opt_strs+1404) /** Compiled in flag settings for the list option */ #define LIST_FLAGS (OPTST_DISABLED) @@ -319,11 +319,11 @@ static int const aSystemCantList[] = { * delete option description: */ /** Descriptive text for the delete option */ -#define DELETE_DESC (tpmtool_opt_strs+1415) +#define DELETE_DESC (tpmtool_opt_strs+1409) /** Upper-cased name for the delete option */ -#define DELETE_NAME (tpmtool_opt_strs+1466) +#define DELETE_NAME (tpmtool_opt_strs+1460) /** Name string for the delete option */ -#define DELETE_name (tpmtool_opt_strs+1473) +#define DELETE_name (tpmtool_opt_strs+1467) /** Compiled in flag settings for the delete option */ #define DELETE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -332,11 +332,11 @@ static int const aSystemCantList[] = { * test-sign option description: */ /** Descriptive text for the test-sign option */ -#define TEST_SIGN_DESC (tpmtool_opt_strs+1480) +#define TEST_SIGN_DESC (tpmtool_opt_strs+1474) /** Upper-cased name for the test-sign option */ -#define TEST_SIGN_NAME (tpmtool_opt_strs+1533) +#define TEST_SIGN_NAME (tpmtool_opt_strs+1527) /** Name string for the test-sign option */ -#define TEST_SIGN_name (tpmtool_opt_strs+1543) +#define TEST_SIGN_name (tpmtool_opt_strs+1537) /** Compiled in flag settings for the test-sign option */ #define TEST_SIGN_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -345,11 +345,11 @@ static int const aSystemCantList[] = { * sec-param option description: */ /** Descriptive text for the sec-param option */ -#define SEC_PARAM_DESC (tpmtool_opt_strs+1553) +#define SEC_PARAM_DESC (tpmtool_opt_strs+1547) /** Upper-cased name for the sec-param option */ -#define SEC_PARAM_NAME (tpmtool_opt_strs+1616) +#define SEC_PARAM_NAME (tpmtool_opt_strs+1610) /** Name string for the sec-param option */ -#define SEC_PARAM_name (tpmtool_opt_strs+1626) +#define SEC_PARAM_name (tpmtool_opt_strs+1620) /** Compiled in flag settings for the sec-param option */ #define SEC_PARAM_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -358,11 +358,11 @@ static int const aSystemCantList[] = { * bits option description: */ /** Descriptive text for the bits option */ -#define BITS_DESC (tpmtool_opt_strs+1636) +#define BITS_DESC (tpmtool_opt_strs+1630) /** Upper-cased name for the bits option */ -#define BITS_NAME (tpmtool_opt_strs+1680) +#define BITS_NAME (tpmtool_opt_strs+1674) /** Name string for the bits option */ -#define BITS_name (tpmtool_opt_strs+1685) +#define BITS_name (tpmtool_opt_strs+1679) /** Compiled in flag settings for the bits option */ #define BITS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -371,13 +371,13 @@ static int const aSystemCantList[] = { * inder option description: */ /** Descriptive text for the inder option */ -#define INDER_DESC (tpmtool_opt_strs+1690) +#define INDER_DESC (tpmtool_opt_strs+1684) /** Upper-cased name for the inder option */ -#define INDER_NAME (tpmtool_opt_strs+1719) +#define INDER_NAME (tpmtool_opt_strs+1713) /** disablement name for the inder option */ -#define NOT_INDER_name (tpmtool_opt_strs+1725) +#define NOT_INDER_name (tpmtool_opt_strs+1719) /** disablement prefix for the inder option */ -#define NOT_INDER_PFX (tpmtool_opt_strs+1734) +#define NOT_INDER_PFX (tpmtool_opt_strs+1728) /** Name string for the inder option */ #define INDER_name (NOT_INDER_name + 3) /** Compiled in flag settings for the inder option */ @@ -387,13 +387,13 @@ static int const aSystemCantList[] = { * outder option description: */ /** Descriptive text for the outder option */ -#define OUTDER_DESC (tpmtool_opt_strs+1737) +#define OUTDER_DESC (tpmtool_opt_strs+1731) /** Upper-cased name for the outder option */ -#define OUTDER_NAME (tpmtool_opt_strs+1768) +#define OUTDER_NAME (tpmtool_opt_strs+1762) /** disablement name for the outder option */ -#define NOT_OUTDER_name (tpmtool_opt_strs+1775) +#define NOT_OUTDER_name (tpmtool_opt_strs+1769) /** disablement prefix for the outder option */ -#define NOT_OUTDER_PFX (tpmtool_opt_strs+1734) +#define NOT_OUTDER_PFX (tpmtool_opt_strs+1728) /** Name string for the outder option */ #define OUTDER_name (NOT_OUTDER_name + 3) /** Compiled in flag settings for the outder option */ @@ -402,11 +402,11 @@ static int const aSystemCantList[] = { /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (tpmtool_opt_strs+1785) -#define HELP_name (tpmtool_opt_strs+1829) +#define HELP_DESC (tpmtool_opt_strs+1779) +#define HELP_name (tpmtool_opt_strs+1823) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (tpmtool_opt_strs+1834) -#define MORE_HELP_name (tpmtool_opt_strs+1879) +#define MORE_HELP_DESC (tpmtool_opt_strs+1828) +#define MORE_HELP_name (tpmtool_opt_strs+1873) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -419,8 +419,8 @@ static int const aSystemCantList[] = { # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (tpmtool_opt_strs+1889) -#define VER_name (tpmtool_opt_strs+1925) +#define VER_DESC (tpmtool_opt_strs+1883) +#define VER_name (tpmtool_opt_strs+1919) /** * Declare option callback procedures */ @@ -686,21 +686,21 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of tpmtool. */ -#define zPROGNAME (tpmtool_opt_strs+1933) +#define zPROGNAME (tpmtool_opt_strs+1927) /** Reference to the title line for tpmtool usage. */ -#define zUsageTitle (tpmtool_opt_strs+1941) +#define zUsageTitle (tpmtool_opt_strs+1935) /** There is no tpmtool configuration file. */ #define zRcName NULL /** There are no directories to search for tpmtool config files. */ #define apzHomeList NULL /** The tpmtool program bug email address. */ -#define zBugsAddr (tpmtool_opt_strs+2025) +#define zBugsAddr (tpmtool_opt_strs+2019) /** Clarification/explanation of what tpmtool does. */ -#define zExplain (tpmtool_opt_strs+2045) +#define zExplain (tpmtool_opt_strs+2035) /** Extra detail explaining what tpmtool does. */ -#define zDetail (tpmtool_opt_strs+2047) +#define zDetail (tpmtool_opt_strs+2037) /** The full version string for tpmtool. */ -#define zFullVersion (tpmtool_opt_strs+2115) +#define zFullVersion (tpmtool_opt_strs+2105) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -712,7 +712,7 @@ static tOptDesc optDesc[OPTION_CT] = { #endif /* ENABLE_NLS */ #define tpmtool_full_usage (NULL) -#define tpmtool_short_usage (tpmtool_opt_strs+2133) +#define tpmtool_short_usage (tpmtool_opt_strs+2119) #endif /* not defined __doxygen__ */ @@ -996,8 +996,8 @@ static void bogus_function(void) { translate option names. */ /* referenced via tpmtoolOptions.pzCopyright */ - puts(_("tpmtool @VERSION@\n\ -Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n\ + puts(_("tpmtool 3.6.4\n\ +Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the GNU General Public License,\n\ version 3 or later <http://gnu.org/licenses/gpl.html>\n")); @@ -1085,7 +1085,7 @@ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n")); puts(_("Program that allows handling cryptographic data from the TPM chip.\n")); /* referenced via tpmtoolOptions.pzFullVersion */ - puts(_("tpmtool @VERSION@")); + puts(_("tpmtool 3.6.4")); /* referenced via tpmtoolOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/src/tpmtool-args.h.bak b/src/tpmtool-args.h.bak index b7ab92d0ed..4b52836527 100644 --- a/src/tpmtool-args.h.bak +++ b/src/tpmtool-args.h.bak @@ -19,7 +19,7 @@ * The tpmtool program is copyrighted and licensed * under the following terms: * - * Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved. + * Copyright (C) 2000-2018 Free Software Foundation, and others, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the GNU General Public License, * version 3 or later <http://gnu.org/licenses/gpl.html> @@ -90,9 +90,9 @@ typedef enum { /** count of all options for tpmtool */ #define OPTION_CT 20 /** tpmtool version */ -#define TPMTOOL_VERSION "@VERSION@" +#define TPMTOOL_VERSION "3.6.4" /** Full tpmtool version text */ -#define TPMTOOL_FULL_VERSION "tpmtool @VERSION@" +#define TPMTOOL_FULL_VERSION "tpmtool 3.6.4" /** * Interface defines for all options. Replace "n" with the UPPER_CASED |