diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-03 18:37:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-03 19:02:49 (GMT) |
| commit | 2f1978632b709a9370b3cb1137375c05351d149c (patch) | |
| tree | 85980710818211b8188709643e6714e8839feee9 /Utilities/cmlibarchive/libarchive/archive_entry_private.h | |
| parent | 23e4666cf57c31c719472debba83a43f54d351d8 (diff) | |
| parent | 64713ae3ffddf6fbbfa7ea762c3d756cb245a066 (diff) | |
| download | CMake-2f1978632b709a9370b3cb1137375c05351d149c.zip CMake-2f1978632b709a9370b3cb1137375c05351d149c.tar.gz CMake-2f1978632b709a9370b3cb1137375c05351d149c.tar.bz2 | |
Merge branch 'libarchive-upstream' into update-libarchive
Resolve conflicts in favor of the upstream side where possible.
Resolve a logical conflict in archive_windows.h where the upstream
port to Watcom was done slightly differently from ours.
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_entry_private.h')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_entry_private.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_entry_private.h b/Utilities/cmlibarchive/libarchive/archive_entry_private.h index e3547c3..c69233e 100644 --- a/Utilities/cmlibarchive/libarchive/archive_entry_private.h +++ b/Utilities/cmlibarchive/libarchive/archive_entry_private.h @@ -154,6 +154,11 @@ struct archive_entry { /* Not used within libarchive; useful for some clients. */ struct archive_mstring ae_sourcepath; /* Path this entry is sourced from. */ +#define AE_ENCRYPTION_NONE 0 +#define AE_ENCRYPTION_DATA 1 +#define AE_ENCRYPTION_METADATA 2 + char encryption; + void *mac_metadata; size_t mac_metadata_size; |