Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 Sep 2018 22:01:53 +0000 (UTC)
From:      Martin Matuska <mm@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r339005 - in stable/11/contrib/libarchive: . libarchive libarchive/test test_utils
Message-ID:  <201809282201.w8SM1rN0020708@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mm
Date: Fri Sep 28 22:01:53 2018
New Revision: 339005
URL: https://svnweb.freebsd.org/changeset/base/339005

Log:
  MFC r338827:
  Sync libarchive with vendor.
  
  Relevant vendor changes:
    PR #1019: Add allocation check for the zip_entry struct
    Oss-Fuzz #10192: Handle whitespace-only ACL fields correctly

Modified:
  stable/11/contrib/libarchive/README.md
  stable/11/contrib/libarchive/libarchive/archive_acl.c
  stable/11/contrib/libarchive/libarchive/archive_cryptor.c
  stable/11/contrib/libarchive/libarchive/archive_read_support_format_ar.c
  stable/11/contrib/libarchive/libarchive/archive_read_support_format_zip.c
  stable/11/contrib/libarchive/libarchive/test/test_sparse_basic.c
  stable/11/contrib/libarchive/test_utils/test_main.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/libarchive/README.md
==============================================================================
--- stable/11/contrib/libarchive/README.md	Fri Sep 28 19:47:32 2018	(r339004)
+++ stable/11/contrib/libarchive/README.md	Fri Sep 28 22:01:53 2018	(r339005)
@@ -78,7 +78,6 @@ Currently, the library automatically detects and reads
   * POSIX pax interchange format
   * POSIX octet-oriented cpio
   * SVR4 ASCII cpio
-  * POSIX octet-oriented cpio
   * Binary cpio (big-endian or little-endian)
   * ISO9660 CD-ROM images (with optional Rockridge or Joliet extensions)
   * ZIP archives (with uncompressed or "deflate" compressed entries, including support for encrypted Zip archives)

Modified: stable/11/contrib/libarchive/libarchive/archive_acl.c
==============================================================================
--- stable/11/contrib/libarchive/libarchive/archive_acl.c	Fri Sep 28 19:47:32 2018	(r339004)
+++ stable/11/contrib/libarchive/libarchive/archive_acl.c	Fri Sep 28 22:01:53 2018	(r339005)
@@ -2058,6 +2058,12 @@ next_field(const char **p, const char **start,
 	}
 	*sep = **p;
 
+	/* If the field is only whitespace, bail out now. */
+	if (**p == '\0') {
+		*end = *p;
+		return;
+	}
+
 	/* Trim trailing whitespace to locate end of field. */
 	*end = *p - 1;
 	while (**end == ' ' || **end == '\t' || **end == '\n') {

Modified: stable/11/contrib/libarchive/libarchive/archive_cryptor.c
==============================================================================
--- stable/11/contrib/libarchive/libarchive/archive_cryptor.c	Fri Sep 28 19:47:32 2018	(r339004)
+++ stable/11/contrib/libarchive/libarchive/archive_cryptor.c	Fri Sep 28 22:01:53 2018	(r339005)
@@ -316,7 +316,14 @@ aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *k
 	memcpy(ctx->key, key, key_len);
 	memset(ctx->nonce, 0, sizeof(ctx->nonce));
 	ctx->encr_pos = AES_BLOCK_SIZE;
+#if OPENSSL_VERSION_NUMBER  >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+	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;
 }
 

Modified: stable/11/contrib/libarchive/libarchive/archive_read_support_format_ar.c
==============================================================================
--- stable/11/contrib/libarchive/libarchive/archive_read_support_format_ar.c	Fri Sep 28 19:47:32 2018	(r339004)
+++ stable/11/contrib/libarchive/libarchive/archive_read_support_format_ar.c	Fri Sep 28 22:01:53 2018	(r339005)
@@ -459,6 +459,7 @@ ar_parse_common_header(struct ar *ar, struct archive_e
 	uint64_t n;
 
 	/* Copy remaining header */
+	archive_entry_set_filetype(entry, AE_IFREG);
 	archive_entry_set_mtime(entry,
 	    (time_t)ar_atol10(h + AR_date_offset, AR_date_size), 0L);
 	archive_entry_set_uid(entry,

Modified: stable/11/contrib/libarchive/libarchive/archive_read_support_format_zip.c
==============================================================================
--- stable/11/contrib/libarchive/libarchive/archive_read_support_format_zip.c	Fri Sep 28 19:47:32 2018	(r339004)
+++ stable/11/contrib/libarchive/libarchive/archive_read_support_format_zip.c	Fri Sep 28 22:01:53 2018	(r339005)
@@ -2708,6 +2708,11 @@ slurp_central_directory(struct archive_read *a, struct
 			return ARCHIVE_FATAL;
 
 		zip_entry = calloc(1, sizeof(struct zip_entry));
+		if (zip_entry == NULL) {
+			archive_set_error(&a->archive, ENOMEM,
+				"Can't allocate zip entry");
+			return ARCHIVE_FATAL;
+		}
 		zip_entry->next = zip->zip_entries;
 		zip_entry->flags |= LA_FROM_CENTRAL_DIRECTORY;
 		zip->zip_entries = zip_entry;

Modified: stable/11/contrib/libarchive/libarchive/test/test_sparse_basic.c
==============================================================================
--- stable/11/contrib/libarchive/libarchive/test/test_sparse_basic.c	Fri Sep 28 19:47:32 2018	(r339004)
+++ stable/11/contrib/libarchive/libarchive/test/test_sparse_basic.c	Fri Sep 28 22:01:53 2018	(r339005)
@@ -422,6 +422,7 @@ verify_sparse_file(struct archive *a, const char *path
 	assert(sparse->type == END);
 	assertEqualInt(expected_offset, archive_entry_size(ae));
 
+	failure(path);
 	assertEqualInt(holes_seen, expected_holes);
 
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
@@ -457,6 +458,7 @@ verify_sparse_file2(struct archive *a, const char *pat
 	/* Verify the number of holes only, not its offset nor its
 	 * length because those alignments are deeply dependence on
 	 * its filesystem. */ 
+	failure(path);
 	assertEqualInt(blocks, archive_entry_sparse_count(ae));
 	archive_entry_free(ae);
 }

Modified: stable/11/contrib/libarchive/test_utils/test_main.c
==============================================================================
--- stable/11/contrib/libarchive/test_utils/test_main.c	Fri Sep 28 19:47:32 2018	(r339004)
+++ stable/11/contrib/libarchive/test_utils/test_main.c	Fri Sep 28 22:01:53 2018	(r339005)
@@ -2166,7 +2166,7 @@ void assertVersion(const char *prog, const char *base)
 
 	/* Skip arbitrary third-party version numbers. */
 	while (s > 0 && (*q == ' ' || *q == '-' || *q == '/' || *q == '.' ||
-	    isalnum(*q))) {
+	    isalnum((unsigned char)*q))) {
 		++q;
 		--s;
 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809282201.w8SM1rN0020708>