diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2018-09-07 00:11:43 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2018-09-07 00:11:43 +0000 |
| commit | 7ab7abddce4a942f9422174bd2ba61c5ada389e3 (patch) | |
| tree | c56d73e577d99dc533037441e9d1d37b2bdef762 /libarchive | |
| parent | 01ab5f2b03469f9d06f58229fee91d136e45d31f (diff) | |
| download | src-7ab7abddce4a942f9422174bd2ba61c5ada389e3.tar.gz src-7ab7abddce4a942f9422174bd2ba61c5ada389e3.zip | |
Notes
Diffstat (limited to 'libarchive')
| -rw-r--r-- | libarchive/archive.h | 2 | ||||
| -rw-r--r-- | libarchive/archive_cryptor.c | 2 | ||||
| -rw-r--r-- | libarchive/archive_pack_dev.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/libarchive/archive.h b/libarchive/archive.h index 32710201298d..cdbbeddf1d3c 100644 --- a/libarchive/archive.h +++ b/libarchive/archive.h @@ -155,7 +155,7 @@ __LA_DECL int archive_version_number(void); /* * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_VERSION_ONLY_STRING "3.3.3dev" +#define ARCHIVE_VERSION_ONLY_STRING "3.3.3" #define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING __LA_DECL const char * archive_version_string(void); diff --git a/libarchive/archive_cryptor.c b/libarchive/archive_cryptor.c index ced52fd7062a..71967c9d46f0 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); diff --git a/libarchive/archive_pack_dev.c b/libarchive/archive_pack_dev.c index 098881b678cd..53bddd790a30 100644 --- a/libarchive/archive_pack_dev.c +++ b/libarchive/archive_pack_dev.c @@ -57,6 +57,9 @@ __RCSID("$NetBSD$"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif +#ifdef HAVE_SYS_SYSMACROS_H +#include <sys/sysmacros.h> +#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif |