diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-15 18:03:49 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-02-15 18:03:49 (GMT) |
| commit | b3644e460fc8556c24c2a520129a16be04d4f2d4 (patch) | |
| tree | af7fe4511c0183e2a70a8272c116f62e9c62052e /Utilities/cmlibarchive/libarchive/archive_cryptor.c | |
| parent | 406503f62087847c7eb34757ca99087bc511cb92 (diff) | |
| parent | 5d50940288e9158ea3283abe0e85e81872a20f5c (diff) | |
| download | CMake-b3644e460fc8556c24c2a520129a16be04d4f2d4.zip CMake-b3644e460fc8556c24c2a520129a16be04d4f2d4.tar.gz CMake-b3644e460fc8556c24c2a520129a16be04d4f2d4.tar.bz2 | |
Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
LibArchive 2022-02-09 (9147def1)
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_cryptor.c')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_cryptor.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor.c b/Utilities/cmlibarchive/libarchive/archive_cryptor.c index d4bca90..112baf1 100644 --- a/Utilities/cmlibarchive/libarchive/archive_cryptor.c +++ b/Utilities/cmlibarchive/libarchive/archive_cryptor.c @@ -401,14 +401,6 @@ aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len) memcpy(ctx->key, key, key_len); memset(ctx->nonce, 0, sizeof(ctx->nonce)); ctx->encr_pos = AES_BLOCK_SIZE; -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - if (!EVP_CIPHER_CTX_reset(ctx->ctx)) { - EVP_CIPHER_CTX_free(ctx->ctx); - ctx->ctx = NULL; - } -#else - EVP_CIPHER_CTX_init(ctx->ctx); -#endif return 0; } |