generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use OPENSSL_assert() and not assert()

Browse Source
This commit is contained in:
Dr. Stephen Henson
2009-11-08 17:07:42 +00:00
parent c2b78c31d6
commit 16e7efe3c8
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ssl/s3_both.c
View File

@@ -116,7 +116,6 @@
#include <limits.h> #include <limits.h>
#include <string.h> #include <string.h>
#include <assert.h>
#include <stdio.h> #include <stdio.h>
#include "ssl_locl.h" #include "ssl_locl.h"
#include <openssl/buffer.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 */ renegotiation checks */
if(s->type == SSL_ST_CONNECT) 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, memcpy(s->s3->previous_client_finished,
s->s3->tmp.finish_md, i); s->s3->tmp.finish_md, i);
s->s3->previous_client_finished_len=i; s->s3->previous_client_finished_len=i;
} }
else else
{ {
assert(i <= EVP_MAX_MD_SIZE); OPENSSL_assert(i <= EVP_MAX_MD_SIZE);
memcpy(s->s3->previous_server_finished, memcpy(s->s3->previous_server_finished,
s->s3->tmp.finish_md, i); s->s3->tmp.finish_md, i);
s->s3->previous_server_finished_len=i; s->s3->previous_server_finished_len=i;
@@ -254,14 +253,14 @@ int ssl3_get_finished(SSL *s, int a, int b)
renegotiation checks */ renegotiation checks */
if(s->type == SSL_ST_ACCEPT) 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, memcpy(s->s3->previous_client_finished,
s->s3->tmp.peer_finish_md, i); s->s3->tmp.peer_finish_md, i);
s->s3->previous_client_finished_len=i; s->s3->previous_client_finished_len=i;
} }
else else
{ {
assert(i <= EVP_MAX_MD_SIZE); OPENSSL_assert(i <= EVP_MAX_MD_SIZE);
memcpy(s->s3->previous_server_finished, memcpy(s->s3->previous_server_finished,
s->s3->tmp.peer_finish_md, i); s->s3->tmp.peer_finish_md, i);
s->s3->previous_server_finished_len=i; s->s3->previous_server_finished_len=i;

5
ssl/t1_reneg.c
View File

@@ -109,7 +109,6 @@
* *
*/ */
#include <stdio.h> #include <stdio.h>
#include <assert.h>
#include <openssl/objects.h> #include <openssl/objects.h>
#include "ssl_locl.h" #include "ssl_locl.h"
@@ -225,8 +224,8 @@ int ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len,
int ilen; int ilen;
/* Check for logic errors */ /* Check for logic errors */
assert(!expected_len || s->s3->previous_client_finished_len); OPENSSL_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_server_finished_len);
/* Parse the length byte */ /* Parse the length byte */
if(len < 1) if(len < 1)