]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Mac OS X: Handle changed behavior of CCCryptorReset()
authorMartin Matuska <martin@matuska.org>
Sun, 19 Aug 2018 00:50:01 +0000 (02:50 +0200)
committerGrzegorz Antoniak <ga@anadoxin.org>
Sat, 8 Sep 2018 05:22:38 +0000 (07:22 +0200)
Fixes #951
Fixes #1049

libarchive/archive_cryptor.c

index ced52fd7062ad1271291081a0a7ff8f2134995b8..71967c9d46f026fc531ddea4f98fe29c2bcc323d 100644 (file)
@@ -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);