diff options
| author | Werner Koch <wk@gnupg.org> | 1998-12-29 14:47:31 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 1998-12-29 14:47:31 +0100 |
| commit | 6e08b235cb73d3c8e83218a94f9a2d356f2709ac (patch) | |
| tree | c5a0a706b32d530cb661a62ec9439109bce5a75c /g10/free-packet.c | |
| parent | See ChangeLog: Wed Dec 23 17:12:24 CET 1998 Werner Koch (diff) | |
| download | gnupg2-6e08b235cb73d3c8e83218a94f9a2d356f2709ac.tar.xz gnupg2-6e08b235cb73d3c8e83218a94f9a2d356f2709ac.zip | |
See ChangeLog: Tue Dec 29 14:41:47 CET 1998 Werner Koch
Diffstat (limited to 'g10/free-packet.c')
| -rw-r--r-- | g10/free-packet.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/free-packet.c b/g10/free-packet.c index bd4ed0422..3e3c9d054 100644 --- a/g10/free-packet.c +++ b/g10/free-packet.c @@ -354,7 +354,7 @@ cmp_public_keys( PKT_public_key *a, PKT_public_key *b ) if( a->timestamp != b->timestamp ) return -1; - if( a->expiredate != b->expiredate ) + if( a->version < 4 && a->expiredate != b->expiredate ) return -1; if( a->pubkey_algo != b->pubkey_algo ) return -1; @@ -381,7 +381,7 @@ cmp_secret_keys( PKT_secret_key *a, PKT_secret_key *b ) if( a->timestamp != b->timestamp ) return -1; - if( a->expiredate != b->expiredate ) + if( a->version < 4 && a->expiredate != b->expiredate ) return -1; if( a->pubkey_algo != b->pubkey_algo ) return -1; @@ -407,7 +407,7 @@ cmp_public_secret_key( PKT_public_key *pk, PKT_secret_key *sk ) if( pk->timestamp != sk->timestamp ) return -1; - if( pk->expiredate != sk->expiredate ) + if( pk->version < 4 && pk->expiredate != sk->expiredate ) return -1; if( pk->pubkey_algo != sk->pubkey_algo ) return -1; |