mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2025-11-11 11:08:02 -06:00
Update Libzip to latest 1.9.2 (#1071)
* Libzip 1.9.2 Updated Libzip to latest version 1.9.2 and changed version number in the config.h from 1.7.3 to 1.9.2. Not sure if anything else needs to be tweaked :) * Modified Libzip to work with Visual studio * Update README.md Update libzip copyright. * Added the missing files. I've added the missing files zipconf.h and config.h, I've missed those sorry for that!
This commit is contained in:
81
src/Common/libzip/zip_random_win32.c
Normal file
81
src/Common/libzip/zip_random_win32.c
Normal file
@@ -0,0 +1,81 @@
|
||||
/*
|
||||
zip_random_win32.c -- fill the user's buffer with random stuff (Windows version)
|
||||
Copyright (C) 2016-2021 Dieter Baron and Thomas Klausner
|
||||
|
||||
This file is part of libzip, a library to manipulate ZIP archives.
|
||||
The authors can be contacted at <info@libzip.org>
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
1. Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
2. Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in
|
||||
the documentation and/or other materials provided with the
|
||||
distribution.
|
||||
3. The names of the authors may not be used to endorse or promote
|
||||
products derived from this software without specific prior
|
||||
written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
|
||||
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
|
||||
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
|
||||
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
|
||||
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
|
||||
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "zipint.h"
|
||||
|
||||
#ifdef HAVE_CRYPTO
|
||||
#include "zip_crypto.h"
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
#ifndef HAVE_SECURE_RANDOM
|
||||
|
||||
#include <wincrypt.h>
|
||||
|
||||
ZIP_EXTERN bool
|
||||
zip_secure_random(zip_uint8_t *buffer, zip_uint16_t length) {
|
||||
HCRYPTPROV hprov;
|
||||
if (!CryptAcquireContext(&hprov, NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
|
||||
return false;
|
||||
}
|
||||
if (!CryptGenRandom(hprov, length, buffer)) {
|
||||
return false;
|
||||
}
|
||||
if (!CryptReleaseContext(hprov, 0)) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_RANDOM_UINT32
|
||||
#include <stdlib.h>
|
||||
|
||||
zip_uint32_t
|
||||
zip_random_uint32(void) {
|
||||
static bool seeded = false;
|
||||
|
||||
zip_uint32_t value;
|
||||
|
||||
if (zip_secure_random((zip_uint8_t *)&value, sizeof(value))) {
|
||||
return value;
|
||||
}
|
||||
|
||||
if (!seeded) {
|
||||
srand((unsigned int)time(NULL));
|
||||
}
|
||||
|
||||
return (zip_uint32_t)rand();
|
||||
}
|
||||
#endif
|
||||
Reference in New Issue
Block a user