diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-04-26 00:10:55 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-04-26 00:20:19 +0200 |
| commit | d081d6143e86bd350bd62dc6811629346746ac52 (patch) | |
| tree | 24559cfc688a694d1fb085b000228118eb845f32 /src/Common/libzip/zip_get_encryption_implementation.c | |
| parent | 9270952b3dd956ba2f6b2e444768354bee3ae5e2 (diff) | |
| download | VeraCrypt-d081d6143e86bd350bd62dc6811629346746ac52.tar.gz VeraCrypt-d081d6143e86bd350bd62dc6811629346746ac52.zip | |
Windows: update libzip to version 1.2.0
Diffstat (limited to 'src/Common/libzip/zip_get_encryption_implementation.c')
| -rw-r--r-- | src/Common/libzip/zip_get_encryption_implementation.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/Common/libzip/zip_get_encryption_implementation.c b/src/Common/libzip/zip_get_encryption_implementation.c index e2f833b4..f8af7b02 100644 --- a/src/Common/libzip/zip_get_encryption_implementation.c +++ b/src/Common/libzip/zip_get_encryption_implementation.c @@ -1,6 +1,6 @@ /* zip_get_encryption_implementation.c -- get encryption implementation - Copyright (C) 2009-2014 Dieter Baron and Thomas Klausner + Copyright (C) 2009-2016 Dieter Baron and Thomas Klausner This file is part of libzip, a library to manipulate ZIP archives. The authors can be contacted at <libzip@nih.at> @@ -36,9 +36,21 @@ zip_encryption_implementation -_zip_get_encryption_implementation(zip_uint16_t em) +_zip_get_encryption_implementation(zip_uint16_t em, int operation) { - if (em == ZIP_EM_TRAD_PKWARE) + switch (em) { + case ZIP_EM_TRAD_PKWARE: + if (operation == ZIP_CODEC_ENCODE) { + return NULL; + } return zip_source_pkware; - return NULL; + + case ZIP_EM_AES_128: + case ZIP_EM_AES_192: + case ZIP_EM_AES_256: + return operation == ZIP_CODEC_DECODE ? zip_source_winzip_aes_decode : zip_source_winzip_aes_encode; + + default: + return NULL; + } } |