summaryrefslogtreecommitdiffstats
path: root/ssl/record
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-08-02 14:46:31 +0100
committerMatt Caswell <matt@openssl.org>2017-08-03 10:48:00 +0100
commit67dc995eaf538ea309c6292a1a5073465201f55b (patch)
treebd562ac36e1c5796eca7693ef180b9c9636256cc /ssl/record
parent5bd05e579994c756cd994b5e0ff5f395aae6bfff (diff)
Move ossl_assert
Move the definition of ossl_assert() out of e_os.h which is intended for OS specific things. Instead it is moved into internal/cryptlib.h. This also changes the definition to remove the (int) cast. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4073)
Diffstat (limited to 'ssl/record')
-rw-r--r--ssl/record/rec_layer_d1.c1
-rw-r--r--ssl/record/ssl3_record.c1
-rw-r--r--ssl/record/ssl3_record_tls13.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
index 83f40943f3..75e3aebdf2 100644
--- a/ssl/record/rec_layer_d1.c
+++ b/ssl/record/rec_layer_d1.c
@@ -15,6 +15,7 @@
#include <openssl/buffer.h>
#include "record_locl.h"
#include "../packet_locl.h"
+#include "internal/cryptlib.h"
int DTLS_RECORD_LAYER_new(RECORD_LAYER *rl)
{
diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c
index bd27290aa8..afb03fde5b 100644
--- a/ssl/record/ssl3_record.c
+++ b/ssl/record/ssl3_record.c
@@ -11,6 +11,7 @@
#include "internal/constant_time_locl.h"
#include <openssl/rand.h>
#include "record_locl.h"
+#include "internal/cryptlib.h"
static const unsigned char ssl3_pad_1[48] = {
0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
diff --git a/ssl/record/ssl3_record_tls13.c b/ssl/record/ssl3_record_tls13.c
index 61e209254e..ec8f9f9e8f 100644
--- a/ssl/record/ssl3_record_tls13.c
+++ b/ssl/record/ssl3_record_tls13.c
@@ -9,6 +9,7 @@
#include "../ssl_locl.h"
#include "record_locl.h"
+#include "internal/cryptlib.h"
/*-
* tls13_enc encrypts/decrypts |n_recs| in |recs|.