diff options
| author | Werner Koch <[email protected]> | 2010-10-20 11:33:50 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-10-20 11:33:50 +0000 |
| commit | cc99c375491c88e85190c25648419a8e627b08f6 (patch) | |
| tree | 5cb3eda1226608f68e398a6a7f007f8381127dde /g10/seckey-cert.c | |
| parent | Install the mo files on W32 platforms (diff) | |
| download | gnupg-cc99c375491c88e85190c25648419a8e627b08f6.tar.gz gnupg-cc99c375491c88e85190c25648419a8e627b08f6.zip | |
Make public key data structure easier to read.
Check vor v1 card while signing.
Diffstat (limited to '')
| -rw-r--r-- | g10/seckey-cert.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c index 25f62a684..6fe5e67d3 100644 --- a/g10/seckey-cert.c +++ b/g10/seckey-cert.c @@ -76,10 +76,11 @@ do_check( PKT_secret_key *sk, const char *tryagain_text, int mode, } keyid_from_sk( sk, keyid ); keyid[2] = keyid[3] = 0; - if( !sk->is_primary ) { + if (!sk->flags.primary) + { keyid[2] = sk->main_keyid[0]; keyid[3] = sk->main_keyid[1]; - } + } dek = passphrase_to_dek( keyid, sk->pubkey_algo, sk->protect.algo, &sk->protect.s2k, mode, tryagain_text, canceled ); @@ -269,6 +270,7 @@ do_check( PKT_secret_key *sk, const char *tryagain_text, int mode, int is_secret_key_protected (PKT_public_key *pk) { +#warning do we need this return 0; /* FIXME: use agent_get_keyinfo?*/ /* return sk->is_protected? */ /* sk->protect.s2k.mode == 1002? -2 : */ |