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 /agent/protect.c | |
| 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 'agent/protect.c')
| -rw-r--r-- | agent/protect.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/agent/protect.c b/agent/protect.c index f95527f78..eda247f27 100644 --- a/agent/protect.c +++ b/agent/protect.c @@ -41,6 +41,7 @@ #include "cvt-openpgp.h" #include "../common/sexp-parse.h" +#include "../common/openpgpdefs.h" /* For s2k functions. */ /* The protection mode for encryption. The supported modes for @@ -49,9 +50,6 @@ #define PROT_CIPHER_STRING "aes" #define PROT_CIPHER_KEYLEN (128/8) -/* Decode an rfc4880 encoded S2K count. */ -#define S2K_DECODE_COUNT(_val) ((16ul + ((_val) & 15)) << (((_val) >> 4) + 6)) - /* A table containing the information needed to create a protected private key. */ |