projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make update
[openssl.git]
/
ssl
/
s3_enc.c
diff --git
a/ssl/s3_enc.c
b/ssl/s3_enc.c
index f340fc5d5f55de6955d87aca93c026c5f333f1b1..012a4b8740772e56241f03013cb97cc0e5a18503 100644
(file)
--- a/
ssl/s3_enc.c
+++ b/
ssl/s3_enc.c
@@
-150,7
+150,7
@@
int ssl3_change_cipher_state(SSL *s, int which)
{
if ((s->enc_read_ctx == NULL) &&
((s->enc_read_ctx=(EVP_CIPHER_CTX *)
{
if ((s->enc_read_ctx == NULL) &&
((s->enc_read_ctx=(EVP_CIPHER_CTX *)
-
M
alloc(sizeof(EVP_CIPHER_CTX))) == NULL))
+
OPENSSL_m
alloc(sizeof(EVP_CIPHER_CTX))) == NULL))
goto err;
dd= s->enc_read_ctx;
s->read_hash=m;
goto err;
dd= s->enc_read_ctx;
s->read_hash=m;
@@
-170,7
+170,7
@@
int ssl3_change_cipher_state(SSL *s, int which)
}
if (s->s3->rrec.comp == NULL)
s->s3->rrec.comp=(unsigned char *)
}
if (s->s3->rrec.comp == NULL)
s->s3->rrec.comp=(unsigned char *)
-
M
alloc(SSL3_RT_MAX_PLAIN_LENGTH);
+
OPENSSL_m
alloc(SSL3_RT_MAX_PLAIN_LENGTH);
if (s->s3->rrec.comp == NULL)
goto err;
}
if (s->s3->rrec.comp == NULL)
goto err;
}
@@
-181,7
+181,7
@@
int ssl3_change_cipher_state(SSL *s, int which)
{
if ((s->enc_write_ctx == NULL) &&
((s->enc_write_ctx=(EVP_CIPHER_CTX *)
{
if ((s->enc_write_ctx == NULL) &&
((s->enc_write_ctx=(EVP_CIPHER_CTX *)
-
M
alloc(sizeof(EVP_CIPHER_CTX))) == NULL))
+
OPENSSL_m
alloc(sizeof(EVP_CIPHER_CTX))) == NULL))
goto err;
dd= s->enc_write_ctx;
s->write_hash=m;
goto err;
dd= s->enc_write_ctx;
s->write_hash=m;
@@
-300,7
+300,7
@@
int ssl3_setup_key_block(SSL *s)
ssl3_cleanup_key_block(s);
ssl3_cleanup_key_block(s);
- if ((p=
M
alloc(num)) == NULL)
+ if ((p=
OPENSSL_m
alloc(num)) == NULL)
goto err;
s->s3->tmp.key_block_length=num;
goto err;
s->s3->tmp.key_block_length=num;
@@
-320,7
+320,7
@@
void ssl3_cleanup_key_block(SSL *s)
{
memset(s->s3->tmp.key_block,0,
s->s3->tmp.key_block_length);
{
memset(s->s3->tmp.key_block,0,
s->s3->tmp.key_block_length);
-
F
ree(s->s3->tmp.key_block);
+
OPENSSL_f
ree(s->s3->tmp.key_block);
s->s3->tmp.key_block=NULL;
}
s->s3->tmp.key_block_length=0;
s->s3->tmp.key_block=NULL;
}
s->s3->tmp.key_block_length=0;
@@
-443,7
+443,7
@@
static int ssl3_handshake_mac(SSL *s, EVP_MD_CTX *in_ctx,
EVP_DigestUpdate(&ctx,ssl3_pad_1,npad);
EVP_DigestFinal(&ctx,md_buf,&i);
EVP_DigestUpdate(&ctx,ssl3_pad_1,npad);
EVP_DigestFinal(&ctx,md_buf,&i);
- EVP_DigestInit(&ctx,EVP_MD_CTX_
type
(&ctx));
+ EVP_DigestInit(&ctx,EVP_MD_CTX_
md
(&ctx));
EVP_DigestUpdate(&ctx,s->session->master_key,
s->session->master_key_length);
EVP_DigestUpdate(&ctx,ssl3_pad_2,npad);
EVP_DigestUpdate(&ctx,s->session->master_key,
s->session->master_key_length);
EVP_DigestUpdate(&ctx,ssl3_pad_2,npad);