diff options
| author | Werner Koch <wk@gnupg.org> | 1998-02-18 19:52:59 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 1998-02-18 19:52:59 +0100 |
| commit | 9119f2bf5942bd71aed5ff56b343d8f98149de28 (patch) | |
| tree | 1a0f91454eb1f36c129a26196a2b02d926aed7bc /g10 | |
| parent | added revcation stuff and fixed a couple of bugs (diff) | |
| download | gnupg2-9119f2bf5942bd71aed5ff56b343d8f98149de28.tar.xz gnupg2-9119f2bf5942bd71aed5ff56b343d8f98149de28.zip | |
rel 0.2.7 mit kleines Korrekturen
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/Makefile.am | 2 | ||||
| -rw-r--r-- | g10/Makefile.in | 1 | ||||
| -rw-r--r-- | g10/g10maint.c | 20 | ||||
| -rw-r--r-- | g10/rsa.c | 4 |
5 files changed, 22 insertions, 11 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 6be310564..c352db6fb 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +Wed Feb 18 18:39:02 1998 Werner Koch (wk@isil.d.shuttle.de) + + * Makefile.am (OMIT_DEPENDENCIES): New. + + * rsa.c: Replaced log_bug by BUG. + Wed Feb 18 13:35:58 1998 Werner Koch (wk@isil.d.shuttle.de) * mainproc.c (do_check_sig): Now uses hash_public_cert. diff --git a/g10/Makefile.am b/g10/Makefile.am index 44cc3ae94..a2a72f778 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -2,6 +2,7 @@ INCLUDES = -I$(top_srcdir)/include EXTRA_DIST = OPTIONS pubring.asc +OMIT_DEPENDENCIES = zlib.h zconf.h needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a bin_PROGRAMS = g10 g10maint @@ -59,5 +60,6 @@ g10maint_SOURCES = g10maint.c \ LDADD = @INTLLIBS@ $(needed_libs) @ZLIBS@ + $(PROGRAMS): $(needed_libs) diff --git a/g10/Makefile.in b/g10/Makefile.in index 318423c56..6b2a3b25a 100644 --- a/g10/Makefile.in +++ b/g10/Makefile.in @@ -88,6 +88,7 @@ ZLIBS = @ZLIBS@ INCLUDES = -I$(top_srcdir)/include EXTRA_DIST = OPTIONS pubring.asc +OMIT_DEPENDENCIES = zlib.h zconf.h needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a bin_PROGRAMS = g10 g10maint diff --git a/g10/g10maint.c b/g10/g10maint.c index c743bf9a3..3204aab2b 100644 --- a/g10/g10maint.c +++ b/g10/g10maint.c @@ -422,15 +422,17 @@ main( int argc, char **argv ) tty_printf("%s", strusage(15) ); } - if( !sec_nrings || default_keyring ) { /* add default secret rings */ - char *p = make_filename(opt.homedir, "secring.g10", NULL ); - add_secret_keyring(p); - m_free(p); - } - if( !nrings || default_keyring ) { /* add default ring */ - char *p = make_filename(opt.homedir, "pubring.g10", NULL ); - add_keyring(p); - m_free(p); + if( cmd != aDeArmor && cmd != aEnArmor ) { + if( !sec_nrings || default_keyring ) { /* add default secret rings */ + char *p = make_filename(opt.homedir, "secring.g10", NULL ); + add_secret_keyring(p); + m_free(p); + } + if( !nrings || default_keyring ) { /* add default ring */ + char *p = make_filename(opt.homedir, "pubring.g10", NULL ); + add_keyring(p); + m_free(p); + } } if( argc ) { @@ -58,7 +58,7 @@ g10_rsa_encrypt( PKT_public_cert *pkc, PKT_pubkey_enc *enc, DEK *dek ) m_free(ustr); } #else - log_bug(NULL); + BUG(); #endif/* ! HAVE_RSA_CIPHER*/ } @@ -96,7 +96,7 @@ g10_rsa_sign( PKT_secret_cert *skc, PKT_signature *sig, m_free(ustr); } #else - log_bug(NULL); + BUG(); #endif/* ! HAVE_RSA_CIPHER*/ } |