nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.5' into maint-0.4.6

Browse Source
This commit is contained in:
David Goulet 2021-06-29 10:41:36 -04:00
commit f2647295c0
5 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/crypt_ops/crypto_dh_nss.c
View File

@ -17,9 +17,11 @@
#include "lib/log/util_bug.h"
#include "lib/malloc/malloc.h"
DISABLE_GCC_WARNING("-Wstrict-prototypes")
#include <cryptohi.h>
#include <keyhi.h>
#include <pk11pub.h>
ENABLE_GCC_WARNING("-Wstrict-prototypes")
static int dh_initialized = 0;
static SECKEYDHParams tls_dh_param, circuit_dh_param;

2
src/lib/crypt_ops/crypto_rand.c
View File

@ -50,9 +50,11 @@ ENABLE_GCC_WARNING("-Wredundant-decls")
#endif /* defined(ENABLE_OPENSSL) */
#ifdef ENABLE_NSS
DISABLE_GCC_WARNING("-Wstrict-prototypes")
#include <pk11pub.h>
#include <secerr.h>
#include <prerror.h>
ENABLE_GCC_WARNING("-Wstrict-prototypes")
#endif
#if __GNUC__ && GCC_VERSION >= 402

2
src/lib/crypt_ops/crypto_rsa_nss.c
View File

@ -23,9 +23,11 @@
#include <string.h>
DISABLE_GCC_WARNING("-Wstrict-prototypes")
#include <keyhi.h>
#include <pk11pub.h>
#include <secder.h>
ENABLE_GCC_WARNING("-Wstrict-prototypes")
#ifdef ENABLE_OPENSSL
#include <openssl/rsa.h>

2
src/lib/crypt_ops/crypto_s2k.c
View File

@ -26,7 +26,9 @@
#include <openssl/evp.h>
#endif
#ifdef ENABLE_NSS
DISABLE_GCC_WARNING("-Wstrict-prototypes")
#include <pk11pub.h>
ENABLE_GCC_WARNING("-Wstrict-prototypes")
#endif
#if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_LIBSCRYPT_SCRYPT)

2
src/lib/tls/x509_nss.c
View File

@ -20,11 +20,13 @@
#include "lib/encoding/time_fmt.h"
#include "lib/string/printf.h"
DISABLE_GCC_WARNING("-Wstrict-prototypes")
#include <pk11pub.h>
#include <cryptohi.h>
#include <cert.h>
#include <keyhi.h>
#include <time.h>
ENABLE_GCC_WARNING("-Wstrict-prototypes")
/* Units of PRTime per second.
*