summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-11 14:08:22 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-11 14:12:36 -0400
commitf45107e7de7ff15c630dedcdd1f9bc524423838f (patch)
treed71efe36e1d81a90b1bdc70b41a635a0d0fc3dd5 /src/core
parent9010797e632065ae073cd69f6b76a2d55c06160d (diff)
downloadtor-f45107e7de7ff15c630dedcdd1f9bc524423838f.tar.gz
tor-f45107e7de7ff15c630dedcdd1f9bc524423838f.zip
Rename crypto.c to crypto_cipher.c (since that's all it still has.)
Diffstat (limited to 'src/core')
-rw-r--r--src/core/crypto/onion_ntor.c2
-rw-r--r--src/core/crypto/relay_crypto.c2
-rw-r--r--src/core/or/or.h3
3 files changed, 4 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/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"