aboutsummaryrefslogtreecommitdiffstats
path: root/libarchive/archive_cryptor_private.h
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2020-12-01 10:36:46 +0000
committerMartin Matuska <mm@FreeBSD.org>2020-12-01 10:36:46 +0000
commitd5f2a5ff11474589cccacfc8e153d437f48530e2 (patch)
treeaeb7e201bfb2d629755c396db8001e39d116e852 /libarchive/archive_cryptor_private.h
parent4dd2ae60c22045bc4e4f53a0cf45028322168ec0 (diff)
downloadsrc-d5f2a5ff11474589cccacfc8e153d437f48530e2.tar.gz
src-d5f2a5ff11474589cccacfc8e153d437f48530e2.zip
Update vendor/libarchive/dist to git 833821f55b1807cac22a63a58b759a7802df2fb7vendor/libarchive/3.5.0
Libarchive 3.5.0 Relevant vendor changes: Issue #1258: add archive_read_support_filter_by_code() PR #1347: mtree digest reader support Issue #1381: skip hardlinks pointing to itself on extraction PR #1387: fix writing of cpio archives with hardlinks without file type PR #1388: fix rdev field in cpio format for device nodes PR #1389: completed support for UTF-8 encoding conversion PR #1405: more formats in archive_read_support_format_by_code() PR #1408: fix uninitialized size in rar5_read_data PR #1409: system extended attribute support PR #1435: support for decompression of symbolic links in zipx archives Issue #1456: memory leak after unsuccessful archive_write_open_filename
Notes
Notes: svn path=/vendor/libarchive/dist/; revision=368207 svn path=/vendor/libarchive/3.5.0/; revision=368208; tag=vendor/libarchive/3.5.0
Diffstat (limited to 'libarchive/archive_cryptor_private.h')
-rw-r--r--libarchive/archive_cryptor_private.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/libarchive/archive_cryptor_private.h b/libarchive/archive_cryptor_private.h
index 64a20556a399..16b6d16ff23c 100644
--- a/libarchive/archive_cryptor_private.h
+++ b/libarchive/archive_cryptor_private.h
@@ -104,9 +104,18 @@ typedef struct {
#include <nettle/pbkdf2.h>
#endif
#include <nettle/aes.h>
+#include <nettle/version.h>
typedef struct {
+#if NETTLE_VERSION_MAJOR < 3
struct aes_ctx ctx;
+#else
+ union {
+ struct aes128_ctx c128;
+ struct aes192_ctx c192;
+ struct aes256_ctx c256;
+ } ctx;
+#endif
uint8_t key[AES_MAX_KEY_SIZE];
unsigned key_len;
uint8_t nonce[AES_BLOCK_SIZE];