security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

* parse-packet.c (parse_plaintext), packet.h, plaintext.c

Browse source 
(handle_plaintext): Fix bug in handling literal packets with zero-length
data (no data was being confused with partial body length).

* misc.c (pct_expando), options.skel: %t means extension ("jpg"). %T means
MIME type ("image/jpeg").

* import.c (import_one): Only trigger trust update if the keyring is
actually changed.

* export.c (do_export_stream): Missing a m_free.
This commit is contained in:
David Shaw 2002-04-23 02:48:44 +00:00
parent 0f2fedd806
commit 3b9a04844c
8 changed files with 49 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
g10/import.c
View file

@ -467,7 +467,6 @@ import_one( const char *fname, KBNODE keyblock, int fast,
return 0;
}
/* do we have this key already in one of our pubrings ? */
pk_orig = m_alloc_clear( sizeof *pk_orig );
rc = get_pubkey( pk_orig, keyid );
@ -497,7 +496,10 @@ import_one( const char *fname, KBNODE keyblock, int fast,
if (rc)
log_error (_("error writing keyring `%s': %s\n"),
keydb_get_resource_name (hd), g10_errstr(rc));
else
revalidation_mark ();
keydb_release (hd);
/* we are ready */
if( !opt.quiet )
log_info( _("key %08lX: public key imported\n"), (ulong)keyid[1]);
@ -568,6 +570,9 @@ import_one( const char *fname, KBNODE keyblock, int fast,
if (rc)
log_error (_("error writing keyring `%s': %s\n"),
keydb_get_resource_name (hd), g10_errstr(rc) );
else
revalidation_mark ();
/* we are ready */
if( !opt.quiet ) {
if( n_uids == 1 )
@ -601,8 +606,6 @@ import_one( const char *fname, KBNODE keyblock, int fast,
}
keydb_release (hd); hd = NULL;
}
if (!rc)
revalidation_mark ();
leave:
release_kbnode( keyblock_orig );