Commit fce99957 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Suppress strict-prototypes warning on NSS pk11pub.h header 

We already did this in a couple of places, but there are more that
we didn't get.  This is necessary for systems with versions of
NSS that don't do their prototypes properly.

Fixes #40409; bugfix on 0.3.5.1-alpha.
parent 83483bd4

src/lib/crypt_ops/crypto_dh_nss.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

src/lib/crypt_ops/crypto_rand.c

+2 −0
Original line number Diff line number Diff line
@@ -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

src/lib/crypt_ops/crypto_rsa_nss.c

+2 −0
Original line number Diff line number Diff line
@@ -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>

src/lib/crypt_ops/crypto_s2k.c

+2 −0
Original line number Diff line number Diff line
@@ -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)

src/lib/tls/x509_nss.c

+2 −0
Original line number Diff line number Diff line
@@ -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.

 *