summaryrefslogtreecommitdiffstats
path: root/Utilities/cmlibarchive/libarchive/archive_hmac.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2017-02-271-0/+4
| | | | | * upstream-LibArchive: LibArchive 2017-02-25 (d6b1bb9f)
* libarchive: Add support for building with OpenSSL 1.1Brad King2016-11-281-6/+8
| | | | | | | | | OpenSSL 1.1 made some CTX structures opaque. Port our code to use the structures only through pointers via OpenSSL 1.1 APIs. Use our adaption layer to make this work with OpenSSL 1.0 and below. Patch-by: Tomas Mraz <tmraz@redhat.com> Patch-from: https://bugzilla.redhat.com/1383744
* Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2016-05-021-1/+15
| | | | | Resolve conflicts in C code by taking their side. Resolve conflicts in CMake code by integrating the changes.
* libarchive: Use CommonCrypto APIs on OS X only when availableBrad King2015-10-221-1/+1
| | | | | Use each CommonCrypto API only when using an OS X SDK version new enough to provide it.
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2015-10-211-0/+234
Resolve conflicts by integrating changes from both sides.