mirror of
git://git.gnupg.org/gnupg.git
synced 2025-04-13 22:21:09 +02:00
See ChangeLog: Tue Feb 15 08:48:13 CET 2000 Werner Koch
This commit is contained in:
parent
17eb1405a2
commit
79dcd00c28
@ -1,3 +1,10 @@
|
|||||||
|
Tue Feb 15 08:48:13 CET 2000 Werner Koch <wk@gnupg.de>
|
||||||
|
|
||||||
|
* build-packet.c (build_packet): Fixed fixing of old comment packets.
|
||||||
|
|
||||||
|
* import.c (import_keys): Fixed importing from stdin when called with
|
||||||
|
nnames set to zero as it normally happens.
|
||||||
|
|
||||||
Mon Feb 14 14:30:20 CET 2000 Werner Koch <wk@gnupg.de>
|
Mon Feb 14 14:30:20 CET 2000 Werner Koch <wk@gnupg.de>
|
||||||
|
|
||||||
* sig-check.c (check_key_signature2): Add new arg r_expired.
|
* sig-check.c (check_key_signature2): Add new arg r_expired.
|
||||||
|
@ -74,7 +74,7 @@ build_packet( IOBUF out, PACKET *pkt )
|
|||||||
assert( pkt->pkt.generic );
|
assert( pkt->pkt.generic );
|
||||||
|
|
||||||
switch( (pkttype = pkt->pkttype) ) {
|
switch( (pkttype = pkt->pkttype) ) {
|
||||||
case PKT_OLD_COMMENT: pkt->pkttype = PKT_COMMENT; break;
|
case PKT_OLD_COMMENT: pkttype = pkt->pkttype = PKT_COMMENT; break;
|
||||||
case PKT_PLAINTEXT: new_ctb = pkt->pkt.plaintext->new_ctb; break;
|
case PKT_PLAINTEXT: new_ctb = pkt->pkt.plaintext->new_ctb; break;
|
||||||
case PKT_ENCRYPTED:
|
case PKT_ENCRYPTED:
|
||||||
case PKT_ENCRYPTED_MDC: new_ctb = pkt->pkt.encrypted->new_ctb; break;
|
case PKT_ENCRYPTED_MDC: new_ctb = pkt->pkt.encrypted->new_ctb; break;
|
||||||
|
@ -115,6 +115,9 @@ import_keys( char **fnames, int nnames, int fast )
|
|||||||
/* fixme: don't use static variables */
|
/* fixme: don't use static variables */
|
||||||
memset( &stats, 0, sizeof( stats ) );
|
memset( &stats, 0, sizeof( stats ) );
|
||||||
|
|
||||||
|
if( !fnames && !nnames )
|
||||||
|
nnames = 1; /* Ohh what a ugly hack to jump into the loop */
|
||||||
|
|
||||||
for(i=0; i < nnames; i++ ) {
|
for(i=0; i < nnames; i++ ) {
|
||||||
const char *fname = fnames? fnames[i] : NULL;
|
const char *fname = fnames? fnames[i] : NULL;
|
||||||
IOBUF inp = iobuf_open(fname);
|
IOBUF inp = iobuf_open(fname);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user