diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2016-12-15 15:35:53 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2016-12-15 15:35:53 +0000 |
| commit | 8e86d3576b5d090c0d44d5fd2c4829fce64e3b34 (patch) | |
| tree | 4d5481886c664d296875d9d996ccd3f5ae8090cb /libarchive/archive_cryptor_private.h | |
| parent | f428c3b114eca361b2c069d987e95553368cd827 (diff) | |
| download | src-8e86d3576b5d090c0d44d5fd2c4829fce64e3b34.tar.gz src-8e86d3576b5d090c0d44d5fd2c4829fce64e3b34.zip | |
Update vendor/libarchive to git to 30528ed7a9f479f1c363ee8cfa1c5eb4c7d9be10
Vendor bugfixes:
PR 826: OpenSSL 1.1 support
PR 830, 831, 833: Spelling fixes
OSS-Fuzz 227, 230, 239: Fix possible memory leak in archive_read_free()
OSS-Fuzz 237: Fix heap buffer overflow when reading invalid ar archives
Notes
Notes:
svn path=/vendor/libarchive/dist/; revision=310115
Diffstat (limited to 'libarchive/archive_cryptor_private.h')
| -rw-r--r-- | libarchive/archive_cryptor_private.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libarchive/archive_cryptor_private.h b/libarchive/archive_cryptor_private.h index 37eaad369dc7..0ca544b57971 100644 --- a/libarchive/archive_cryptor_private.h +++ b/libarchive/archive_cryptor_private.h @@ -99,12 +99,12 @@ typedef struct { } archive_crypto_ctx; #elif defined(HAVE_LIBCRYPTO) -#include <openssl/evp.h> +#include "archive_openssl_evp_private.h" #define AES_BLOCK_SIZE 16 #define AES_MAX_KEY_SIZE 32 typedef struct { - EVP_CIPHER_CTX ctx; + EVP_CIPHER_CTX *ctx; const EVP_CIPHER *type; uint8_t key[AES_MAX_KEY_SIZE]; unsigned key_len; |