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/statem | |
| 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/statem')
| -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 |
4 files changed, 4 insertions, 0 deletions
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> |