diff options
| author | David Shaw <[email protected]> | 2006-10-13 04:06:24 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-10-13 04:06:24 +0000 |
| commit | c6465b0654ed67602cdd465b4a945280877c40ae (patch) | |
| tree | 059ed0d8bf110c4d1378403cbe0b925a01590810 /g10/main.h | |
| parent | Allow pkcs#10 creation directkly from a smart card (diff) | |
| download | gnupg-c6465b0654ed67602cdd465b4a945280877c40ae.tar.gz gnupg-c6465b0654ed67602cdd465b4a945280877c40ae.zip | |
* parse-packet.c (parse_symkeyenc): Show the unpacked as well as the
packed s2k iteration count.
* main.h, options.h, gpg.c (encode_s2k_iterations, main), passphrase.c
(hash_passphrase): Add --s2k-count option to specify the number of s2k
hash iterations.
Diffstat (limited to '')
| -rw-r--r-- | g10/main.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/g10/main.h b/g10/main.h index 4e82a525c..5303aa3a9 100644 --- a/g10/main.h +++ b/g10/main.h @@ -304,4 +304,6 @@ int card_generate_subkey (KBNODE pub_keyblock, KBNODE sec_keyblock); int card_store_subkey (KBNODE node, int use); #endif +#define S2K_DECODE_COUNT(_val) ((16ul + ((_val) & 15)) << (((_val) >> 4) + 6)) + #endif /*G10_MAIN_H*/ |