summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp/e_aes.c
diff options
context:
space:
mode:
authorbeck <>2014-05-22 21:56:02 +0000
committerbeck <>2014-05-22 21:56:02 +0000
commitffb0c4aec230128ccb49ed44ab8bbaa5558018a0 (patch)
treead01380ef0f2b2de9b4b3d5c76c4e3dcd7fdccdd /src/lib/libcrypto/evp/e_aes.c
parentc34fac2dfaf2da90889ed845a5139c916868eea2 (diff)
downloadopenbsd-ffb0c4aec230128ccb49ed44ab8bbaa5558018a0.tar.gz
openbsd-ffb0c4aec230128ccb49ed44ab8bbaa5558018a0.tar.bz2
openbsd-ffb0c4aec230128ccb49ed44ab8bbaa5558018a0.zip
Convert OPENSSL_malloc stuff back to intrinsics, a few were missed
as new stuff was brought in. ok miod@
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/evp/e_aes.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c
index 4da61b8f62..2e81495e5f 100644
--- a/src/lib/libcrypto/evp/e_aes.c
+++ b/src/lib/libcrypto/evp/e_aes.c
@@ -1294,7 +1294,7 @@ aead_aes_gcm_init(EVP_AEAD_CTX *ctx, const unsigned char *key, size_t key_len,
1294 return 0; 1294 return 0;
1295 } 1295 }
1296 1296
1297 gcm_ctx = OPENSSL_malloc(sizeof(struct aead_aes_gcm_ctx)); 1297 gcm_ctx = malloc(sizeof(struct aead_aes_gcm_ctx));
1298 if (gcm_ctx == NULL) 1298 if (gcm_ctx == NULL)
1299 return 0; 1299 return 0;
1300 1300
@@ -1321,7 +1321,7 @@ aead_aes_gcm_cleanup(EVP_AEAD_CTX *ctx)
1321{ 1321{
1322 struct aead_aes_gcm_ctx *gcm_ctx = ctx->aead_state; 1322 struct aead_aes_gcm_ctx *gcm_ctx = ctx->aead_state;
1323 1323
1324 OPENSSL_free(gcm_ctx); 1324 free(gcm_ctx);
1325} 1325}
1326 1326
1327static ssize_t 1327static ssize_t