From: Martin Matuska <martin@matuska.org>
Date: Sun, 19 Aug 2018 00:50:01 +0000 (+0200)
Subject: Mac OS X: Handle changed behavior of CCCryptorReset()
X-Git-Tag: v3.3.3~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ea6be2423b54afcbfc51d2549f208a2759f59cb;p=thirdparty%2Flibarchive.git

Mac OS X: Handle changed behavior of CCCryptorReset()

Fixes #951
Fixes #1049
---

diff --git a/libarchive/archive_cryptor.c b/libarchive/archive_cryptor.c
index ced52fd70..71967c9d4 100644
--- a/libarchive/archive_cryptor.c
+++ b/libarchive/archive_cryptor.c
@@ -153,7 +153,7 @@ aes_ctr_encrypt_counter(archive_crypto_ctx *ctx)
 	CCCryptorStatus r;
 
 	r = CCCryptorReset(ref, NULL);
-	if (r != kCCSuccess)
+	if (r != kCCSuccess && r != kCCUnimplemented)
 		return -1;
 	r = CCCryptorUpdate(ref, ctx->nonce, AES_BLOCK_SIZE, ctx->encr_buf,
 	    AES_BLOCK_SIZE, NULL);