aboutsummaryrefslogtreecommitdiff
path: root/src/common/tortls.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/common/tortls.c')
-rw-r--r--src/common/tortls.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c
index e8984603d..f232bf19d 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -17,6 +17,16 @@ const char tortls_c_id[] =
*/
#include "orconfig.h"
+
+#include <assert.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/tls1.h>
+#include <openssl/asn1.h>
+#include <openssl/bio.h>
+
+#define CRYPTO_PRIVATE
+
#include "./crypto.h"
#include "./tortls.h"
#include "./util.h"
@@ -27,13 +37,6 @@ const char tortls_c_id[] =
#define LEGAL_NICKNAME_CHARACTERS \
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-#include <assert.h>
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/tls1.h>
-#include <openssl/asn1.h>
-#include <openssl/bio.h>
-
/** How long do identity certificates live? (sec) */
#define IDENTITY_CERT_LIFETIME (365*24*60*60)
@@ -76,11 +79,6 @@ static int tls_library_is_initialized = 0;
#define _TOR_TLS_SYSCALL (_MIN_TOR_TLS_ERROR_VAL - 2)
#define _TOR_TLS_ZERORETURN (_MIN_TOR_TLS_ERROR_VAL - 1)
-/* These functions are declared in crypto.c but not exported. */
-EVP_PKEY *_crypto_pk_env_get_evp_pkey(crypto_pk_env_t *env, int private);
-crypto_pk_env_t *_crypto_new_pk_env_rsa(RSA *rsa);
-DH *_crypto_dh_env_get_dh(crypto_dh_env_t *dh);
-
/** Log all pending tls errors at level <b>severity</b>. Use
* <b>doing</b> to describe our current activities.
*/