security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

* keyid.c (keyid_from_sk, keyid_from_pk): Use 0xFFFFFFFFFFFFFFFF

Browse Source 
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 ;)
This commit is contained in:
David Shaw 2005-01-28 00:50:10 +00:00
parent d96f816f89
commit df42d339d9
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
g10/ChangeLog
View File

@ -1,3 +1,12 @@
2005-01-27 David Shaw <dshaw@jabberwocky.com>
* 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 ;)
2005-01-27 Werner Koch <wk@g10code.com> 2005-01-27 Werner Koch <wk@g10code.com>
* keygen.c (generate_subkeypair): Detect primary key on-card and * keygen.c (generate_subkeypair): Detect primary key on-card and

2
g10/keyedit.c
View File

@ -1110,7 +1110,7 @@ change_passphrase( KBNODE keyblock )
no_primary_secrets = 1; no_primary_secrets = 1;
} }
else if( sk->protect.s2k.mode == 1002 ) { else if( sk->protect.s2k.mode == 1002 ) {
tty_printf(_("Secret parts of primary key are store on-card.\n")); tty_printf(_("Secret parts of primary key are stored on-card.\n"));
no_primary_secrets = 1; no_primary_secrets = 1;
} }
else { else {

2
g10/keygen.c
View File

@ -3049,7 +3049,7 @@ generate_subkeypair( KBNODE pub_keyblock, KBNODE sec_keyblock )
tty_printf(_("This key is not protected.\n")); tty_printf(_("This key is not protected.\n"));
break; break;
case -2: case -2:
tty_printf(_("Secret parts of primary key are store on-card.\n")); tty_printf(_("Secret parts of primary key are stored on-card.\n"));
ask_pass = 1; ask_pass = 1;
break; break;
default: default:

8
g10/keyid.c
View File

@ -280,7 +280,7 @@ keyid_from_sk( PKT_secret_key *sk, u32 *keyid )
sk->keyid[1]=keyid[1]; sk->keyid[1]=keyid[1];
} }
else 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 else
{ {
@ -298,7 +298,7 @@ keyid_from_sk( PKT_secret_key *sk, u32 *keyid )
sk->keyid[1] = keyid[1]; sk->keyid[1] = keyid[1];
} }
else 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; return lowbits;
@ -334,7 +334,7 @@ keyid_from_pk( PKT_public_key *pk, u32 *keyid )
pk->keyid[1] = keyid[1]; pk->keyid[1] = keyid[1];
} }
else 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 else
{ {
@ -352,7 +352,7 @@ keyid_from_pk( PKT_public_key *pk, u32 *keyid )
pk->keyid[1] = keyid[1]; pk->keyid[1] = keyid[1];
} }
else 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; return lowbits;