diff options
| author |   deraadt <deraadt@openbsd.org> | 2014-04-21 16:34:43 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2014-04-21 16:34:43 +0000 |
| commit | 7c5c1828b5ea9a4d3c2f261136ee2d59ee5e9cfe (patch) | |
| tree | 1efb16a0ba246f5bf01f2ad06c49d2a0167abb83 /lib/libssl/src/ssl/s3_enc.c | |
| parent | KNF. (diff) | |
| download | wireguard-openbsd-7c5c1828b5ea9a4d3c2f261136ee2d59ee5e9cfe.tar.xz wireguard-openbsd-7c5c1828b5ea9a4d3c2f261136ee2d59ee5e9cfe.zip | |
more malloc/realloc/calloc cleanups; ok beck kettenis
Diffstat (limited to 'lib/libssl/src/ssl/s3_enc.c')
| -rw-r--r-- | lib/libssl/src/ssl/s3_enc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/libssl/src/ssl/s3_enc.c b/lib/libssl/src/ssl/s3_enc.c index 2b02c5ba06b..5a45cec1c11 100644 --- a/lib/libssl/src/ssl/s3_enc.c +++ b/lib/libssl/src/ssl/s3_enc.c @@ -245,9 +245,10 @@ ssl3_change_cipher_state(SSL *s, int which) reuse_dd = 1; else if ((s->enc_read_ctx = malloc(sizeof(EVP_CIPHER_CTX))) == NULL) goto err; - else + else { /* make sure it's intialized in case we exit later with an error */ - EVP_CIPHER_CTX_init(s->enc_read_ctx); + EVP_CIPHER_CTX_init(s->enc_read_ctx); + } dd = s->enc_read_ctx; ssl_replace_hash(&s->read_hash, m); @@ -264,8 +265,7 @@ ssl3_change_cipher_state(SSL *s, int which) goto err2; } if (s->s3->rrec.comp == NULL) - s->s3->rrec.comp = (unsigned char *) - malloc(SSL3_RT_MAX_PLAIN_LENGTH); + s->s3->rrec.comp = malloc(SSL3_RT_MAX_PLAIN_LENGTH); if (s->s3->rrec.comp == NULL) goto err; } @@ -277,9 +277,10 @@ ssl3_change_cipher_state(SSL *s, int which) reuse_dd = 1; else if ((s->enc_write_ctx = malloc(sizeof(EVP_CIPHER_CTX))) == NULL) goto err; - else + else { /* make sure it's intialized in case we exit later with an error */ - EVP_CIPHER_CTX_init(s->enc_write_ctx); + EVP_CIPHER_CTX_init(s->enc_write_ctx); + } dd = s->enc_write_ctx; ssl_replace_hash(&s->write_hash, m); #ifndef OPENSSL_NO_COMP @@ -577,8 +578,7 @@ ssl3_digest_cached_records(SSL *s) /* Allocate handshake_dgst array */ ssl3_free_digest_list(s); - s->s3->handshake_dgst = malloc(SSL_MAX_DIGEST * sizeof(EVP_MD_CTX *)); - memset(s->s3->handshake_dgst, 0, SSL_MAX_DIGEST *sizeof(EVP_MD_CTX *)); + s->s3->handshake_dgst = calloc(SSL_MAX_DIGEST, sizeof(EVP_MD_CTX *)); hdatalen = BIO_get_mem_data(s->s3->handshake_buffer, &hdata); if (hdatalen <= 0) { SSLerr(SSL_F_SSL3_DIGEST_CACHED_RECORDS, SSL_R_BAD_HANDSHAKE_LENGTH); |