Commit f2647295 authored Jun 29, 2021 by David Goulet

Merge branch 'maint-0.4.5' into maint-0.4.6

parents 45c8d69c fce99957

src/lib/crypt_ops/crypto_dh_nss.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,9 +17,11 @@
	#include "lib/log/util_bug.h"		#include "lib/log/util_bug.h"
	#include "lib/malloc/malloc.h"		#include "lib/malloc/malloc.h"

			DISABLE_GCC_WARNING("-Wstrict-prototypes")
	#include <cryptohi.h>		#include <cryptohi.h>
	#include <keyhi.h>		#include <keyhi.h>
	#include <pk11pub.h>		#include <pk11pub.h>
			ENABLE_GCC_WARNING("-Wstrict-prototypes")

	static int dh_initialized = 0;		static int dh_initialized = 0;
	static SECKEYDHParams tls_dh_param, circuit_dh_param;		static SECKEYDHParams tls_dh_param, circuit_dh_param;

src/lib/crypt_ops/crypto_rand.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -50,9 +50,11 @@ ENABLE_GCC_WARNING("-Wredundant-decls")
	#endif /* defined(ENABLE_OPENSSL) */		#endif /* defined(ENABLE_OPENSSL) */

	#ifdef ENABLE_NSS		#ifdef ENABLE_NSS
			DISABLE_GCC_WARNING("-Wstrict-prototypes")
	#include <pk11pub.h>		#include <pk11pub.h>
	#include <secerr.h>		#include <secerr.h>
	#include <prerror.h>		#include <prerror.h>
			ENABLE_GCC_WARNING("-Wstrict-prototypes")
	#endif		#endif

	#if __GNUC__ && GCC_VERSION >= 402		#if __GNUC__ && GCC_VERSION >= 402

src/lib/crypt_ops/crypto_rsa_nss.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,9 +23,11 @@

	#include <string.h>		#include <string.h>

			DISABLE_GCC_WARNING("-Wstrict-prototypes")
	#include <keyhi.h>		#include <keyhi.h>
	#include <pk11pub.h>		#include <pk11pub.h>
	#include <secder.h>		#include <secder.h>
			ENABLE_GCC_WARNING("-Wstrict-prototypes")

	#ifdef ENABLE_OPENSSL		#ifdef ENABLE_OPENSSL
	#include <openssl/rsa.h>		#include <openssl/rsa.h>

src/lib/crypt_ops/crypto_s2k.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,9 @@
	#include <openssl/evp.h>		#include <openssl/evp.h>
	#endif		#endif
	#ifdef ENABLE_NSS		#ifdef ENABLE_NSS
			DISABLE_GCC_WARNING("-Wstrict-prototypes")
	#include <pk11pub.h>		#include <pk11pub.h>
			ENABLE_GCC_WARNING("-Wstrict-prototypes")
	#endif		#endif

	#if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_LIBSCRYPT_SCRYPT)		#if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_LIBSCRYPT_SCRYPT)

src/lib/tls/x509_nss.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,11 +20,13 @@
	#include "lib/encoding/time_fmt.h"		#include "lib/encoding/time_fmt.h"
	#include "lib/string/printf.h"		#include "lib/string/printf.h"

			DISABLE_GCC_WARNING("-Wstrict-prototypes")
	#include <pk11pub.h>		#include <pk11pub.h>
	#include <cryptohi.h>		#include <cryptohi.h>
	#include <cert.h>		#include <cert.h>
	#include <keyhi.h>		#include <keyhi.h>
	#include <time.h>		#include <time.h>
			ENABLE_GCC_WARNING("-Wstrict-prototypes")

	/* Units of PRTime per second.		/* Units of PRTime per second.
	*		*