projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapt cipher implementations to opaque EVP_CIPHER_CTX
[oweals/openssl.git]
/
crypto
/
evp
/
bio_enc.c
diff --git
a/crypto/evp/bio_enc.c
b/crypto/evp/bio_enc.c
index 4409a91242b473eefd8b27e49d18c06d79cb7049..2e6ce33e4e5a4c25ed960968a2d78936c7c80f75 100644
(file)
--- a/
crypto/evp/bio_enc.c
+++ b/
crypto/evp/bio_enc.c
@@
-58,7
+58,7
@@
#include <stdio.h>
#include <errno.h>
#include <stdio.h>
#include <errno.h>
-#include "cryptlib.h"
+#include "
internal/
cryptlib.h"
#include <openssl/buffer.h>
#include <openssl/evp.h>
#include <openssl/buffer.h>
#include <openssl/evp.h>
@@
-112,17
+112,13
@@
static int enc_new(BIO *bi)
{
BIO_ENC_CTX *ctx;
{
BIO_ENC_CTX *ctx;
- ctx = OPENSSL_
malloc(sizeof(BIO_ENC_CTX
));
+ ctx = OPENSSL_
zalloc(sizeof(*ctx
));
if (ctx == NULL)
return (0);
if (ctx == NULL)
return (0);
- EVP_CIPHER_CTX_init(&ctx->cipher);
- ctx->buf_len = 0;
- ctx->buf_off = 0;
+ EVP_CIPHER_CTX_init(&ctx->cipher);
ctx->cont = 1;
ctx->cont = 1;
- ctx->finished = 0;
ctx->ok = 1;
ctx->ok = 1;
-
bi->init = 0;
bi->ptr = (char *)ctx;
bi->flags = 0;
bi->init = 0;
bi->ptr = (char *)ctx;
bi->flags = 0;
@@
-137,8
+133,7
@@
static int enc_free(BIO *a)
return (0);
b = (BIO_ENC_CTX *)a->ptr;
EVP_CIPHER_CTX_cleanup(&(b->cipher));
return (0);
b = (BIO_ENC_CTX *)a->ptr;
EVP_CIPHER_CTX_cleanup(&(b->cipher));
- OPENSSL_cleanse(a->ptr, sizeof(BIO_ENC_CTX));
- OPENSSL_free(a->ptr);
+ OPENSSL_clear_free(a->ptr, sizeof(BIO_ENC_CTX));
a->ptr = NULL;
a->init = 0;
a->flags = 0;
a->ptr = NULL;
a->init = 0;
a->flags = 0;