From 2350dbe13eab49108a96229591c8c43cb82c19af Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sat, 2 Aug 2014 15:51:37 -0700 Subject: [PATCH] Remove _sodium_alignedcalloc --- src/libsodium/include/sodium/utils.h | 3 --- src/libsodium/sodium/utils.c | 28 ---------------------------- 2 files changed, 31 deletions(-) diff --git a/src/libsodium/include/sodium/utils.h b/src/libsodium/include/sodium/utils.h index 5b36a488..8e09d3de 100644 --- a/src/libsodium/include/sodium/utils.h +++ b/src/libsodium/include/sodium/utils.h @@ -16,9 +16,6 @@ extern "C" { # define _SODIUM_C99(X) X #endif -unsigned char *_sodium_alignedcalloc(unsigned char ** const unaligned_p, - const size_t len); - SODIUM_EXPORT void sodium_memzero(void * const pnt, const size_t len); diff --git a/src/libsodium/sodium/utils.c b/src/libsodium/sodium/utils.c index 6587eb3b..d751cb86 100644 --- a/src/libsodium/sodium/utils.c +++ b/src/libsodium/sodium/utils.c @@ -66,34 +66,6 @@ sodium_memcmp(const void * const b1_, const void * const b2_, size_t len) return (int) ((1 & ((d - 1) >> 8)) - 1); } -unsigned char * -_sodium_alignedcalloc(unsigned char ** const unaligned_p, const size_t len) -{ - unsigned char *aligned; - unsigned char *unaligned; - size_t i; - - if (SIZE_MAX - (size_t) 256U < len || - (unaligned = (unsigned char *) malloc(len + (size_t) 256U)) == NULL) { - *unaligned_p = NULL; - return NULL; - } - *unaligned_p = unaligned; -#ifdef HAVE_ARC4RANDOM_BUF - (void) i; - arc4random_buf(unaligned, len + (size_t) 256U); -#else - for (i = (size_t) 0U; i < len + (size_t) 256U; ++i) { - unaligned[i] = (unsigned char) rand(); - } -#endif - aligned = unaligned + 64; - aligned += (ptrdiff_t) 63 & (-(ptrdiff_t) aligned); - memset(aligned, 0, len); - - return aligned; -} - char * sodium_bin2hex(char * const hex, const size_t hex_maxlen, const unsigned char * const bin, const size_t bin_len)