diff options
| author | Martin Matuška <martin@matuska.org> | 2022-05-29 09:35:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-29 09:35:22 +0200 |
| commit | 60d790ff7f1455c9bd8cab1cf167014f6275a786 (patch) | |
| tree | 3e49b6e1264057e29e68f7ef1ae19ac25868427e | |
| parent | 987587214a686096bd01999355e04152d0770d20 (diff) | |
| parent | b55a9d14721832ae9f03746836ca24a230c5c2f1 (diff) | |
| download | libarchive-60d790ff7f1455c9bd8cab1cf167014f6275a786.tar.gz | |
Merge pull request #1724 from elieux-contrib/wincrypto-sha256-384-512-fix
archive_digest: Use correct providers with Windows Crypto
| -rw-r--r-- | libarchive/archive_digest.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libarchive/archive_digest.c b/libarchive/archive_digest.c index a7bd5f02..3361b19a 100644 --- a/libarchive/archive_digest.c +++ b/libarchive/archive_digest.c @@ -49,16 +49,16 @@ * Initialize a Message digest. */ static int -win_crypto_init(Digest_CTX *ctx, ALG_ID algId) +win_crypto_init(Digest_CTX *ctx, DWORD prov, ALG_ID algId) { ctx->valid = 0; if (!CryptAcquireContext(&ctx->cryptProv, NULL, NULL, - PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) { + prov, CRYPT_VERIFYCONTEXT)) { if (GetLastError() != (DWORD)NTE_BAD_KEYSET) return (ARCHIVE_FAILED); if (!CryptAcquireContext(&ctx->cryptProv, NULL, NULL, - PROV_RSA_FULL, CRYPT_NEWKEYSET)) + prov, CRYPT_NEWKEYSET)) return (ARCHIVE_FAILED); } @@ -276,7 +276,7 @@ __archive_md5final(archive_md5_ctx *ctx, void *md) static int __archive_md5init(archive_md5_ctx *ctx) { - return (win_crypto_init(ctx, CALG_MD5)); + return (win_crypto_init(ctx, PROV_RSA_FULL, CALG_MD5)); } static int @@ -659,7 +659,7 @@ __archive_sha1final(archive_sha1_ctx *ctx, void *md) static int __archive_sha1init(archive_sha1_ctx *ctx) { - return (win_crypto_init(ctx, CALG_SHA1)); + return (win_crypto_init(ctx, PROV_RSA_FULL, CALG_SHA1)); } static int @@ -919,7 +919,7 @@ __archive_sha256final(archive_sha256_ctx *ctx, void *md) static int __archive_sha256init(archive_sha256_ctx *ctx) { - return (win_crypto_init(ctx, CALG_SHA_256)); + return (win_crypto_init(ctx, PROV_RSA_AES, CALG_SHA_256)); } static int @@ -1155,7 +1155,7 @@ __archive_sha384final(archive_sha384_ctx *ctx, void *md) static int __archive_sha384init(archive_sha384_ctx *ctx) { - return (win_crypto_init(ctx, CALG_SHA_384)); + return (win_crypto_init(ctx, PROV_RSA_AES, CALG_SHA_384)); } static int @@ -1415,7 +1415,7 @@ __archive_sha512final(archive_sha512_ctx *ctx, void *md) static int __archive_sha512init(archive_sha512_ctx *ctx) { - return (win_crypto_init(ctx, CALG_SHA_512)); + return (win_crypto_init(ctx, PROV_RSA_AES, CALG_SHA_512)); } static int |