From b8c894454fb1d8f8f7afac793d3fcab1c75d8545 Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@bec.de>
Date: Tue, 4 Sep 2018 15:34:44 +0200
Subject: [PATCH] EVP_CIPHER_CTX_init is deprecated, so avoid it for OpenSSL
 1.1+

---
 libarchive/archive_cryptor.c | 7 +++++++
 1 file changed, 7 insertions(+)

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;
 }
 
-- 
2.47.2