diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-06-15 15:44:40 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-06-15 15:44:40 +0000 |
| commit | 747480fce8007121c9bbc3d26b6f08325c386d0b (patch) | |
| tree | cb1d8a8843b76111a3ef8b1f439535100959d4d1 /lib/libssl | |
| parent | bec92d561121d5ecef68ad50ca8d28a369d7b71e (diff) | |
Simplify EVP_CIPHER_CTX_new() - stop pretending that EVP_CIPHER_CTX_init()
does something special... just use calloc() instead.
ok beck@ miod@
Diffstat (limited to 'lib/libssl')
| -rw-r--r-- | lib/libssl/src/crypto/evp/evp_enc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/libssl/src/crypto/evp/evp_enc.c b/lib/libssl/src/crypto/evp/evp_enc.c index d650d285df9..5c3da7c4767 100644 --- a/lib/libssl/src/crypto/evp/evp_enc.c +++ b/lib/libssl/src/crypto/evp/evp_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_enc.c,v 1.19 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: evp_enc.c,v 1.20 2014/06/15 15:44:39 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -74,16 +74,12 @@ void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *ctx) { memset(ctx, 0, sizeof(EVP_CIPHER_CTX)); - /* ctx->cipher=NULL; */ } EVP_CIPHER_CTX * EVP_CIPHER_CTX_new(void) { - EVP_CIPHER_CTX *ctx = malloc(sizeof *ctx); - if (ctx) - EVP_CIPHER_CTX_init(ctx); - return ctx; + return calloc(1, sizeof(EVP_CIPHER_CTX)); } int |