diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-06-01 22:19:21 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-06-01 22:19:21 +0000 |
| commit | 26a3a48d65c7464b400ec1de439994d7f0d25fed (patch) | |
| tree | 91abb7d351b174e58f60e5353b731b916eaf0c5c /ssl/s3_enc.c | |
| parent | de42b6a7a82be33d2976ab605e74d7bc95b71447 (diff) | |
| download | openssl-new-26a3a48d65c7464b400ec1de439994d7f0d25fed.tar.gz | |
There have been a number of complaints from a number of sources that names
like Malloc, Realloc and especially Free conflict with already existing names
on some operating systems or other packages. That is reason enough to change
the names of the OpenSSL memory allocation macros to something that has a
better chance of being unique, like prepending them with OPENSSL_.
This change includes all the name changes needed throughout all C files.
Diffstat (limited to 'ssl/s3_enc.c')
| -rw-r--r-- | ssl/s3_enc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index df4acab3d0..012a4b8740 100644 --- 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 *) - Malloc(sizeof(EVP_CIPHER_CTX))) == NULL)) + OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL)) 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 *) - Malloc(SSL3_RT_MAX_PLAIN_LENGTH); + OPENSSL_malloc(SSL3_RT_MAX_PLAIN_LENGTH); 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 *) - Malloc(sizeof(EVP_CIPHER_CTX))) == NULL)) + OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL)) 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); - if ((p=Malloc(num)) == NULL) + if ((p=OPENSSL_malloc(num)) == NULL) 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); - Free(s->s3->tmp.key_block); + OPENSSL_free(s->s3->tmp.key_block); s->s3->tmp.key_block=NULL; } s->s3->tmp.key_block_length=0; |