diff options
author | Matt Caswell <matt@openssl.org> | 2017-08-02 14:46:31 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2017-08-03 10:48:00 +0100 |
commit | 67dc995eaf538ea309c6292a1a5073465201f55b (patch) | |
tree | bd562ac36e1c5796eca7693ef180b9c9636256cc /ssl | |
parent | 5bd05e579994c756cd994b5e0ff5f395aae6bfff (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')
-rw-r--r-- | ssl/packet.c | 2 | ||||
-rw-r--r-- | ssl/record/rec_layer_d1.c | 1 | ||||
-rw-r--r-- | ssl/record/ssl3_record.c | 1 | ||||
-rw-r--r-- | ssl/record/ssl3_record_tls13.c | 1 | ||||
-rw-r--r-- | ssl/s3_cbc.c | 1 | ||||
-rw-r--r-- | ssl/s3_enc.c | 1 | ||||
-rw-r--r-- | ssl/ssl_ciph.c | 1 | ||||
-rw-r--r-- | ssl/ssl_lib.c | 1 | ||||
-rw-r--r-- | ssl/statem/extensions_clnt.c | 1 | ||||
-rw-r--r-- | ssl/statem/extensions_cust.c | 1 | ||||
-rw-r--r-- | ssl/statem/statem_dtls.c | 1 | ||||
-rw-r--r-- | ssl/statem/statem_lib.c | 1 |
12 files changed, 12 insertions, 1 deletions
diff --git a/ssl/packet.c b/ssl/packet.c index 7c4be4fee5..7a4414ae6a 100644 --- a/ssl/packet.c +++ b/ssl/packet.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/cryptlib.h" #include "packet_locl.h" #define DEFAULT_BUF_SIZE 256 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|. diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c index bab9b26816..7d9c377697 100644 --- a/ssl/s3_cbc.c +++ b/ssl/s3_cbc.c @@ -9,6 +9,7 @@ #include "internal/constant_time_locl.h" #include "ssl_locl.h" +#include "internal/cryptlib.h" #include <openssl/md5.h> #include <openssl/sha.h> diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index e33c07fdcc..bef9f99e7d 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -12,6 +12,7 @@ #include "ssl_locl.h" #include <openssl/evp.h> #include <openssl/md5.h> +#include "internal/cryptlib.h" static int ssl3_generate_key_block(SSL *s, unsigned char *km, int num) { diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 47f715d29e..914d0d8f4a 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -17,6 +17,7 @@ #include <openssl/crypto.h> #include "ssl_locl.h" #include "internal/thread_once.h" +#include "internal/cryptlib.h" #define SSL_ENC_DES_IDX 0 #define SSL_ENC_3DES_IDX 1 diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 491023f835..048669c451 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -20,6 +20,7 @@ #include <openssl/engine.h> #include <openssl/async.h> #include <openssl/ct.h> +#include "internal/cryptlib.h" const char SSL_version_str[] = OPENSSL_VERSION_TEXT; diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c index 1bbb2102d7..35e7173190 100644 --- a/ssl/statem/extensions_clnt.c +++ b/ssl/statem/extensions_clnt.c @@ -9,6 +9,7 @@ #include <openssl/ocsp.h> #include "../ssl_locl.h" +#include "internal/cryptlib.h" #include "statem_locl.h" EXT_RETURN tls_construct_ctos_renegotiate(SSL *s, WPACKET *pkt, diff --git a/ssl/statem/extensions_cust.c b/ssl/statem/extensions_cust.c index cd63d04b00..24b9909047 100644 --- a/ssl/statem/extensions_cust.c +++ b/ssl/statem/extensions_cust.c @@ -11,6 +11,7 @@ #include <openssl/ct.h> #include "../ssl_locl.h" +#include "internal/cryptlib.h" #include "statem_locl.h" typedef struct { diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c index 83bd8d3322..7fb6cdb8e2 100644 --- a/ssl/statem/statem_dtls.c +++ b/ssl/statem/statem_dtls.c @@ -12,6 +12,7 @@ #include <stdio.h> #include "../ssl_locl.h" #include "statem_locl.h" +#include "internal/cryptlib.h" #include <openssl/buffer.h> #include <openssl/objects.h> #include <openssl/evp.h> diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c index 08d5f416f3..c92c8b5ff8 100644 --- a/ssl/statem/statem_lib.c +++ b/ssl/statem/statem_lib.c @@ -13,6 +13,7 @@ #include <stdio.h> #include "../ssl_locl.h" #include "statem_locl.h" +#include "internal/cryptlib.h" #include <openssl/buffer.h> #include <openssl/objects.h> #include <openssl/evp.h> |