security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

* gpg.c (main): Restore convert-sk-to-pk as programs rely on it. 

* keyid.c (usagestr_from_pk): Remove special PUBKEY_USAGE_CERT flag.
It's no longer needed.
This commit is contained in:
David Shaw 2005-12-19 01:51:31 +00:00
parent 26eeebf512
commit aebd3a04f3
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2005-12-18 David Shaw <dshaw@jabberwocky.com>
* gpg.c (main): Restore convert-sk-to-pk as programs rely on it.
* keyid.c (usagestr_from_pk): Remove special PUBKEY_USAGE_CERT
flag. It's no longer needed.
2005-12-14 David Shaw <dshaw@jabberwocky.com>
* gpg.c (main): Don't default to import-options convert-sk-to-pk.

1
g10/gpg.c
View File

@ -1693,6 +1693,7 @@ main (int argc, char **argv )
opt.pgp2_workarounds = 1;
opt.force_v3_sigs = 1;
opt.escape_from = 1;
opt.import_options=IMPORT_SK2PK;
opt.export_options=EXPORT_ATTRIBUTES;
opt.keyserver_options.import_options=IMPORT_REPAIR_PKS_SUBKEY_BUG;
opt.keyserver_options.export_options=EXPORT_ATTRIBUTES;

8
g10/keyid.c
View File

@ -543,13 +543,9 @@ usagestr_from_pk( PKT_public_key *pk )
static char buffer[10];
int i = 0;
unsigned int use = pk->pubkey_usage;
if ( use & PUBKEY_USAGE_SIG )
{
if (pk->is_primary)
use|=PUBKEY_USAGE_CERT;
buffer[i++] = 'S';
}
buffer[i++] = 'S';
if ( use & PUBKEY_USAGE_CERT )
buffer[i++] = 'C';