From: Joerg Sonnenberger <joerg@bec.de>
Date: Tue, 4 Sep 2018 13:34:44 +0000 (+0200)
Subject: EVP_CIPHER_CTX_init is deprecated, so avoid it for OpenSSL 1.1+
X-Git-Tag: v3.4.0~175^2~6^2^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34c25a6da636834da6b1e198213a5a6cfc1fd42d;p=thirdparty%2Flibarchive.git

EVP_CIPHER_CTX_init is deprecated, so avoid it for OpenSSL 1.1+
---

diff --git a/libarchive/archive_cryptor.c b/libarchive/archive_cryptor.c
index 71967c9d4..302cf712a 100644
--- a/libarchive/archive_cryptor.c
+++ b/libarchive/archive_cryptor.c
@@ -316,7 +316,14 @@ 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_AT_LEAST(1, 1)
+	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;
 }