diff options
Diffstat (limited to 'src/crypto/crypto.c')
| -rw-r--r-- | src/crypto/crypto.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/src/crypto/crypto.c b/src/crypto/crypto.c index 3e1765b8..aee35210 100644 --- a/src/crypto/crypto.c +++ b/src/crypto/crypto.c @@ -23,14 +23,14 @@ (defined(OPENSSL_X86) || defined(OPENSSL_X86_64) || \ defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) || \ defined(OPENSSL_PPC64LE)) -/* x86, x86_64, the ARMs and ppc64le need to record the result of a - * cpuid/getauxval call for the asm to work correctly, unless compiled without - * asm code. */ +// x86, x86_64, the ARMs and ppc64le need to record the result of a +// cpuid/getauxval call for the asm to work correctly, unless compiled without +// asm code. #define NEED_CPUID #else -/* Otherwise, don't emit a static initialiser. */ +// Otherwise, don't emit a static initialiser. #if !defined(BORINGSSL_NO_STATIC_INITIALIZER) #define BORINGSSL_NO_STATIC_INITIALIZER @@ -40,23 +40,23 @@ OPENSSL_ARM || OPENSSL_AARCH64) */ -/* The capability variables are defined in this file in order to work around a - * linker bug. When linking with a .a, if no symbols in a .o are referenced - * then the .o is discarded, even if it has constructor functions. - * - * This still means that any binaries that don't include some functionality - * that tests the capability values will still skip the constructor but, so - * far, the init constructor function only sets the capability variables. */ +// The capability variables are defined in this file in order to work around a +// linker bug. When linking with a .a, if no symbols in a .o are referenced +// then the .o is discarded, even if it has constructor functions. +// +// This still means that any binaries that don't include some functionality +// that tests the capability values will still skip the constructor but, so +// far, the init constructor function only sets the capability variables. #if defined(OPENSSL_X86) || defined(OPENSSL_X86_64) -/* This value must be explicitly initialised to zero in order to work around a - * bug in libtool or the linker on OS X. - * - * If not initialised then it becomes a "common symbol". When put into an - * archive, linking on OS X will fail to resolve common symbols. By - * initialising it to zero, it becomes a "data symbol", which isn't so - * affected. */ +// This value must be explicitly initialised to zero in order to work around a +// bug in libtool or the linker on OS X. +// +// If not initialised then it becomes a "common symbol". When put into an +// archive, linking on OS X will fail to resolve common symbols. By +// initialising it to zero, it becomes a "data symbol", which isn't so +// affected. uint32_t OPENSSL_ia32cap_P[4] = {0}; #elif defined(OPENSSL_PPC64LE) @@ -94,8 +94,8 @@ uint32_t OPENSSL_armcap_P = 0; #endif #if defined(BORINGSSL_FIPS) -/* In FIPS mode, the power-on self-test function calls |CRYPTO_library_init| - * because we have to ensure that CPUID detection occurs first. */ +// In FIPS mode, the power-on self-test function calls |CRYPTO_library_init| +// because we have to ensure that CPUID detection occurs first. #define BORINGSSL_NO_STATIC_INITIALIZER #endif @@ -107,7 +107,7 @@ uint32_t OPENSSL_armcap_P = 0; #if defined(BORINGSSL_NO_STATIC_INITIALIZER) static CRYPTO_once_t once = CRYPTO_ONCE_INIT; -#elif defined(OPENSSL_WINDOWS) +#elif defined(_MSC_VER) #pragma section(".CRT$XCU", read) static void __cdecl do_library_init(void); __declspec(allocate(".CRT$XCU")) void(*library_init_constructor)(void) = @@ -116,21 +116,21 @@ __declspec(allocate(".CRT$XCU")) void(*library_init_constructor)(void) = static void do_library_init(void) __attribute__ ((constructor)); #endif -/* do_library_init is the actual initialization function. If - * BORINGSSL_NO_STATIC_INITIALIZER isn't defined, this is set as a static - * initializer. Otherwise, it is called by CRYPTO_library_init. */ +// do_library_init is the actual initialization function. If +// BORINGSSL_NO_STATIC_INITIALIZER isn't defined, this is set as a static +// initializer. Otherwise, it is called by CRYPTO_library_init. static void OPENSSL_CDECL do_library_init(void) { - /* WARNING: this function may only configure the capability variables. See the - * note above about the linker bug. */ + // WARNING: this function may only configure the capability variables. See the + // note above about the linker bug. #if defined(NEED_CPUID) OPENSSL_cpuid_setup(); #endif } void CRYPTO_library_init(void) { - /* TODO(davidben): It would be tidier if this build knob could be replaced - * with an internal lazy-init mechanism that would handle things correctly - * in-library. https://crbug.com/542879 */ + // TODO(davidben): It would be tidier if this build knob could be replaced + // with an internal lazy-init mechanism that would handle things correctly + // in-library. https://crbug.com/542879 #if defined(BORINGSSL_NO_STATIC_INITIALIZER) CRYPTO_once(&once, do_library_init); #endif |