2 Commits

Author	SHA1	Message	Date
NIIBE Yutaka	4e601c7643	Fix a reference in comment. ... * common/openpgp-s2k.c: Fix. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2019-07-12 12:11:26 +09:00
Werner Koch	ec13b1c562	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>	2019-01-26 23:10:38 +01:00