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/aes | |
| 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/aes')
| -rw-r--r-- | src/lib/libcrypto/aes/aes_wrap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/aes/aes_wrap.c b/src/lib/libcrypto/aes/aes_wrap.c index 198b0be333..668978425a 100644 --- a/src/lib/libcrypto/aes/aes_wrap.c +++ b/src/lib/libcrypto/aes/aes_wrap.c | |||
| @@ -141,8 +141,8 @@ AES_wrap_unwrap_test(const unsigned char *kek, int keybits, | |||
| 141 | unsigned char *otmp = NULL, *ptmp = NULL; | 141 | unsigned char *otmp = NULL, *ptmp = NULL; |
| 142 | int r, ret = 0; | 142 | int r, ret = 0; |
| 143 | AES_KEY wctx; | 143 | AES_KEY wctx; |
| 144 | otmp = OPENSSL_malloc(keylen + 8); | 144 | otmp = malloc(keylen + 8); |
| 145 | ptmp = OPENSSL_malloc(keylen); | 145 | ptmp = malloc(keylen); |
| 146 | if (!otmp || !ptmp) | 146 | if (!otmp || !ptmp) |
| 147 | return 0; | 147 | return 0; |
| 148 | if (AES_set_encrypt_key(kek, keybits, &wctx)) | 148 | if (AES_set_encrypt_key(kek, keybits, &wctx)) |
| @@ -165,9 +165,9 @@ AES_wrap_unwrap_test(const unsigned char *kek, int keybits, | |||
| 165 | 165 | ||
| 166 | err: | 166 | err: |
| 167 | if (otmp) | 167 | if (otmp) |
| 168 | OPENSSL_free(otmp); | 168 | free(otmp); |
| 169 | if (ptmp) | 169 | if (ptmp) |
| 170 | OPENSSL_free(ptmp); | 170 | free(ptmp); |
| 171 | 171 | ||
| 172 | return ret; | 172 | return ret; |
| 173 | } | 173 | } |
