aboutsummaryrefslogtreecommitdiffstats
path: root/g10/keyid.c
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2005-01-28 00:50:10 +0000
committerDavid Shaw <[email protected]>2005-01-28 00:50:10 +0000
commitdf42d339d9042916d9d23f63cbb76a97d0062ab5 (patch)
tree733c619f6bcc431025f06dc1090cc70074f3b8ee /g10/keyid.c
parent* keygen.c (generate_subkeypair): Detect primary key on-card and (diff)
downloadgnupg-df42d339d9042916d9d23f63cbb76a97d0062ab5.tar.gz
gnupg-df42d339d9042916d9d23f63cbb76a97d0062ab5.zip
* keyid.c (keyid_from_sk, keyid_from_pk): Use 0xFFFFFFFFFFFFFFFF
instead of 0x0000000000000000 for the invalid key ID since all-zeroes is reserved for the anonymous recipient. * keyedit.c (change_passphrase), keygen.c (generate_subkeypair): Fix a string ;)
Diffstat (limited to '')
-rw-r--r--g10/keyid.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/keyid.c b/g10/keyid.c
index 25d51e3b8..03e816958 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -280,7 +280,7 @@ keyid_from_sk( PKT_secret_key *sk, u32 *keyid )
sk->keyid[1]=keyid[1];
}
else
- sk->keyid[0]=sk->keyid[1]=keyid[0]=keyid[1]=lowbits=0;
+ sk->keyid[0]=sk->keyid[1]=keyid[0]=keyid[1]=lowbits=0xFFFFFFFF;
}
else
{
@@ -298,7 +298,7 @@ keyid_from_sk( PKT_secret_key *sk, u32 *keyid )
sk->keyid[1] = keyid[1];
}
else
- sk->keyid[0]=sk->keyid[1]=keyid[0]=keyid[1]=lowbits=0;
+ sk->keyid[0]=sk->keyid[1]=keyid[0]=keyid[1]=lowbits=0xFFFFFFFF;
}
return lowbits;
@@ -334,7 +334,7 @@ keyid_from_pk( PKT_public_key *pk, u32 *keyid )
pk->keyid[1] = keyid[1];
}
else
- pk->keyid[0]=pk->keyid[1]=keyid[0]=keyid[1]=lowbits=0;
+ pk->keyid[0]=pk->keyid[1]=keyid[0]=keyid[1]=lowbits=0xFFFFFFFF;
}
else
{
@@ -352,7 +352,7 @@ keyid_from_pk( PKT_public_key *pk, u32 *keyid )
pk->keyid[1] = keyid[1];
}
else
- pk->keyid[0]=pk->keyid[1]=keyid[0]=keyid[1]=lowbits=0;
+ pk->keyid[0]=pk->keyid[1]=keyid[0]=keyid[1]=lowbits=0xFFFFFFFF;
}
return lowbits;