Attachment #233060 for bug #263146

View | Details | Raw Unified | Return to bug 263146
Collapse All | Expand All

Lines 1-3 Link Here

(-)b/contrib/libarchive/NEWS (+2 lines)
		1	Apr 08, 2022: libarchive 3.6.1 released
		2
1	Feb 09, 2022: libarchive 3.6.0 released	3	Feb 09, 2022: libarchive 3.6.0 released
2		4
3	Feb 08, 2022: libarchive 3.5.3 released	5	Feb 08, 2022: libarchive 3.5.3 released

Lines 36-42 Link Here

(-)b/contrib/libarchive/libarchive/archive.h (-2 / +2 lines)
36	* assert that ARCHIVE_VERSION_NUMBER >= 2012108.	36	* assert that ARCHIVE_VERSION_NUMBER >= 2012108.
37	*/	37	*/
38	/* Note: Compiler will complain if this does not match archive_entry.h! */	38	/* Note: Compiler will complain if this does not match archive_entry.h! */
39	#define ARCHIVE_VERSION_NUMBER 3006000	39	#define ARCHIVE_VERSION_NUMBER 3006001
40		40
41	#include <sys/stat.h>	41	#include <sys/stat.h>
42	#include <stddef.h> /* for wchar_t */	42	#include <stddef.h> /* for wchar_t */
Lines 155-161 __LA_DECL int archive_version_number(void); Link Here
155	/*	155	/*
156	* Textual name/version of the library, useful for version displays.	156	* Textual name/version of the library, useful for version displays.
157	*/	157	*/
158	#define ARCHIVE_VERSION_ONLY_STRING "3.6.0"	158	#define ARCHIVE_VERSION_ONLY_STRING "3.6.1"
159	#define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING	159	#define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
160	__LA_DECL const char * archive_version_string(void);	160	__LA_DECL const char * archive_version_string(void);
161		161




{
  if ((*ctx = EVP_MD_CTX_new()) == NULL)
	return (ARCHIVE_FAILED);
  if (!EVP_DigestInit(*ctx, EVP_md5()))
	return (ARCHIVE_FAILED);
  return (ARCHIVE_OK);
}


{
  if ((*ctx = EVP_MD_CTX_new()) == NULL)
	return (ARCHIVE_FAILED);
  if (!EVP_DigestInit(*ctx, EVP_ripemd160()))
	return (ARCHIVE_FAILED);
  return (ARCHIVE_OK);
}


{
  if ((*ctx = EVP_MD_CTX_new()) == NULL)
	return (ARCHIVE_FAILED);
  if (!EVP_DigestInit(*ctx, EVP_sha1()))
	return (ARCHIVE_FAILED);
  return (ARCHIVE_OK);
}


{
  if ((*ctx = EVP_MD_CTX_new()) == NULL)
	return (ARCHIVE_FAILED);
  if (!EVP_DigestInit(*ctx, EVP_sha256()))
	return (ARCHIVE_FAILED);
  return (ARCHIVE_OK);
}


{
  if ((*ctx = EVP_MD_CTX_new()) == NULL)
	return (ARCHIVE_FAILED);
  if (!EVP_DigestInit(*ctx, EVP_sha384()))
	return (ARCHIVE_FAILED);
  return (ARCHIVE_OK);
}


{
  if ((*ctx = EVP_MD_CTX_new()) == NULL)
	return (ARCHIVE_FAILED);
  if (!EVP_DigestInit(*ctx, EVP_sha512()))
	return (ARCHIVE_FAILED);
  return (ARCHIVE_OK);
}


Lines 30-36 Link Here

