Commit 67dc995e authored by Matt Caswell's avatar Matt Caswell
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4073)
parent 5bd05e57

e_os.h

+0 −17
Original line number Diff line number Diff line
@@ -545,23 +545,6 @@ struct servent *getservbyname(const char *name, const char *proto); 
# define CRYPTO_memcmp memcmp

#endif



#ifdef NDEBUG

# define ossl_assert(x) (int)(x)

#else

__owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr,

                                              const char *file, int line)

{

    if (!expr)

        OPENSSL_die(exprstr, file, line);



    return expr;

}



# define ossl_assert(x) ossl_assert_int((int)(x), "Assertion failed: "#x, \

                                         __FILE__, __LINE__)



#endif



#ifdef  __cplusplus

}

#endif

crypto/include/internal/cryptlib.h→include/internal/cryptlib.h

+17 −0
Original line number Diff line number Diff line
@@ -30,6 +30,23 @@ 
extern "C" {

#endif



#ifdef NDEBUG

# define ossl_assert(x) ((x) != 0)

#else

__owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr,

                                              const char *file, int line)

{

    if (!expr)

        OPENSSL_die(exprstr, file, line);



    return expr;

}



# define ossl_assert(x) ossl_assert_int((x) != 0, "Assertion failed: "#x, \

                                         __FILE__, __LINE__)



#endif



typedef struct ex_callback_st EX_CALLBACK;



DEFINE_STACK_OF(EX_CALLBACK)

ssl/packet.c

+1 −1
Original line number Diff line number Diff line
@@ -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

ssl/record/rec_layer_d1.c

+1 −0
Original line number Diff line number Diff line
@@ -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)

{

ssl/record/ssl3_record.c

+1 −0
Original line number Diff line number Diff line
@@ -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,