summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorViktor Dukhovni <openssl-users@dukhovni.org>2016-05-15 13:02:17 -0400
committerViktor Dukhovni <openssl-users@dukhovni.org>2016-05-16 12:16:26 -0400
commit5c4328f04f63bc288d4e069e1453ab18b0309f16 (patch)
treeaf382cc88ad40bd91388a6a1e3aec096554ac9bd /ssl
parentb160f2823fb3bafdf8728ea251aab0d07888b934 (diff)
Fold threads.h into crypto.h making API public
Document thread-safe lock creation Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_cert.c2
-rw-r--r--ssl/ssl_ciph.c2
-rw-r--r--ssl/ssl_init.c1
3 files changed, 2 insertions, 3 deletions
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index dc7debbab2..43589ef271 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -127,7 +127,7 @@
#include <openssl/x509v3.h>
#include <openssl/dh.h>
#include <openssl/bn.h>
-#include "internal/threads.h"
+#include <openssl/crypto.h>
#include "ssl_locl.h"
static int ssl_security_default_callback(const SSL *s, const SSL_CTX *ctx, int op,
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 8b65daa95c..435deb8fae 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -144,7 +144,7 @@
#include <openssl/objects.h>
#include <openssl/comp.h>
#include <openssl/engine.h>
-#include "internal/threads.h"
+#include <openssl/crypto.h>
#include "ssl_locl.h"
#define SSL_ENC_DES_IDX 0
diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c
index 546f5d23a8..9ed06fb4a2 100644
--- a/ssl/ssl_init.c
+++ b/ssl/ssl_init.c
@@ -57,7 +57,6 @@
#include "e_os.h"
-#include "internal/threads.h"
#include "internal/err.h"
#include <openssl/crypto.h>
#include <openssl/evp.h>