(-)b/contrib/libarchive/libarchive/archive_entry.h (-1 / +1 lines)
30	#define ARCHIVE_ENTRY_H_INCLUDED	30	#define ARCHIVE_ENTRY_H_INCLUDED
31		31
32	/* Note: Compiler will complain if this does not match archive.h! */	32	/* Note: Compiler will complain if this does not match archive.h! */
33	#define ARCHIVE_VERSION_NUMBER 3006000	33	#define ARCHIVE_VERSION_NUMBER 3006001
34		34
35	/*	35	/*
36	* Note: archive_entry.h is for use outside of libarchive; the	36	* Note: archive_entry.h is for use outside of libarchive; the

Return to bug 263146

Lines 243-249 __archive_md5init(archive_md5_ctx *ctx) Link Here

(-)b/contrib/libarchive/libarchive/archive_digest.c (-6 / +12 lines)
243	{	243	{
244	if ((*ctx = EVP_MD_CTX_new()) == NULL)	244	if ((*ctx = EVP_MD_CTX_new()) == NULL)
245	return (ARCHIVE_FAILED);	245	return (ARCHIVE_FAILED);
246	EVP_DigestInit(*ctx, EVP_md5());	246	if (!EVP_DigestInit(*ctx, EVP_md5()))
		247	return (ARCHIVE_FAILED);
247	return (ARCHIVE_OK);	248	return (ARCHIVE_OK);
248	}	249	}
249		250
Lines 434-440 __archive_ripemd160init(archive_rmd160_ctx *ctx) Link Here
434	{	435	{
435	if ((*ctx = EVP_MD_CTX_new()) == NULL)	436	if ((*ctx = EVP_MD_CTX_new()) == NULL)
436	return (ARCHIVE_FAILED);	437	return (ARCHIVE_FAILED);
437	EVP_DigestInit(*ctx, EVP_ripemd160());	438	if (!EVP_DigestInit(*ctx, EVP_ripemd160()))
		439	return (ARCHIVE_FAILED);
438	return (ARCHIVE_OK);	440	return (ARCHIVE_OK);
439	}	441	}
440		442
Lines 624-630 __archive_sha1init(archive_sha1_ctx *ctx) Link Here
624	{	626	{
625	if ((*ctx = EVP_MD_CTX_new()) == NULL)	627	if ((*ctx = EVP_MD_CTX_new()) == NULL)
626	return (ARCHIVE_FAILED);	628	return (ARCHIVE_FAILED);
627	EVP_DigestInit(*ctx, EVP_sha1());	629	if (!EVP_DigestInit(*ctx, EVP_sha1()))
		630	return (ARCHIVE_FAILED);
628	return (ARCHIVE_OK);	631	return (ARCHIVE_OK);
629	}	632	}
630		633
Lines 887-893 __archive_sha256init(archive_sha256_ctx *ctx) Link Here
887	{	890	{
888	if ((*ctx = EVP_MD_CTX_new()) == NULL)	891	if ((*ctx = EVP_MD_CTX_new()) == NULL)
889	return (ARCHIVE_FAILED);	892	return (ARCHIVE_FAILED);
890	EVP_DigestInit(*ctx, EVP_sha256());	893	if (!EVP_DigestInit(*ctx, EVP_sha256()))
		894	return (ARCHIVE_FAILED);
891	return (ARCHIVE_OK);	895	return (ARCHIVE_OK);
892	}	896	}
893		897
Lines 1122-1128 __archive_sha384init(archive_sha384_ctx *ctx) Link Here
1122	{	1126	{
1123	if ((*ctx = EVP_MD_CTX_new()) == NULL)	1127	if ((*ctx = EVP_MD_CTX_new()) == NULL)
1124	return (ARCHIVE_FAILED);	1128	return (ARCHIVE_FAILED);
1125	EVP_DigestInit(*ctx, EVP_sha384());	1129	if (!EVP_DigestInit(*ctx, EVP_sha384()))
		1130	return (ARCHIVE_FAILED);
1126	return (ARCHIVE_OK);	1131	return (ARCHIVE_OK);
1127	}	1132	}
1128		1133
Lines 1381-1387 __archive_sha512init(archive_sha512_ctx *ctx) Link Here
1381	{	1386	{
1382	if ((*ctx = EVP_MD_CTX_new()) == NULL)	1387	if ((*ctx = EVP_MD_CTX_new()) == NULL)
1383	return (ARCHIVE_FAILED);	1388	return (ARCHIVE_FAILED);
1384	EVP_DigestInit(*ctx, EVP_sha512());	1389	if (!EVP_DigestInit(*ctx, EVP_sha512()))
		1390	return (ARCHIVE_FAILED);
1385	return (ARCHIVE_OK);	1391	return (ARCHIVE_OK);
1386	}	1392	}
1387		1393