diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-31 19:56:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-31 19:56:23 -0400 |
| commit | fdaa483098d723b4be24a4e861c4280a67a3d4b0 (patch) | |
| tree | 04c618d00c66d3f07f3c0e1ec84346eb6fbe22e8 /src/core | |
| parent | 7e4ac0283ef9c089ebe4da8b85a5f6b5ec84a081 (diff) | |
| parent | 17f922d3719837fade1888dfa7cc99ac801ad800 (diff) | |
| download | tor-fdaa483098d723b4be24a4e861c4280a67a3d4b0.tar.gz tor-fdaa483098d723b4be24a4e861c4280a67a3d4b0.zip | |
Merge branch 'nss_dh_squashed' into nss_dh_squashed_merged
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/crypto/onion_ntor.c | 2 | ||||
| -rw-r--r-- | src/core/crypto/relay_crypto.c | 2 | ||||
| -rw-r--r-- | src/core/mainloop/main.c | 1 | ||||
| -rw-r--r-- | src/core/or/or.h | 3 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/core/crypto/onion_ntor.c b/src/core/crypto/onion_ntor.c index ea7261cb53..3614e0c9b1 100644 --- a/src/core/crypto/onion_ntor.c +++ b/src/core/crypto/onion_ntor.c @@ -22,7 +22,7 @@ #define ONION_NTOR_PRIVATE -#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_cipher.h" #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_hkdf.h" #include "lib/crypt_ops/crypto_util.h" diff --git a/src/core/crypto/relay_crypto.c b/src/core/crypto/relay_crypto.c index b2388d2c45..311160a669 100644 --- a/src/core/crypto/relay_crypto.c +++ b/src/core/crypto/relay_crypto.c @@ -7,7 +7,7 @@ #include "core/or/or.h" #include "core/or/circuitlist.h" #include "app/config/config.h" -#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_cipher.h" #include "lib/crypt_ops/crypto_util.h" #include "core/crypto/hs_ntor.h" // for HS_NTOR_KEY_EXPANSION_KDF_OUT_LEN #include "core/or/relay.h" diff --git a/src/core/mainloop/main.c b/src/core/mainloop/main.c index 048397a2da..ad8c1ead67 100644 --- a/src/core/mainloop/main.c +++ b/src/core/mainloop/main.c @@ -121,6 +121,7 @@ #include "lib/evloop/compat_libevent.h" #include "lib/encoding/confline.h" #include "lib/evloop/timers.h" +#include "lib/crypt_ops/crypto_init.h" #include <event2/event.h> diff --git a/src/core/or/or.h b/src/core/or/or.h index 9aca030c74..13376366ac 100644 --- a/src/core/or/or.h +++ b/src/core/or/or.h @@ -27,7 +27,8 @@ #include "lib/cc/torint.h" #include "lib/container/map.h" #include "lib/container/smartlist.h" -#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_cipher.h" +#include "lib/crypt_ops/crypto_rsa.h" #include "lib/ctime/di_ops.h" #include "lib/defs/dh_sizes.h" #include "lib/encoding/binascii.h" |