diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 11 | ||||
| -rw-r--r-- | g10/Makefile.in | 49 | ||||
| -rw-r--r-- | g10/OPTIONS | 191 | ||||
| -rw-r--r-- | g10/g10.c | 2 | ||||
| -rw-r--r-- | g10/keygen.c | 2 | ||||
| -rw-r--r-- | g10/openfile.c | 5 | ||||
| -rw-r--r-- | g10/plaintext.c | 3 |
7 files changed, 48 insertions, 215 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index e4359ede9..d558e148a 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,14 @@ +Wed Feb 25 11:40:04 1998 Werner Koch ([email protected]) + + * plaintext.c (ask_for_detached_datafile): add opt.verbose to + info output. + + * openfile.c (open_sigfile): Try also name ending in ".asc" + +Wed Feb 25 08:41:00 1998 Werner Koch ([email protected]) + + * keygen.c (generate_keypair): Fixed memory overflow. + Tue Feb 24 15:51:55 1998 Werner Koch ([email protected]) * parse-packet.c (parse_certificate): Support for S2K. diff --git a/g10/Makefile.in b/g10/Makefile.in index 034d4ba9e..9d15d1336 100644 --- a/g10/Makefile.in +++ b/g10/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.2d from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,19 +72,25 @@ G10_LOCALEDIR = @G10_LOCALEDIR@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GT_NO = @GT_NO@ +GT_YES = @GT_YES@ +INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ -INTLSUB = @INTLSUB@ +MKINSTALLDIRS = @MKINSTALLDIRS@ MPI_EXTRA_ASM_OBJS = @MPI_EXTRA_ASM_OBJS@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ VERSION = @VERSION@ ZLIBS = @ZLIBS@ +l = @l@ INCLUDES = -I$(top_srcdir)/include EXTRA_DIST = OPTIONS pubring.asc @@ -229,14 +235,11 @@ install-binPROGRAMS: $(bin_PROGRAMS) done uninstall-binPROGRAMS: - $(NORMAL_UNINSTALL) + @$(NORMAL_UNINSTALL) list='$(bin_PROGRAMS)'; for p in $$list; do \ rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done -.c.o: - $(COMPILE) -c $< - .s.o: $(COMPILE) -c $< @@ -244,7 +247,7 @@ uninstall-binPROGRAMS: $(COMPILE) -c $< mostlyclean-compile: - -rm -f *.o core + -rm -f *.o core *.core clean-compile: @@ -270,8 +273,12 @@ ID: $(HEADERS) $(SOURCES) $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) $(LISP) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: @@ -299,12 +306,7 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file; \ done -MKDEP = $(CC) -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) - DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) --include .deps/.P -.deps/.P: $(BUILT_SOURCES) - echo > $@ -include $(DEP_FILES) @@ -317,13 +319,16 @@ distclean-depend: maintainer-clean-depend: -rm -rf .deps -.deps/%.P: %.c - @echo "Computing dependencies for $<..." - @o='o'; \ - test -n "$o" && o='$$o'; \ - $(MKDEP) $< >[email protected] \ - && sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," < [email protected] > $@ \ - && rm -f [email protected] +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).P -c $< + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $< + @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \ + < .deps/$(*F).p > .deps/$(*F).P + @-rm -f .deps/$(*F).p info: dvi: check: all diff --git a/g10/OPTIONS b/g10/OPTIONS index c4e6afde0..9620c99f5 100644 --- a/g10/OPTIONS +++ b/g10/OPTIONS @@ -1,11 +1,11 @@ # This is a sample option file # # Unless you you specify which option file to use with the -# commandline option "--options filename", g10 uses per -# default the file ~/.g10/options. +# commandline option "--options filename", gpg uses per +# default the file ~/.gnupg/options. # # An option file can contain all long options which are -# available in G10. If the first non white space character of +# available in GNUPG. If the first non white space character of # a line is a '#', this line is ignored. Empty lines are also # ignored. # @@ -19,41 +19,6 @@ #----------------------------------------------- # With some expections, those cannot be combined -add-key -# add key to the public keyring - -change-passphrase -# change the passphrase of your secret keyring - -check -# check a signature - -decrypt -# decrypt data (default) - -delete-key -# remove key from public keyring, - -edit-sig -# edit a key signature. Currently you have only the option to delete -# some signatures. - -encrypt -# (Can be combined with a "sign") -# encrypt data - -export <names> -# Either export all keys from all keyrings (default keyrings and -# those registered via option "keyring"), or if at least one name is -# given, those of the givename. The new keyring is written to stdout -# or to the file given with option "output" - -fingerprint -# show the fingerprints, - -gen-key -# generate a new key pair, this is an interactive command. - gen-prime # Generate a prime. # With one argument: take it as the bitsize and make a simple prime of @@ -62,160 +27,10 @@ gen-prime # With three arguments: same as above, but a third argument indicates # that a generator should also be calculated. -list-packets -# List only the sequence of packets"}, - - print-mds # print all message digests of all give filenames -sign -# (Can be combined with a "encrypt") -# make a signature - sign-key -# make a signature on a key in the keyring -# Argument is the userid of the key to sign. -# This looks for the key, displays the key and checks all -# existing signatures of this key. If the key is not yet signed -# by the default user (or the users given with "-l"), the programm -# displays the information of the key again, together with -# it's fingerprint and asked wehter it should be signed. This question -# is repeated for all users specified with "-l". The key is then signed -# and the keyring which contains the key is updated. - store # simply packs the input data into a rfc1991 packet format -symmetric -# encrypt the input only with the symmetric (conventional) cipher. -# This asks for a passphrase. - - -test -# Used for testing some parts of the program - -#---------------------------------------------- -#------ Options without a long form ---------- -#---------------------------------------------- - --k -# List keyrings. -# Without arguments, all default public keyrings are listed -# With one argument, this keyring is listed. -# -# -kv is the same as -k -# -kvv list the signatures with every key -# -kvvv additional checks all signatures -# -kvc list fingerprints -# -kvvc list fingerprints and signatures -# Note that this is a kludge, to emulate the strange pgp syntax; -# combining it with other options may give other outputs. - - - --z n -# Set compress level to n. -# n = 0 disables compresson. Default compress level depends on -# the local zlib (6). - - -#----------------------------------------------- -#------------------- Options ------------------- -#----------------------------------------------- - - -armor -# create ascii armored output - - -batch -# batch mode: never ask - -no-batch -# disables batch - -cache-all -# hold everything in memory - - -check-key -# check signatures on a key in the keyring - -debug value|hexvalue -# set debugging flags, - -debug-all -# enable full debugging - - -detach-sign -# make a detached signature, - -dry-run -# don't make any changes - -homedir dirname -# Set the name of the home directory which defaults to "~/.g10". - -keyring filename -# add this filename to the list of keyrings. -# If the filename begins with a tilde and a slash, these are replaced -# by the HOME directory. If the filename does not contain a slash, it -# is assumed to be in "~/.g10" - -local-user user-string -# use this user-string to sign or decrypt - -no -# assume no on most questions - -no-armor -# Assume the input data is not in ascii armored format. - -no-default-keyring -# Do not add the default keyrings to the list of keyrings - -no-greeting -# suppress the initial copyright etc. messages but do not enter batch mode. - -no-verbose -# set verbose level to 0 - -options filename -# Ignored in option files. - -no-options -# same as --options /dev/null. This option is detected -# before an attempt to open an option file - -output filename -# use filename for output - -passphrase-fd n -# Read the passphrase from file with the descriptor n. If you use -# 0 for n, the passphrase will be read from stdin. This can only be used -# if only one passphrase is supplied. - - -remote-user -# use this user-id for encryption" - -secret-keyring filename -# add filename to the list of secret keyrings -# see "keyring" for further informations - -status-fd n -# Write status informations to this file descriptor. If this option -# is not used, no status information is writte. This option is for the -# sake of a calling programm (e.g. a MUA) to ease up parsing of output -# and providing a defined set of status messages. -# FIXME: use a format ala "100 Blabla"? - -verbose -# Give more informations suring processing. If used 2 times, the input data -# is listed in detail. - -yes -# assume yes on most questions - @@ -137,7 +137,7 @@ strusage( int level ) static char *digests, *pubkeys, *ciphers; const char *p; switch( level ) { - case 11: p = "GNUPG"; break; + case 11: p = "gpg (GNUPG)"; break; case 13: p = VERSION; break; case 17: p = PRINTABLE_OS_NAME; break; case 19: p = _( diff --git a/g10/keygen.c b/g10/keygen.c index f883f23af..ed16d5288 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -502,7 +502,7 @@ generate_keypair() tty_printf(_("You need a Passphrase to protect your secret key.\n\n") ); - dek = m_alloc_secure( sizeof *dek ); + dek = m_alloc_secure( sizeof *dek + 8 ); salt = (byte*)dek + sizeof *dek; for(;;) { dek->algo = CIPHER_ALGO_BLOWFISH; diff --git a/g10/openfile.c b/g10/openfile.c index 512633080..249e9c9a1 100644 --- a/g10/openfile.c +++ b/g10/openfile.c @@ -124,7 +124,7 @@ open_outfile( const char *iname, int mode ) /**************** - * Try to open a file without the extension ".sig" + * Try to open a file without the extension ".sig" or ".asc" * Return NULL if such a file is not available. */ IOBUF @@ -135,7 +135,8 @@ open_sigfile( const char *iname ) if( iname ) { len = strlen(iname); - if( len > 4 && !strcmp(iname + len - 4, ".sig") ) { + if( len > 4 && ( !strcmp(iname + len - 4, ".sig") + || !strcmp(iname + len - 4, ".asc")) ) { char *buf; buf = m_strdup(iname); buf[len-4] = 0 ; diff --git a/g10/plaintext.c b/g10/plaintext.c index 05685afb6..284b684b5 100644 --- a/g10/plaintext.c +++ b/g10/plaintext.c @@ -160,7 +160,8 @@ ask_for_detached_datafile( md_filter_context_t *mfx, const char *inname ) } if( !fp ) { - log_info("reading stdin ...\n"); + if( opt.verbose ) + log_info("reading stdin ...\n"); while( (c = getchar()) != EOF ) { if( mfx->md ) md_putc(mfx->md, c ); |