diff options
| author | Alvaro Herrera | 2016-03-09 17:31:07 +0000 |
|---|---|---|
| committer | Alvaro Herrera | 2016-03-09 17:31:07 +0000 |
| commit | 188f359d39ed65b5f3ddc1f397140fb9d153e61a (patch) | |
| tree | 19a88335d343b90f501f0d17a67947e52e2c0413 /contrib/pgcrypto/pgp.h | |
| parent | b6fb6471f6afaf649e52f38269fd8c5c60647669 (diff) | |
pgcrypto: support changing S2K iteration count
pgcrypto already supports key-stretching during symmetric encryption,
including the salted-and-iterated method; but the number of iterations
was not configurable. This commit implements a new s2k-count parameter
to pgp_sym_encrypt() which permits selecting a larger number of
iterations.
Author: Jeff Janes
Diffstat (limited to 'contrib/pgcrypto/pgp.h')
| -rw-r--r-- | contrib/pgcrypto/pgp.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/contrib/pgcrypto/pgp.h b/contrib/pgcrypto/pgp.h index 62b8517c27..88f7f8dc48 100644 --- a/contrib/pgcrypto/pgp.h +++ b/contrib/pgcrypto/pgp.h @@ -124,7 +124,7 @@ struct PGP_S2K uint8 mode; uint8 digest_algo; uint8 salt[8]; - uint8 iter; + uint8 iter; /* encoded (one-octet) count */ /* calculated: */ uint8 key[PGP_MAX_KEY]; uint8 key_len; @@ -138,6 +138,7 @@ struct PGP_Context */ PGP_S2K s2k; int s2k_mode; + int s2k_count; /* 4-byte decoded count */ int s2k_digest_algo; int s2k_cipher_algo; int cipher_algo; @@ -171,6 +172,10 @@ struct PGP_Context unsigned sess_key_len; }; +/* from RFC 4880 3.7.1.3 */ +#define s2k_decode_count(cval) \ + (((unsigned) 16 + (cval & 15)) << ((cval >> 4) + 6)) + struct PGP_MPI { uint8 *data; @@ -243,6 +248,7 @@ const char *pgp_get_cipher_name(int code); int pgp_set_cipher_algo(PGP_Context *ctx, const char *name); int pgp_set_s2k_mode(PGP_Context *ctx, int type); +int pgp_set_s2k_count(PGP_Context *ctx, int count); int pgp_set_s2k_cipher_algo(PGP_Context *ctx, const char *name); int pgp_set_s2k_digest_algo(PGP_Context *ctx, const char *name); int pgp_set_convert_crlf(PGP_Context *ctx, int doit); @@ -267,7 +273,7 @@ int pgp_load_cipher(int c, PX_Cipher **res); int pgp_get_cipher_key_size(int c); int pgp_get_cipher_block_size(int c); -int pgp_s2k_fill(PGP_S2K *s2k, int mode, int digest_algo); +int pgp_s2k_fill(PGP_S2K *s2k, int mode, int digest_algo, int count); int pgp_s2k_read(PullFilter *src, PGP_S2K *s2k); int pgp_s2k_process(PGP_S2K *s2k, int cipher, const uint8 *key, int klen); |