summaryrefslogtreecommitdiffstats
path: root/Utilities/cmlibarchive/libarchive/archive_write_private.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-10-21 14:12:35 (GMT)
committerBrad King <brad.king@kitware.com>2015-10-21 14:18:52 (GMT)
commit932848f420a738ee07997198fead5b2c2fbf4787 (patch)
tree40404c3244ba87c5e71e8dd076f4dbcde6d8cfeb /Utilities/cmlibarchive/libarchive/archive_write_private.h
parente4b7d5afde91efafb59749a0a513732a089a6f0a (diff)
parent1a8c7bc2c649781d1163c1966245a45e0fb829ba (diff)
downloadCMake-932848f420a738ee07997198fead5b2c2fbf4787.zip
CMake-932848f420a738ee07997198fead5b2c2fbf4787.tar.gz
CMake-932848f420a738ee07997198fead5b2c2fbf4787.tar.bz2
Merge branch 'libarchive-upstream' into update-libarchive
Resolve conflicts by integrating changes from both sides.
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_write_private.h')
-rw-r--r--Utilities/cmlibarchive/libarchive/archive_write_private.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_private.h b/Utilities/cmlibarchive/libarchive/archive_write_private.h
index e600d54..0c3cc0c 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_write_private.h
@@ -26,8 +26,10 @@
*/
#ifndef __LIBARCHIVE_BUILD
+#ifndef __LIBARCHIVE_TEST
#error This header is only to be used internally to libarchive.
#endif
+#endif
#ifndef ARCHIVE_WRITE_PRIVATE_H_INCLUDED
#define ARCHIVE_WRITE_PRIVATE_H_INCLUDED
@@ -116,6 +118,14 @@ struct archive_write {
const void *buff, size_t);
int (*format_close)(struct archive_write *);
int (*format_free)(struct archive_write *);
+
+
+ /*
+ * Encryption passphrase.
+ */
+ char *passphrase;
+ archive_passphrase_callback *passphrase_callback;
+ void *passphrase_client_data;
};
/*
@@ -142,4 +152,9 @@ int __archive_write_program_close(struct archive_write_filter *,
struct archive_write_program_data *);
int __archive_write_program_write(struct archive_write_filter *,
struct archive_write_program_data *, const void *, size_t);
+
+/*
+ * Get a encryption passphrase.
+ */
+const char * __archive_write_get_passphrase(struct archive_write *a);
#endif