diff options
| author | Werner Koch <[email protected]> | 2023-08-28 06:49:45 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2023-08-28 06:49:45 +0000 |
| commit | 87cebf4f8dc26d78f0bd2477e009cb31ca840344 (patch) | |
| tree | f3b75abf3d6f2137842649239fc8e6313bd0d9cf | |
| parent | gpg: Fix format_keyid. (diff) | |
| download | gnupg-87cebf4f8dc26d78f0bd2477e009cb31ca840344.tar.gz gnupg-87cebf4f8dc26d78f0bd2477e009cb31ca840344.zip | |
gpgsm: Avoid warnings due to enum conversions
* sm/decrypt.c (pwri_parse_pbkdf2): Use int instead of gcry_md_algos.
(pwri_decrypt): Ditto for gcry_cipher_algos.
| -rw-r--r-- | sm/decrypt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sm/decrypt.c b/sm/decrypt.c index 99422425c..c9b50632c 100644 --- a/sm/decrypt.c +++ b/sm/decrypt.c @@ -429,7 +429,7 @@ static gpg_error_t pwri_parse_pbkdf2 (const unsigned char *der, size_t derlen, unsigned char const **r_salt, unsigned int *r_saltlen, unsigned long *r_iterations, - enum gcry_md_algos *r_digest) + int *r_digest) { gpg_error_t err; size_t objlen, hdrlen; @@ -541,7 +541,7 @@ pwri_decrypt (ctrl_t ctrl, gcry_sexp_t enc_val, unsigned int ekeylen; unsigned char kek[32]; unsigned int keklen; - enum gcry_cipher_algos encr_algo; + int encr_algo; enum gcry_cipher_modes encr_mode; gcry_cipher_hd_t encr_hd = NULL; unsigned char *result = NULL; @@ -550,7 +550,7 @@ pwri_decrypt (ctrl_t ctrl, gcry_sexp_t enc_val, const unsigned char *salt; /* Points int dparm. */ unsigned int saltlen; unsigned long iterations; - enum gcry_md_algos digest_algo; + int digest_algo; char *passphrase = NULL; |