Diffusion GnuPG ec13b1c562e3

gpg: Move S2K encoding function to a shared file.

Authored by werner on Sat, Jan 26, 11:10 PM.

Description

gpg: Move S2K encoding function to a shared file.

* g10/passphrase.c (encode_s2k_iterations): Move function to ...
* common/openpgp-s2k.c: new file.  Remove default intialization code.
* common/openpgpdefs.h (S2K_DECODE_COUNT): New to keep only one copy.
* g10/call-agent.c (agent_get_s2k_count): Change to return the count
and print an error.
* agent/protect.c: Include openpgpdefs.h
* g10/card-util.c (gen_kdf_data): Adjust for changes
* g10/gpgcompose.c: Include call-agent.h.
(sk_esk): Adjust for changes.
* g10/passphrase (passphrase_to_dek): Adjust for changes.
* g10/main.h (S2K_DECODE_COUNT): Remove macro.
  • Signed-off-by: Werner Koch <wk@gnupg.org>

Details

Committed
wernerSat, Jan 26, 11:10 PM
Parents
rG0415b80227c5: scd: Improve app selection for app "undefined".
Branches
Unknown
Tags
Unknown