diff options
| author | NIIBE Yutaka <[email protected]> | 2021-08-05 02:16:56 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2021-08-05 02:16:56 +0000 |
| commit | 100c954ab0d6df509df582cb22ef515171462654 (patch) | |
| tree | b204ad0e5bd1f1e459da758cc2c296901c85abc8 /sm/decrypt.c | |
| parent | build: Remove duplication of AC_HEADER_TIME. (diff) | |
| download | gnupg-100c954ab0d6df509df582cb22ef515171462654.tar.gz gnupg-100c954ab0d6df509df582cb22ef515171462654.zip | |
sm: Fix pwri.
* sm/decrypt.c (pwri_parse_pbkdf2): Use int for digest algo.
(pwri_decrypt): Use int for cipher algo and digest algo.
--
Fixes-commit: 02029f9eab87e9fd667829dfb083846275576398
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'sm/decrypt.c')
| -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 6b3dd6661..1fe2522b5 100644 --- a/sm/decrypt.c +++ b/sm/decrypt.c @@ -428,7 +428,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; @@ -540,7 +540,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; @@ -549,7 +549,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; |