[tor-commits] [tor/master] Merge branch 'nss_dh_squashed' into nss_dh_squashed_merged
nickm at torproject.org
nickm at torproject.org
Wed Sep 5 00:47:13 UTC 2018
commit fdaa483098d723b4be24a4e861c4280a67a3d4b0
Merge: 7e4ac0283 17f922d37
Author: Nick Mathewson <nickm at torproject.org>
Date: Tue Jul 31 19:56:23 2018 -0400
Merge branch 'nss_dh_squashed' into nss_dh_squashed_merged
Makefile.am | 8 +
changes/feature26815 | 3 +
changes/feature26816 | 11 +
config.rust.in | 2 +
configure.ac | 22 +
src/app/include.am | 8 +-
src/core/crypto/onion_ntor.c | 2 +-
src/core/crypto/relay_crypto.c | 2 +-
src/core/mainloop/main.c | 1 +
src/core/or/or.h | 3 +-
src/ext/tinytest.c | 8 +
src/feature/nodelist/parsecommon.c | 2 +-
src/feature/relay/router.c | 1 +
src/feature/rend/rendmid.c | 2 +-
src/lib/crypt_ops/aes_nss.c | 106 +++++
src/lib/crypt_ops/{aes.c => aes_openssl.c} | 4 +-
src/lib/crypt_ops/crypto.c | 509 ------------------------
src/lib/crypt_ops/crypto_cipher.c | 190 +++++++++
src/lib/crypt_ops/{crypto.h => crypto_cipher.h} | 25 +-
src/lib/crypt_ops/crypto_dh.c | 484 ++--------------------
src/lib/crypt_ops/crypto_dh.h | 23 +-
src/lib/crypt_ops/crypto_dh_nss.c | 207 ++++++++++
src/lib/crypt_ops/crypto_dh_openssl.c | 471 ++++++++++++++++++++++
src/lib/crypt_ops/crypto_digest.c | 258 +++++++++++-
src/lib/crypt_ops/crypto_digest.h | 3 +
src/lib/crypt_ops/crypto_init.c | 141 +++++++
src/lib/crypt_ops/crypto_init.h | 29 ++
src/lib/crypt_ops/crypto_nss_mgt.c | 102 +++++
src/lib/crypt_ops/crypto_nss_mgt.h | 33 ++
src/lib/crypt_ops/crypto_openssl_mgt.c | 228 ++++++++++-
src/lib/crypt_ops/crypto_openssl_mgt.h | 15 +-
src/lib/crypt_ops/crypto_pwbox.c | 2 +-
src/lib/crypt_ops/crypto_rand.c | 110 ++++-
src/lib/crypt_ops/crypto_rsa.c | 48 ++-
src/lib/crypt_ops/crypto_rsa.h | 5 +
src/lib/crypt_ops/crypto_s2k.c | 2 +-
src/lib/crypt_ops/crypto_util.c | 23 --
src/lib/crypt_ops/crypto_util.h | 9 -
src/lib/crypt_ops/include.am | 29 +-
src/lib/include.libdonna.am | 2 +-
src/lib/tls/include.am | 5 +-
src/lib/tls/tortls.c | 8 +-
src/rust/build.rs | 1 +
src/test/bench.c | 6 +-
src/test/fuzz/fuzzing_common.c | 15 +-
src/test/fuzz/include.am | 4 +-
src/test/include.am | 22 +-
src/test/test-timers.c | 5 +
src/test/test_crypto.c | 57 +++
src/test/test_hs_client.c | 2 +-
src/test/test_hs_ntor_cl.c | 7 +-
src/test/test_introduce.c | 2 +-
src/test/test_ntor_cl.c | 8 +-
src/test/test_relaycell.c | 2 +-
src/test/test_routerkeys.c | 2 +-
src/test/test_util_slow.c | 2 +-
src/test/test_workqueue.c | 1 +
src/test/testing_common.c | 9 +-
src/tools/include.am | 10 +-
src/tools/tor-gencert.c | 14 +-
60 files changed, 2208 insertions(+), 1107 deletions(-)
diff --cc Makefile.am
index 3df35ad3f,01ed8c935..adf02122f
--- 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 017d7956d,803d44885..8647a91e8
--- 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 d5924dda5,7c5d3f0bc..cdd5616fb
--- 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)
More information about the tor-commits
mailing list