From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 31 Jul 2018 23:56:23 +0000 (-0400)
Subject: Merge branch 'nss_dh_squashed' into nss_dh_squashed_merged
X-Git-Tag: tor-0.3.5.1-alpha~92^2~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdaa483098d723b4be24a4e861c4280a67a3d4b0;p=thirdparty%2Ftor.git

Merge branch 'nss_dh_squashed' into nss_dh_squashed_merged
---

fdaa483098d723b4be24a4e861c4280a67a3d4b0
diff --cc Makefile.am
index 3df35ad3f3,01ed8c935e..adf02122ff
--- a/Makefile.am
+++ b/Makefile.am
@@@ -131,8 -126,15 +131,16 @@@ TOR_INTERNAL_TESTING_LIBS = 
  	$(TOR_UTIL_TESTING_LIBS) \
  	src/trunnel/libor-trunnel-testing.a \
  	src/lib/libtor-trace.a
 +endif
  
+ TOR_LDFLAGS_CRYPTLIB=@TOR_LDFLAGS_openssl@
+ TOR_LIBS_CRYPTLIB=@TOR_OPENSSL_LIBS@
+ TOR_CFLAGS_CRYPTLIB=
+ if USE_NSS
+ TOR_CFLAGS_CRYPTLIB+=@NSS_CFLAGS@
+ TOR_LIBS_CRYPTLIB+=@NSS_LIBS@
+ endif
+ 
  # All libraries used to link tor-cov
  
  include src/include.am
diff --cc src/lib/crypt_ops/include.am
index 017d7956d0,803d448852..8647a91e8c
--- a/src/lib/crypt_ops/include.am
+++ b/src/lib/crypt_ops/include.am
@@@ -14,8 -14,7 +14,9 @@@ src_lib_libtor_crypt_ops_a_SOURCES =			
  	src/lib/crypt_ops/crypto_ed25519.c		\
  	src/lib/crypt_ops/crypto_format.c		\
  	src/lib/crypt_ops/crypto_hkdf.c			\
+ 	src/lib/crypt_ops/crypto_init.c			\
 +	src/lib/crypt_ops/crypto_ope.c          	\
 +	src/lib/crypt_ops/crypto_openssl_mgt.c		\
  	src/lib/crypt_ops/crypto_pwbox.c		\
  	src/lib/crypt_ops/crypto_rand.c			\
  	src/lib/crypt_ops/crypto_rsa.c			\
@@@ -36,10 -53,11 +55,12 @@@ noinst_HEADERS +=					
  	src/lib/crypt_ops/crypto_digest.h		\
  	src/lib/crypt_ops/crypto_ed25519.h		\
  	src/lib/crypt_ops/crypto_format.h		\
- 	src/lib/crypt_ops/crypto.h			\
+ 	src/lib/crypt_ops/crypto_cipher.h		\
  	src/lib/crypt_ops/crypto_hkdf.h			\
+ 	src/lib/crypt_ops/crypto_init.h			\
+ 	src/lib/crypt_ops/crypto_nss_mgt.h		\
  	src/lib/crypt_ops/crypto_openssl_mgt.h		\
 +	src/lib/crypt_ops/crypto_ope.h          	\
  	src/lib/crypt_ops/crypto_pwbox.h		\
  	src/lib/crypt_ops/crypto_rand.h			\
  	src/lib/crypt_ops/crypto_rsa.h			\
diff --cc src/tools/include.am
index d5924dda5f,7c5d3f0bc8..cdd5616fb1
--- a/src/tools/include.am
+++ b/src/tools/include.am
@@@ -26,18 -26,9 +26,18 @@@ src_tools_tor_gencert_LDADD = 
  	$(TOR_CRYPTO_LIBS) \
  	$(TOR_UTIL_LIBS) \
  	$(rust_ldadd) \
- 	@TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
+ 	@TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ $(TOR_LIBS_CRYPTLIB) \
  	@TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@
  
 +src_tools_tor_print_ed_signing_cert_SOURCES = src/tools/tor-print-ed-signing-cert.c
 +src_tools_tor_print_ed_signing_cert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
 +src_tools_tor_print_ed_signing_cert_LDADD = \
 +	src/trunnel/libor-trunnel.a \
 +        $(TOR_CRYPTO_LIBS) \
 +        $(TOR_UTIL_LIBS) \
- 	@TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ \
++	@TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \
 +	@TOR_LIB_WS32@ @TOR_LIB_USERENV@
 +
  if COVERAGE_ENABLED
  src_tools_tor_cov_gencert_SOURCES = src/tools/tor-gencert.c
  src_tools_tor_cov_gencert_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)