mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
tools: Remove the symcryptrun tool.
* tools/symcryptrun.c: Remove. * tools/Makefile.am: Ditto. * doc/tools.texi: Remove man page. * configure.ac: Remove build option and tests used only by this tool. * Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Do not build symcryptrun. -- symcryptrun is too ancient to be of any use and has not been tested in many years. Thus we should not distribute it anymore.
This commit is contained in:
Werner Koch
parent
390f597868
commit
209b7113f3
@ -30,7 +30,7 @@ RELEASE_ARCHIVE_SUFFIX = gnupg/v2.3
|
||||
# Autoconf flags.
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gnupg-builddir-envvar \
|
||||
--enable-all-tests --enable-symcryptrun --enable-g13 \
|
||||
--enable-all-tests --enable-g13 \
|
||||
--enable-gpgtar --enable-wks-tools --disable-ntbtls
|
||||
|
||||
GITLOG_TO_CHANGELOG=gitlog-to-changelog
|
||||
|
||||
22
configure.ac
22
configure.ac
@ -126,7 +126,6 @@ GNUPG_BUILD_PROGRAM(g13, no)
|
||||
GNUPG_BUILD_PROGRAM(dirmngr, yes)
|
||||
GNUPG_BUILD_PROGRAM(keyboxd, yes)
|
||||
GNUPG_BUILD_PROGRAM(doc, yes)
|
||||
GNUPG_BUILD_PROGRAM(symcryptrun, no)
|
||||
# We use gpgtar to unpack test data, hence we always build it. If the
|
||||
# user opts out, we simply don't install it.
|
||||
GNUPG_BUILD_PROGRAM(gpgtar, yes)
|
||||
@ -982,26 +981,6 @@ AC_DEFINE_UNQUOTED(FUSERMOUNT,
|
||||
"${FUSERMOUNT}", [defines the filename of the fusermount program])
|
||||
|
||||
|
||||
# Checks for dirmngr
|
||||
|
||||
|
||||
#
|
||||
# Checks for symcryptrun:
|
||||
#
|
||||
|
||||
# libutil has openpty() and login_tty().
|
||||
AC_CHECK_LIB(util, openpty,
|
||||
[ LIBUTIL_LIBS="$LIBUTIL_LIBS -lutil"
|
||||
AC_DEFINE(HAVE_LIBUTIL,1,
|
||||
[defined if libutil is available])
|
||||
])
|
||||
AC_SUBST(LIBUTIL_LIBS)
|
||||
|
||||
# shred is used to clean temporary plain text files.
|
||||
AC_PATH_PROG(SHRED, shred, /usr/bin/shred)
|
||||
AC_DEFINE_UNQUOTED(SHRED,
|
||||
"${SHRED}", [defines the filename of the shred program])
|
||||
|
||||
|
||||
#
|
||||
# Check whether the nPth library is available
|
||||
@ -1798,7 +1777,6 @@ AM_CONDITIONAL(BUILD_G13, test "$build_g13" = "yes")
|
||||
AM_CONDITIONAL(BUILD_DIRMNGR, test "$build_dirmngr" = "yes")
|
||||
AM_CONDITIONAL(BUILD_KEYBOXD, test "$build_keyboxd" = "yes")
|
||||
AM_CONDITIONAL(BUILD_DOC, test "$build_doc" = "yes")
|
||||
AM_CONDITIONAL(BUILD_SYMCRYPTRUN, test "$build_symcryptrun" = "yes")
|
||||
AM_CONDITIONAL(BUILD_GPGTAR, test "$build_gpgtar" = "yes")
|
||||
AM_CONDITIONAL(BUILD_WKS_TOOLS, test "$build_wks_tools" = "yes")
|
||||
|
||||
|
||||
@ -96,7 +96,7 @@ myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \
|
||||
gpg-card.texi
|
||||
myman_pages = gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \
|
||||
watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
|
||||
gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 gpgtar.1 \
|
||||
gpg-connect-agent.1 gpgparsemail.1 gpgtar.1 \
|
||||
applygnupgdefaults.8 gpg-wks-client.1 gpg-wks-server.1 \
|
||||
dirmngr-client.1 gpg-card.1 gpg-check-pattern.1
|
||||
if USE_GPG2_HACK
|
||||
|
||||
123
doc/tools.texi
123
doc/tools.texi
@ -19,7 +19,6 @@ GnuPG comes with a couple of smaller tools:
|
||||
* gpg-connect-agent:: Communicate with a running agent.
|
||||
* dirmngr-client:: How to use the Dirmngr client tool.
|
||||
* gpgparsemail:: Parse a mail message into an annotated format
|
||||
* symcryptrun:: Call a simple symmetric encryption tool.
|
||||
* gpgtar:: Encrypt or sign files into an archive.
|
||||
* gpg-check-pattern:: Check a passphrase on stdin against the patternfile.
|
||||
@end menu
|
||||
@ -1842,128 +1841,6 @@ The @command{gpgparsemail} is a utility currently only useful for
|
||||
debugging. Run it with @code{--help} for usage information.
|
||||
|
||||
|
||||
|
||||
@c
|
||||
@c SYMCRYPTRUN
|
||||
@c
|
||||
@node symcryptrun
|
||||
@section Call a simple symmetric encryption tool
|
||||
@manpage symcryptrun.1
|
||||
@ifset manverb
|
||||
.B symcryptrun
|
||||
\- Call a simple symmetric encryption tool
|
||||
@end ifset
|
||||
|
||||
@mansect synopsis
|
||||
@ifset manverb
|
||||
.B symcryptrun
|
||||
.B \-\-class
|
||||
.I class
|
||||
.B \-\-program
|
||||
.I program
|
||||
.B \-\-keyfile
|
||||
.I keyfile
|
||||
.RB [ --decrypt | --encrypt ]
|
||||
.RI [ inputfile ]
|
||||
@end ifset
|
||||
|
||||
@mansect description
|
||||
Sometimes simple encryption tools are already in use for a long time
|
||||
and there might be a desire to integrate them into the GnuPG
|
||||
framework. The protocols and encryption methods might be non-standard
|
||||
or not even properly documented, so that a full-fledged encryption
|
||||
tool with an interface like @command{gpg} is not doable.
|
||||
@command{symcryptrun} provides a solution: It operates by calling the
|
||||
external encryption/decryption module and provides a passphrase for a
|
||||
key using the standard @command{pinentry} based mechanism through
|
||||
@command{gpg-agent}.
|
||||
|
||||
Note, that @command{symcryptrun} is only available if GnuPG has been
|
||||
configured with @samp{--enable-symcryptrun} at build time.
|
||||
|
||||
@menu
|
||||
* Invoking symcryptrun:: List of all commands and options.
|
||||
@end menu
|
||||
|
||||
@manpause
|
||||
@node Invoking symcryptrun
|
||||
@subsection List of all commands and options
|
||||
|
||||
@noindent
|
||||
@command{symcryptrun} is invoked this way:
|
||||
|
||||
@example
|
||||
symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE
|
||||
[--decrypt | --encrypt] [inputfile]
|
||||
@end example
|
||||
@mancont
|
||||
|
||||
For encryption, the plain text must be provided on STDIN or as the
|
||||
argument @var{inputfile}, and the ciphertext will be output to STDOUT.
|
||||
For decryption vice versa.
|
||||
|
||||
@var{CLASS} describes the calling conventions of the external tool.
|
||||
Currently it must be given as @samp{confucius}. @var{PROGRAM} is
|
||||
the full filename of that external tool.
|
||||
|
||||
For the class @samp{confucius} the option @option{--keyfile} is
|
||||
required; @var{keyfile} is the name of a file containing the secret key,
|
||||
which may be protected by a passphrase. For detailed calling
|
||||
conventions, see the source code.
|
||||
|
||||
@noindent
|
||||
Note, that @command{gpg-agent} must be running before starting
|
||||
@command{symcryptrun}.
|
||||
|
||||
@noindent
|
||||
The following additional options may be used:
|
||||
|
||||
@table @gnupgtabopt
|
||||
@item -v
|
||||
@itemx --verbose
|
||||
@opindex verbose
|
||||
Output additional information while running.
|
||||
|
||||
@item -q
|
||||
@item --quiet
|
||||
@opindex q
|
||||
@opindex quiet
|
||||
Try to be as quiet as possible.
|
||||
|
||||
@include opt-homedir.texi
|
||||
|
||||
|
||||
@item --log-file @var{file}
|
||||
@opindex log-file
|
||||
Append all logging output to @var{file}. Use @file{socket://} to log
|
||||
to socket. Default is to write logging information to STDERR.
|
||||
|
||||
@end table
|
||||
|
||||
@noindent
|
||||
The possible exit status codes of @command{symcryptrun} are:
|
||||
|
||||
@table @code
|
||||
@item 0
|
||||
Success.
|
||||
@item 1
|
||||
Some error occurred.
|
||||
@item 2
|
||||
No valid passphrase was provided.
|
||||
@item 3
|
||||
The operation was canceled by the user.
|
||||
|
||||
@end table
|
||||
|
||||
@mansect see also
|
||||
@ifset isman
|
||||
@command{gpg}(1),
|
||||
@command{gpgsm}(1),
|
||||
@command{gpg-agent}(1),
|
||||
@end ifset
|
||||
@include see-also-note.texi
|
||||
|
||||
|
||||
@c
|
||||
@c GPGTAR
|
||||
@c
|
||||
|
||||
@ -126,7 +126,6 @@ tools/gpg-connect-agent.c
|
||||
tools/gpgconf-comp.c
|
||||
tools/gpgconf.c
|
||||
tools/no-libgcrypt.c
|
||||
tools/symcryptrun.c
|
||||
tools/gpg-check-pattern.c
|
||||
tools/gpg-card.c
|
||||
tools/card-misc.c
|
||||
|
||||
@ -37,12 +37,6 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
|
||||
|
||||
sbin_SCRIPTS = addgnupghome applygnupgdefaults
|
||||
|
||||
if BUILD_SYMCRYPTRUN
|
||||
symcryptrun = symcryptrun
|
||||
else
|
||||
symcryptrun =
|
||||
endif
|
||||
|
||||
if BUILD_WKS_TOOLS
|
||||
gpg_wks_server = gpg-wks-server
|
||||
else
|
||||
@ -51,7 +45,7 @@ endif
|
||||
|
||||
libexec_PROGRAMS = gpg-wks-client
|
||||
|
||||
bin_PROGRAMS = gpgconf gpg-connect-agent gpg-card ${symcryptrun}
|
||||
bin_PROGRAMS = gpgconf gpg-connect-agent gpg-card
|
||||
if !HAVE_W32_SYSTEM
|
||||
bin_PROGRAMS += watchgnupg gpgparsemail ${gpg_wks_server} gpgsplit
|
||||
else
|
||||
@ -115,11 +109,6 @@ gpgconf_w32_LDFLAGS = $(gpgconf_LDFLAGS) -Wl,-subsystem,windows
|
||||
gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
|
||||
gpgparsemail_LDADD =
|
||||
|
||||
symcryptrun_SOURCES = symcryptrun.c
|
||||
symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \
|
||||
$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) \
|
||||
$(LIBICONV) $(NETLIBS) $(W32SOCKLIBS) $(LIBASSUAN_LIBS)
|
||||
|
||||
watchgnupg_SOURCES = watchgnupg.c
|
||||
watchgnupg_LDADD = $(NETLIBS)
|
||||
|
||||
|
||||
1019
tools/symcryptrun.c
1019
tools/symcryptrun.c
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user