Commit 16e7efe3 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

use OPENSSL_assert() and not assert()

parent c2b78c31

ssl/s3_both.c

+4 −5
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ 


#include <limits.h>

#include <string.h>

#include <assert.h>

#include <stdio.h>

#include "ssl_locl.h"

#include <openssl/buffer.h>
@@ -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;

ssl/t1_reneg.c

+2 −3
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ 
 *

 */

#include <stdio.h>

#include <assert.h>

#include <openssl/objects.h>

#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)