From 16e7efe3c895b146aacac4baced1ef55d6558f61 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 8 Nov 2009 17:07:42 +0000 Subject: [PATCH] use OPENSSL_assert() and not assert() --- ssl/s3_both.c | 9 ++++----- ssl/t1_reneg.c | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ssl/s3_both.c b/ssl/s3_both.c index bc3ef5a72a..7f462250c7 100644 --- a/ssl/s3_both.c +++ b/ssl/s3_both.c @@ -116,7 +116,6 @@ #include #include -#include #include #include "ssl_locl.h" #include @@ -173,14 +172,14 @@ int ssl3_send_finished(SSL *s, int a, int b, const char *sender, int slen) renegotiation checks */ if(s->type == SSL_ST_CONNECT) { - assert(i <= EVP_MAX_MD_SIZE); + OPENSSL_assert(i <= EVP_MAX_MD_SIZE); memcpy(s->s3->previous_client_finished, s->s3->tmp.finish_md, i); s->s3->previous_client_finished_len=i; } else { - assert(i <= EVP_MAX_MD_SIZE); + OPENSSL_assert(i <= EVP_MAX_MD_SIZE); memcpy(s->s3->previous_server_finished, s->s3->tmp.finish_md, i); s->s3->previous_server_finished_len=i; @@ -254,14 +253,14 @@ int ssl3_get_finished(SSL *s, int a, int b) renegotiation checks */ if(s->type == SSL_ST_ACCEPT) { - assert(i <= EVP_MAX_MD_SIZE); + OPENSSL_assert(i <= EVP_MAX_MD_SIZE); memcpy(s->s3->previous_client_finished, s->s3->tmp.peer_finish_md, i); s->s3->previous_client_finished_len=i; } else { - assert(i <= EVP_MAX_MD_SIZE); + OPENSSL_assert(i <= EVP_MAX_MD_SIZE); memcpy(s->s3->previous_server_finished, s->s3->tmp.peer_finish_md, i); s->s3->previous_server_finished_len=i; diff --git a/ssl/t1_reneg.c b/ssl/t1_reneg.c index e982dd5567..b8ba80219a 100644 --- a/ssl/t1_reneg.c +++ b/ssl/t1_reneg.c @@ -109,7 +109,6 @@ * */ #include -#include #include #include "ssl_locl.h" @@ -225,8 +224,8 @@ int ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len, int ilen; /* Check for logic errors */ - assert(!expected_len || s->s3->previous_client_finished_len); - assert(!expected_len || s->s3->previous_server_finished_len); + OPENSSL_assert(!expected_len || s->s3->previous_client_finished_len); + OPENSSL_assert(!expected_len || s->s3->previous_server_finished_len); /* Parse the length byte */ if(len < 1) -- 2.25.1