diff options
| author |   deraadt <deraadt@openbsd.org> | 2014-04-17 17:50:44 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2014-04-17 17:50:44 +0000 |
| commit | ae7f143bab2f078a032f9dc4fad87f6ac0ba1346 (patch) | |
| tree | b222cff930373aa6906b424514966200ea353360 /lib/libssl/src/crypto/cryptlib.c | |
| parent | Invoke OPENSSL_add_all_algorithms_noconf() to enforce OPENSSL_cpuid_setup() (diff) | |
| download | wireguard-openbsd-ae7f143bab2f078a032f9dc4fad87f6ac0ba1346.tar.xz wireguard-openbsd-ae7f143bab2f078a032f9dc4fad87f6ac0ba1346.zip | |
some KNF cleanup following the script
Diffstat (limited to 'lib/libssl/src/crypto/cryptlib.c')
| -rw-r--r-- | lib/libssl/src/crypto/cryptlib.c | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/lib/libssl/src/crypto/cryptlib.c b/lib/libssl/src/crypto/cryptlib.c index dc3cc2ab025..ca583d59a93 100644 --- a/lib/libssl/src/crypto/cryptlib.c +++ b/lib/libssl/src/crypto/cryptlib.c @@ -117,10 +117,6 @@ #include "cryptlib.h" #include <openssl/safestack.h> -#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) -static double SSLeay_MSVC5_hack = 0.0; /* and for VC1.5 */ -#endif - DECLARE_STACK_OF(CRYPTO_dynlock) /* real #defines in crypto.h, keep these upto date */ @@ -316,8 +312,8 @@ CRYPTO_destroy_dynlockid(int i) } } -struct CRYPTO_dynlock_value -*CRYPTO_get_dynlock_value(int i) +struct CRYPTO_dynlock_value * +CRYPTO_get_dynlock_value(int i) { CRYPTO_dynlock *pointer = NULL; if (i) @@ -337,7 +333,8 @@ struct CRYPTO_dynlock_value return NULL; } -struct CRYPTO_dynlock_value *(*CRYPTO_get_dynlock_create_callback(void))( +struct CRYPTO_dynlock_value * +(*CRYPTO_get_dynlock_create_callback(void))( const char *file, int line) { return (dynlock_create_callback); @@ -445,7 +442,7 @@ CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr) const unsigned char *src = (void *)&id->ptr; unsigned char snum = sizeof(id->ptr); while (snum--) - accum += *(src++) * hash_coeffs[(snum + dnum) & 7]; + accum += *(src++) * hash_coeffs[(snum + dnum) & 7]; accum += dnum; *(dest++) = accum & 255; } @@ -613,8 +610,8 @@ CRYPTO_add_lock(int *pointer, int amount, int type, const char *file, return (ret); } -const char -*CRYPTO_get_lock_name(int type) +const char * +CRYPTO_get_lock_name(int type) { if (type < 0) return("dynamic"); @@ -631,8 +628,8 @@ const char defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) unsigned int OPENSSL_ia32cap_P[2]; -unsigned long -*OPENSSL_ia32cap_loc(void) +unsigned long * +OPENSSL_ia32cap_loc(void) { if (sizeof(long) == 4) /* @@ -646,11 +643,7 @@ unsigned long #if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY) #define OPENSSL_CPUID_SETUP -#if defined(_WIN32) -typedef unsigned __int64 IA32CAP; -#else typedef unsigned long long IA32CAP; -#endif void OPENSSL_cpuid_setup(void) { @@ -665,11 +658,8 @@ OPENSSL_cpuid_setup(void) trigger = 1; if ((env = getenv("OPENSSL_ia32cap"))) { int off = (env[0]=='~') ? 1 : 0; -#if defined(_WIN32) - if (!sscanf(env+off, "%I64i", &vec)) vec = strtoul(env+off, NULL, 0); -#else - if (!sscanf(env+off, "%lli",(long long *)&vec)) vec = strtoul(env+off, NULL, 0); -#endif + if (!sscanf(env+off, "%lli",(long long *)&vec)) + vec = strtoul(env+off, NULL, 0); if (off) vec = OPENSSL_ia32_cpuid()&~vec; } else @@ -690,13 +680,17 @@ OPENSSL_cpuid_setup(void) } #endif int OPENSSL_NONPIC_relocated = 0; + #if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ) void -OPENSSL_cpuid_setup(void) {} +OPENSSL_cpuid_setup(void) +{ +} #endif -void OPENSSL_showfatal(const char *fmta, ...) +void +OPENSSL_showfatal(const char *fmta, ...) { va_list ap; @@ -705,7 +699,8 @@ void OPENSSL_showfatal(const char *fmta, ...) va_end (ap); } -int OPENSSL_isservice(void) +int +OPENSSL_isservice(void) { return 0; } @@ -719,7 +714,8 @@ OpenSSLDie(const char *file, int line, const char *assertion) abort(); } -void *OPENSSL_stderr(void) +void * +OPENSSL_stderr(void) { return stderr; } |