| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
* upstream-LibArchive:
LibArchive 2017-02-25 (d6b1bb9f)
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
| |
Resolve conflicts in C code by taking their side. Resolve conflicts in
CMake code by integrating the changes.
|
|
|
|
|
| |
Use each CommonCrypto API only when using an OS X SDK version new enough
to provide it.
|
|
Resolve conflicts by integrating changes from both sides.
|