Added seeder API. Also overhauled compile-time detection of features.
This commit is contained in:
Thomas Pornin
parent
5b980fb625
commit
af9c79a071
22 changed files with 1183 additions and 399 deletions
349
src/inner.h
349
src/inner.h
|
|
@ -109,97 +109,212 @@
|
|||
* Set BR_LOMUL on platforms where it makes sense.
|
||||
*/
|
||||
#ifndef BR_LOMUL
|
||||
#if BR_ARMEL_CORTEX_GCC
|
||||
#if BR_ARMEL_CORTEXM_GCC
|
||||
#define BR_LOMUL 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Determine whether x86 AES instructions are understood by the compiler.
|
||||
* Architecture detection.
|
||||
*/
|
||||
#ifndef BR_AES_X86NI
|
||||
#if (__i386__ || __x86_64__) \
|
||||
&& ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) \
|
||||
|| (__clang_major__ > 3 \
|
||||
|| (__clang_major__ == 3 && __clang_minor__ >= 7)))
|
||||
#define BR_AES_X86NI 1
|
||||
#elif (_M_IX86 || _M_X64) && (_MSC_VER >= 1700)
|
||||
#define BR_AES_X86NI 1
|
||||
#ifndef BR_i386
|
||||
#if __i386__ || _M_IX86
|
||||
#define BR_i386 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef BR_amd64
|
||||
#if __x86_64__ || _M_X64
|
||||
#define BR_amd64 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* If we use x86 AES instruction, determine the compiler brand.
|
||||
* Compiler brand and version.
|
||||
*
|
||||
* Implementations that use intrinsics need to detect the compiler type
|
||||
* and version because some specific actions may be needed to activate
|
||||
* the corresponding opcodes, both for header inclusion, and when using
|
||||
* them in a function.
|
||||
*
|
||||
* BR_GCC, BR_CLANG and BR_MSC will be set to 1 for, respectively, GCC,
|
||||
* Clang and MS Visual C. For each of them, sub-macros will be defined
|
||||
* for versions; each sub-macro is set whenever the compiler version is
|
||||
* at least as recent as the one corresponding to the macro.
|
||||
*/
|
||||
#if BR_AES_X86NI
|
||||
#ifndef BR_AES_X86NI_GCC
|
||||
#if __GNUC__
|
||||
#define BR_AES_X86NI_GCC 1
|
||||
|
||||
/*
|
||||
* GCC thresholds are on versions 4.4 to 4.9 and 5.0.
|
||||
*/
|
||||
#ifndef BR_GCC
|
||||
#if __GNUC__ && !__clang__
|
||||
#define BR_GCC 1
|
||||
|
||||
#if __GNUC__ > 4
|
||||
#define BR_GCC_5_0 1
|
||||
#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 9
|
||||
#define BR_GCC_4_9 1
|
||||
#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 8
|
||||
#define BR_GCC_4_8 1
|
||||
#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 7
|
||||
#define BR_GCC_4_7 1
|
||||
#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 6
|
||||
#define BR_GCC_4_6 1
|
||||
#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 5
|
||||
#define BR_GCC_4_5 1
|
||||
#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 4
|
||||
#define BR_GCC_4_4 1
|
||||
#endif
|
||||
|
||||
#if BR_GCC_5_0
|
||||
#define BR_GCC_4_9 1
|
||||
#endif
|
||||
#ifndef BR_AES_X86NI_MSC
|
||||
#if _MSC_VER >= 1700
|
||||
#define BR_AES_X86NI_MSC 1
|
||||
#if BR_GCC_4_9
|
||||
#define BR_GCC_4_8 1
|
||||
#endif
|
||||
#if BR_GCC_4_8
|
||||
#define BR_GCC_4_7 1
|
||||
#endif
|
||||
#if BR_GCC_4_7
|
||||
#define BR_GCC_4_6 1
|
||||
#endif
|
||||
#if BR_GCC_4_6
|
||||
#define BR_GCC_4_5 1
|
||||
#endif
|
||||
#if BR_GCC_4_5
|
||||
#define BR_GCC_4_4 1
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Determine whether SSE2 intrinsics are understood by the compiler.
|
||||
* Right now, we restrict ourselves to compiler versions where things
|
||||
* are documented to work well:
|
||||
* -- GCC 4.4+ and Clang 3.7+ understand the function attribute "target"
|
||||
* -- MS Visual Studio 2005 documents the existence of <emmintrin.h>
|
||||
* SSE2-powered code _might_ work with older versions, but there is no
|
||||
* pressing need to do so right now.
|
||||
* Clang thresholds are on versions 3.7.0 and 3.8.0.
|
||||
*/
|
||||
#ifndef BR_SSE2
|
||||
#if (__i386__ || __x86_64__) \
|
||||
&& ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) \
|
||||
|| (__clang_major__ > 3 \
|
||||
|| (__clang_major__ == 3 && __clang_minor__ >= 7)))
|
||||
#define BR_SSE2 1
|
||||
#elif (_M_IX86 || _M_X64) && (_MSC_VER >= 1400)
|
||||
#define BR_SSE2 1
|
||||
#ifndef BR_CLANG
|
||||
#if __clang__
|
||||
#define BR_CLANG 1
|
||||
|
||||
#if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 8)
|
||||
#define BR_CLANG_3_8 1
|
||||
#elif __clang_major__ == 3 && __clang_minor__ >= 7
|
||||
#define BR_CLANG_3_7 1
|
||||
#endif
|
||||
|
||||
#if BR_CLANG_3_8
|
||||
#define BR_CLANG_3_7 1
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* If we use SSE2 intrinsics, determine the compiler brand.
|
||||
* MS Visual C thresholds are on Visual Studio 2005 to 2015.
|
||||
*/
|
||||
#if BR_SSE2
|
||||
#ifndef BR_SSE2_GCC
|
||||
#if __GNUC__
|
||||
#define BR_SSE2_GCC 1
|
||||
#ifndef BR_MSC
|
||||
#if _MSC_VER
|
||||
#define BR_MSC 1
|
||||
|
||||
#if _MSC_VER >= 1900
|
||||
#define BR_MSC_2015 1
|
||||
#elif _MSC_VER >= 1800
|
||||
#define BR_MSC_2013 1
|
||||
#elif _MSC_VER >= 1700
|
||||
#define BR_MSC_2012 1
|
||||
#elif _MSC_VER >= 1600
|
||||
#define BR_MSC_2010 1
|
||||
#elif _MSC_VER >= 1500
|
||||
#define BR_MSC_2008 1
|
||||
#elif _MSC_VER >= 1400
|
||||
#define BR_MSC_2005 1
|
||||
#endif
|
||||
|
||||
#if BR_MSC_2015
|
||||
#define BR_MSC_2013 1
|
||||
#endif
|
||||
#ifndef BR_SSE2_MSC
|
||||
#if _MSC_VER >= 1400
|
||||
#define BR_SSE2_MSC 1
|
||||
#if BR_MSC_2013
|
||||
#define BR_MSC_2012 1
|
||||
#endif
|
||||
#if BR_MSC_2012
|
||||
#define BR_MSC_2010 1
|
||||
#endif
|
||||
#if BR_MSC_2010
|
||||
#define BR_MSC_2008 1
|
||||
#endif
|
||||
#if BR_MSC_2008
|
||||
#define BR_MSC_2005 1
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* A macro to tag a function with a "target" attribute (for GCC and Clang).
|
||||
* GCC 4.4+ and Clang 3.7+ allow tagging specific functions with a
|
||||
* 'target' attribute that activates support for specific opcodes.
|
||||
*/
|
||||
#if BR_AES_X86NI_GCC || BR_SSE2_GCC
|
||||
#if BR_GCC_4_4 || BR_CLANG_3_7
|
||||
#define BR_TARGET(x) __attribute__((target(x)))
|
||||
#else
|
||||
#define BR_TARGET(x)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* GCC versions from 4.4 to 4.8 (inclusive) must use a special #pragma
|
||||
* to activate extra opcodes before including the relevant intrinsic
|
||||
* AES-NI headers. But these don't work with Clang (which does not need
|
||||
* them either). We also need that #pragma for GCC 4.9 in order to work
|
||||
* around a compiler bug (it tends to blow up on ghash_pclmul code
|
||||
* otherwise).
|
||||
* AES-NI intrinsics are available on x86 (32-bit and 64-bit) with
|
||||
* GCC 4.8+, Clang 3.7+ and MSC 2012+.
|
||||
*/
|
||||
#if BR_AES_X86NI_GCC && !defined BR_AES_X86NI_GCC_OLD
|
||||
#if __GNUC__ == 4 && __GNUC_MINOR__ >= 4 && __GNUC_MINOR__ <= 9 && !__clang__
|
||||
#define BR_AES_X86NI_GCC_OLD 1
|
||||
#ifndef BR_AES_X86NI
|
||||
#if (BR_i386 || BR_amd64) && (BR_GCC_4_8 || BR_CLANG_3_7 || BR_MSC_2012)
|
||||
#define BR_AES_X86NI 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* SSE2 intrinsics are available on x86 (32-bit and 64-bit) with
|
||||
* GCC 4.4+, Clang 3.7+ and MSC 2005+.
|
||||
*/
|
||||
#ifndef BR_SSE2
|
||||
#if (BR_i386 || BR_amd64) && (BR_GCC_4_4 || BR_CLANG_3_7 || BR_MSC_2005)
|
||||
#define BR_SSE2 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* RDRAND intrinsics are available on x86 (32-bit and 64-bit) with
|
||||
* GCC 4.6+, Clang 3.7+ and MSC 2012+.
|
||||
*/
|
||||
#ifndef BR_RDRAND
|
||||
#if (BR_i386 || BR_amd64) && (BR_GCC_4_6 || BR_CLANG_3_7 || BR_MSC_2012)
|
||||
#define BR_RDRAND 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Determine type of OS for random number generation. Macro names and
|
||||
* values are documented on:
|
||||
* https://sourceforge.net/p/predef/wiki/OperatingSystems/
|
||||
*
|
||||
* TODO: enrich the list of detected system. Also add detection for
|
||||
* alternate system calls like getentropy(), which are usually
|
||||
* preferable when available.
|
||||
*/
|
||||
|
||||
#ifndef BR_USE_URANDOM
|
||||
#if defined _AIX \
|
||||
|| defined __ANDROID__ \
|
||||
|| defined __FreeBSD__ \
|
||||
|| defined __NetBSD__ \
|
||||
|| defined __OpenBSD__ \
|
||||
|| defined __DragonFly__ \
|
||||
|| defined __linux__ \
|
||||
|| (defined __sun && (defined __SVR4 || defined __svr4__)) \
|
||||
|| (defined __APPLE__ && defined __MACH__)
|
||||
#define BR_USE_URANDOM 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef BR_USE_WIN32_RAND
|
||||
#if defined _WIN32 || defined _WIN64
|
||||
#define BR_USE_WIN32_RAND 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
@ -281,6 +396,24 @@
|
|||
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Detect support for an OS-provided time source.
|
||||
*/
|
||||
|
||||
#ifndef BR_USE_UNIX_TIME
|
||||
#if defined __unix__ || defined __linux__ \
|
||||
|| defined _POSIX_SOURCE || defined _POSIX_C_SOURCE \
|
||||
|| (defined __APPLE__ && defined __MACH__)
|
||||
#define BR_USE_UNIX_TIME 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef BR_USE_WIN32_TIME
|
||||
#if defined _WIN32 || defined _WIN64
|
||||
#define BR_USE_WIN32_TIME 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* ==================================================================== */
|
||||
/*
|
||||
* Encoding/decoding functions.
|
||||
|
|
@ -2087,6 +2220,118 @@ int br_ssl_choose_hash(unsigned bf);
|
|||
|
||||
#endif
|
||||
|
||||
/* ==================================================================== */
|
||||
/*
|
||||
* Special "activate intrinsics" code, needed for some compiler versions.
|
||||
* This is defined at the end of this file, so that it won't impact any
|
||||
* of the inline functions defined previously; and it is controlled by
|
||||
* a specific macro defined in the caller code.
|
||||
*
|
||||
* Calling code conventions:
|
||||
*
|
||||
* - Caller must define BR_ENABLE_INTRINSICS before including "inner.h".
|
||||
* - Functions that use intrinsics must be enclosed in an "enabled"
|
||||
* region (between BR_TARGETS_X86_UP and BR_TARGETS_X86_DOWN).
|
||||
* - Functions that use intrinsics must be tagged with the appropriate
|
||||
* BR_TARGET().
|
||||
*/
|
||||
|
||||
#if BR_ENABLE_INTRINSICS && (BR_GCC_4_4 || BR_CLANG_3_7 || BR_MSC_2005)
|
||||
|
||||
/*
|
||||
* x86 intrinsics (both 32-bit and 64-bit).
|
||||
*/
|
||||
#if BR_i386 || BR_amd64
|
||||
|
||||
#if BR_GCC && !BR_GCC_5_0
|
||||
#if BR_GCC_4_6
|
||||
#define BR_TARGETS_X86_UP \
|
||||
_Pragma("GCC push_options") \
|
||||
_Pragma("GCC target(\"sse2,ssse3,sse4.1,aes,pclmul,rdrnd\")")
|
||||
#else
|
||||
#define BR_TARGETS_X86_UP \
|
||||
_Pragma("GCC push_options") \
|
||||
_Pragma("GCC target(\"sse2,ssse3,sse4.1,aes,pclmul\")")
|
||||
#endif
|
||||
#define BR_TARGETS_X86_DOWN \
|
||||
_Pragma("GCC pop_options")
|
||||
#pragma GCC diagnostic ignored "-Wpsabi"
|
||||
#endif
|
||||
|
||||
#if BR_CLANG && !BR_CLANG_3_8
|
||||
#undef __SSE2__
|
||||
#undef __SSE3__
|
||||
#undef __SSSE3__
|
||||
#undef __SSE4_1__
|
||||
#undef __AES__
|
||||
#undef __PCLMUL__
|
||||
#undef __RDRND__
|
||||
#define __SSE2__ 1
|
||||
#define __SSE3__ 1
|
||||
#define __SSSE3__ 1
|
||||
#define __SSE4_1__ 1
|
||||
#define __AES__ 1
|
||||
#define __PCLMUL__ 1
|
||||
#define __RDRND__ 1
|
||||
#endif
|
||||
|
||||
#ifndef BR_TARGETS_X86_UP
|
||||
#define BR_TARGETS_X86_UP
|
||||
#endif
|
||||
#ifndef BR_TARGETS_X86_DOWN
|
||||
#define BR_TARGETS_X86_DOWN
|
||||
#endif
|
||||
|
||||
#if BR_GCC || BR_CLANG
|
||||
BR_TARGETS_X86_UP
|
||||
#include <x86intrin.h>
|
||||
#include <cpuid.h>
|
||||
#define bswap32 __builtin_bswap32
|
||||
BR_TARGETS_X86_DOWN
|
||||
#endif
|
||||
|
||||
#if BR_MSC
|
||||
#include <stdlib.h>
|
||||
#include <intrin.h>
|
||||
#include <immintrin.h>
|
||||
#define bswap32 _byteswap_ulong
|
||||
#endif
|
||||
|
||||
static inline int
|
||||
br_cpuid(uint32_t mask_eax, uint32_t mask_ebx,
|
||||
uint32_t mask_ecx, uint32_t mask_edx)
|
||||
{
|
||||
#if BR_GCC || BR_CLANG
|
||||
unsigned eax, ebx, ecx, edx;
|
||||
|
||||
if (__get_cpuid(1, &eax, &ebx, &ecx, &edx)) {
|
||||
if ((eax & mask_eax) == mask_eax
|
||||
&& (ebx & mask_ebx) == mask_ebx
|
||||
&& (ecx & mask_ecx) == mask_ecx
|
||||
&& (edx & mask_edx) == mask_edx)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
#elif BR_MSC
|
||||
int info[4];
|
||||
|
||||
__cpuid(info, 1);
|
||||
if (((uint32_t)info[0] & mask_eax) == mask_eax
|
||||
&& ((uint32_t)info[1] & mask_ebx) == mask_ebx
|
||||
&& ((uint32_t)info[2] & mask_ecx) == mask_ecx
|
||||
&& ((uint32_t)info[3] & mask_edx) == mask_edx)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
/* ==================================================================== */
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue