aboutsummaryrefslogtreecommitdiffstats
path: root/g10/parse-packet.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>1998-11-20 17:42:18 +0000
committerWerner Koch <[email protected]>1998-11-20 17:42:18 +0000
commit47c61bafe3545f17e8244902dca0ff00077d0feb (patch)
tree0867aa7d405a1df94ac360b5cc2814e97dcbe115 /g10/parse-packet.c
parentsome bug fixes (diff)
downloadgnupg-47c61bafe3545f17e8244902dca0ff00077d0feb.tar.gz
gnupg-47c61bafe3545f17e8244902dca0ff00077d0feb.zip
Expiration time works (I hope so)
Diffstat (limited to 'g10/parse-packet.c')
-rw-r--r--g10/parse-packet.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index a2923d958..2d82308dd 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -288,7 +288,7 @@ parse( IOBUF inp, PACKET *pkt, int reqtype, ulong *retpos,
}
if( do_skip || !pkttype || (reqtype && pkttype != reqtype) ) {
- skip_packet(inp, pkttype, pktlen);
+ skip_rest(inp, pktlen);
*skip = 1;
rc = 0;
goto leave;
@@ -636,7 +636,8 @@ dump_sig_subpkt( int hashed, int type, int critical,
break;
case SIGSUBPKT_SIG_EXPIRE:
if( length >= 4 )
- printf("sig expires %s", strtimestamp( buffer_to_u32(buffer) ) );
+ printf("sig expires after %s",
+ strtimevalue( buffer_to_u32(buffer) ) );
break;
case SIGSUBPKT_EXPORTABLE:
if( length )
@@ -653,7 +654,8 @@ dump_sig_subpkt( int hashed, int type, int critical,
break;
case SIGSUBPKT_KEY_EXPIRE:
if( length >= 4 )
- printf("key expires %s", strtimestamp( buffer_to_u32(buffer) ) );
+ printf("key expires after %s",
+ strtimevalue( buffer_to_u32(buffer) ) );
break;
case SIGSUBPKT_ARR:
p = "additional recipient request";