diff options
| author | beck <> | 2014-04-17 13:37:50 +0000 |
|---|---|---|
| committer | beck <> | 2014-04-17 13:37:50 +0000 |
| commit | 6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd (patch) | |
| tree | 7595a93a27385c367802aa17ecf20f96551cf14d /src/lib/libcrypto/cmac | |
| parent | 4d13fb9c7b5ac7311d7031173c21ab0121388413 (diff) | |
| download | openbsd-6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd.tar.gz openbsd-6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd.tar.bz2 openbsd-6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd.zip | |
Change library to use intrinsic memory allocation functions instead of
OPENSSL_foo wrappers. This changes:
OPENSSL_malloc->malloc
OPENSSL_free->free
OPENSSL_relloc->realloc
OPENSSL_freeFunc->free
Diffstat (limited to 'src/lib/libcrypto/cmac')
| -rw-r--r-- | src/lib/libcrypto/cmac/cm_pmeth.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/cmac/cmac.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/cmac/cm_pmeth.c b/src/lib/libcrypto/cmac/cm_pmeth.c index 072228ec7f..00aa4d64d2 100644 --- a/src/lib/libcrypto/cmac/cm_pmeth.c +++ b/src/lib/libcrypto/cmac/cm_pmeth.c | |||
| @@ -182,7 +182,7 @@ static int pkey_cmac_ctrl_str(EVP_PKEY_CTX *ctx, | |||
| 182 | if (!key) | 182 | if (!key) |
| 183 | return 0; | 183 | return 0; |
| 184 | r = pkey_cmac_ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY, keylen, key); | 184 | r = pkey_cmac_ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY, keylen, key); |
| 185 | OPENSSL_free(key); | 185 | free(key); |
| 186 | return r; | 186 | return r; |
| 187 | } | 187 | } |
| 188 | return -2; | 188 | return -2; |
diff --git a/src/lib/libcrypto/cmac/cmac.c b/src/lib/libcrypto/cmac/cmac.c index f92a7bb143..81188c8f5a 100644 --- a/src/lib/libcrypto/cmac/cmac.c +++ b/src/lib/libcrypto/cmac/cmac.c | |||
| @@ -93,7 +93,7 @@ static void make_kn(unsigned char *k1, unsigned char *l, int bl) | |||
| 93 | CMAC_CTX *CMAC_CTX_new(void) | 93 | CMAC_CTX *CMAC_CTX_new(void) |
| 94 | { | 94 | { |
| 95 | CMAC_CTX *ctx; | 95 | CMAC_CTX *ctx; |
| 96 | ctx = OPENSSL_malloc(sizeof(CMAC_CTX)); | 96 | ctx = malloc(sizeof(CMAC_CTX)); |
| 97 | if (!ctx) | 97 | if (!ctx) |
| 98 | return NULL; | 98 | return NULL; |
| 99 | EVP_CIPHER_CTX_init(&ctx->cctx); | 99 | EVP_CIPHER_CTX_init(&ctx->cctx); |
| @@ -119,7 +119,7 @@ EVP_CIPHER_CTX *CMAC_CTX_get0_cipher_ctx(CMAC_CTX *ctx) | |||
| 119 | void CMAC_CTX_free(CMAC_CTX *ctx) | 119 | void CMAC_CTX_free(CMAC_CTX *ctx) |
| 120 | { | 120 | { |
| 121 | CMAC_CTX_cleanup(ctx); | 121 | CMAC_CTX_cleanup(ctx); |
| 122 | OPENSSL_free(ctx); | 122 | free(ctx); |
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | int CMAC_CTX_copy(CMAC_CTX *out, const CMAC_CTX *in) | 125 | int CMAC_CTX_copy(CMAC_CTX *out, const CMAC_CTX *in) |
