diff options
| author | Werner Koch <wk@gnupg.org> | 2019-01-26 23:10:38 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2019-01-26 23:10:38 +0100 |
| commit | ec13b1c562e34c0fcbc7b848ab6dc187b79cf2c1 (patch) | |
| tree | 33ad3af6094e2a64625772e0f60104e48e8b917e /g10/keydb.h | |
| parent | scd: Improve app selection for app "undefined". (diff) | |
| download | gnupg2-ec13b1c562e34c0fcbc7b848ab6dc187b79cf2c1.tar.xz gnupg2-ec13b1c562e34c0fcbc7b848ab6dc187b79cf2c1.zip | |
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>
Diffstat (limited to 'g10/keydb.h')
| -rw-r--r-- | g10/keydb.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/g10/keydb.h b/g10/keydb.h index 1def2bb81..acb424455 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -276,7 +276,6 @@ gpg_error_t build_sk_list (ctrl_t ctrl, strlist_t locusr, SK_LIST *ret_sk_list, unsigned use); /*-- passphrase.h --*/ -unsigned char encode_s2k_iterations (int iterations); int have_static_passphrase(void); const char *get_static_passphrase (void); void set_passphrase_from_string(const char *pass); |