diff options
Diffstat (limited to 'g10/keyid.c')
| -rw-r--r-- | g10/keyid.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/g10/keyid.c b/g10/keyid.c index 387c3fa9a..fa5b9237e 100644 --- a/g10/keyid.c +++ b/g10/keyid.c @@ -82,7 +82,12 @@ do_fingerprint_md( PKT_public_key *pk ) md_putc( md, a ); } if( pk->version < 4 ) { - u16 a = pk->valid_days; + u16 a; + + if( pk->expiredate ) + a = (u16)((pk->expiredate - pk->timestamp) / 86400L); + else + a = 0; md_putc( md, a >> 8 ); md_putc( md, a ); } @@ -108,7 +113,7 @@ do_fingerprint_md_sk( PKT_secret_key *sk ) pk.pubkey_algo = sk->pubkey_algo; pk.version = sk->version; pk.timestamp = sk->timestamp; - pk.valid_days = sk->valid_days; + pk.expiredate = sk->expiredate; pk.pubkey_algo = sk->pubkey_algo; for( i=0; i < npkey; i++ ) pk.pkey[i] = sk->skey[i]; @@ -303,9 +308,9 @@ expirestr_from_pk( PKT_public_key *pk ) struct tm *tp; time_t atime; - if( !pk->valid_days ) + if( !pk->expiredate ) return "never "; - atime = add_days_to_timestamp( pk->timestamp, pk->valid_days ); + atime = pk->expiredate; tp = gmtime( &atime ); sprintf(buffer,"%04d-%02d-%02d", 1900+tp->tm_year, tp->tm_mon+1, tp->tm_mday ); return buffer; @@ -318,9 +323,9 @@ expirestr_from_sk( PKT_secret_key *sk ) struct tm *tp; time_t atime; - if( !sk->valid_days ) + if( !sk->expiredate ) return "never "; - atime = add_days_to_timestamp( sk->timestamp, sk->valid_days ); + atime = sk->expiredate; tp = gmtime( &atime ); sprintf(buffer,"%04d-%02d-%02d", 1900+tp->tm_year, tp->tm_mon+1, tp->tm_mday ); return buffer; |