diff options
Diffstat (limited to 'lib/libssl/src/crypto/cryptlib.c')
| -rw-r--r-- | lib/libssl/src/crypto/cryptlib.c | 842 |
1 files changed, 435 insertions, 407 deletions
diff --git a/lib/libssl/src/crypto/cryptlib.c b/lib/libssl/src/crypto/cryptlib.c index 082b2e88ee0..89667d175a8 100644 --- a/lib/libssl/src/crypto/cryptlib.c +++ b/lib/libssl/src/crypto/cryptlib.c @@ -118,14 +118,13 @@ #include <openssl/safestack.h> #if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) -static double SSLeay_MSVC5_hack=0.0; /* and for VC1.5 */ +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 */ -static const char* const lock_names[CRYPTO_NUM_LOCKS] = - { +static const char* const lock_names[CRYPTO_NUM_LOCKS] = { "<<ERROR>>", "err", "ex_data", @@ -170,35 +169,35 @@ static const char* const lock_names[CRYPTO_NUM_LOCKS] = #if CRYPTO_NUM_LOCKS != 41 # error "Inconsistency between crypto.h and cryptlib.c" #endif - }; +}; /* This is for applications to allocate new type names in the non-dynamic array of lock names. These are numbered with positive numbers. */ -static STACK_OF(OPENSSL_STRING) *app_locks=NULL; +static STACK_OF(OPENSSL_STRING) *app_locks = NULL; /* For applications that want a more dynamic way of handling threads, the following stack is used. These are externally numbered with negative numbers. */ -static STACK_OF(CRYPTO_dynlock) *dyn_locks=NULL; - +static STACK_OF(CRYPTO_dynlock) *dyn_locks = NULL; -static void (*locking_callback)(int mode,int type, - const char *file,int line)=0; -static int (*add_lock_callback)(int *pointer,int amount, - int type,const char *file,int line)=0; +static void (*locking_callback)(int mode, int type, + const char *file, int line) = 0; +static int (*add_lock_callback)(int *pointer, int amount, + int type, const char *file, int line) = 0; #ifndef OPENSSL_NO_DEPRECATED -static unsigned long (*id_callback)(void)=0; +static unsigned long (*id_callback)(void) = 0; #endif -static void (*threadid_callback)(CRYPTO_THREADID *)=0; -static struct CRYPTO_dynlock_value *(*dynlock_create_callback) - (const char *file,int line)=0; +static void (*threadid_callback)(CRYPTO_THREADID *) = 0; +static struct CRYPTO_dynlock_value *(*dynlock_create_callback)( + const char *file, int line) = 0; static void (*dynlock_lock_callback)(int mode, - struct CRYPTO_dynlock_value *l, const char *file,int line)=0; + struct CRYPTO_dynlock_value *l, const char *file, int line) = 0; static void (*dynlock_destroy_callback)(struct CRYPTO_dynlock_value *l, - const char *file,int line)=0; + const char *file, int line) = 0; -int CRYPTO_get_new_lockid(char *name) - { +int +CRYPTO_get_new_lockid(char *name) +{ char *str; int i; @@ -207,141 +206,130 @@ int CRYPTO_get_new_lockid(char *name) * a DLL using /MT. Without this, the application cannot use * any floating point printf's. * It also seems to be needed for Visual C 1.5 (win16) */ - SSLeay_MSVC5_hack=(double)name[0]*(double)name[1]; + SSLeay_MSVC5_hack = (double)name[0]*(double)name[1]; #endif - if ((app_locks == NULL) && ((app_locks=sk_OPENSSL_STRING_new_null()) == NULL)) - { - CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_LOCKID,ERR_R_MALLOC_FAILURE); - return(0); - } - if ((str=BUF_strdup(name)) == NULL) - { - CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_LOCKID,ERR_R_MALLOC_FAILURE); - return(0); - } - i=sk_OPENSSL_STRING_push(app_locks,str); + if ((app_locks == NULL) && ((app_locks = sk_OPENSSL_STRING_new_null()) == NULL)) { + CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_LOCKID, ERR_R_MALLOC_FAILURE); + return (0); + } + if ((str = BUF_strdup(name)) == NULL) { + CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_LOCKID, ERR_R_MALLOC_FAILURE); + return (0); + } + i = sk_OPENSSL_STRING_push(app_locks, str); if (!i) OPENSSL_free(str); else - i+=CRYPTO_NUM_LOCKS; /* gap of one :-) */ - return(i); - } + i += CRYPTO_NUM_LOCKS; /* gap of one :-) */ + return (i); +} -int CRYPTO_num_locks(void) - { +int +CRYPTO_num_locks(void) +{ return CRYPTO_NUM_LOCKS; - } +} -int CRYPTO_get_new_dynlockid(void) - { +int +CRYPTO_get_new_dynlockid(void) +{ int i = 0; CRYPTO_dynlock *pointer = NULL; - if (dynlock_create_callback == NULL) - { - CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID,CRYPTO_R_NO_DYNLOCK_CREATE_CALLBACK); - return(0); - } + if (dynlock_create_callback == NULL) { + CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID, CRYPTO_R_NO_DYNLOCK_CREATE_CALLBACK); + return (0); + } CRYPTO_w_lock(CRYPTO_LOCK_DYNLOCK); if ((dyn_locks == NULL) - && ((dyn_locks=sk_CRYPTO_dynlock_new_null()) == NULL)) - { + && ((dyn_locks = sk_CRYPTO_dynlock_new_null()) == NULL)) { CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK); - CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID,ERR_R_MALLOC_FAILURE); - return(0); - } + CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID, ERR_R_MALLOC_FAILURE); + return (0); + } CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK); pointer = (CRYPTO_dynlock *)OPENSSL_malloc(sizeof(CRYPTO_dynlock)); - if (pointer == NULL) - { - CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID,ERR_R_MALLOC_FAILURE); - return(0); - } + if (pointer == NULL) { + CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID, ERR_R_MALLOC_FAILURE); + return (0); + } pointer->references = 1; - pointer->data = dynlock_create_callback(__FILE__,__LINE__); - if (pointer->data == NULL) - { + pointer->data = dynlock_create_callback(__FILE__, __LINE__); + if (pointer->data == NULL) { OPENSSL_free(pointer); - CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID,ERR_R_MALLOC_FAILURE); - return(0); - } + CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID, ERR_R_MALLOC_FAILURE); + return (0); + } CRYPTO_w_lock(CRYPTO_LOCK_DYNLOCK); /* First, try to find an existing empty slot */ - i=sk_CRYPTO_dynlock_find(dyn_locks,NULL); + i = sk_CRYPTO_dynlock_find(dyn_locks, NULL); /* If there was none, push, thereby creating a new one */ if (i == -1) /* Since sk_push() returns the number of items on the stack, not the location of the pushed item, we need to transform the returned number into a position, by decreasing it. */ - i=sk_CRYPTO_dynlock_push(dyn_locks,pointer) - 1; + i = sk_CRYPTO_dynlock_push(dyn_locks, pointer) - 1; else /* If we found a place with a NULL pointer, put our pointer in it. */ - (void)sk_CRYPTO_dynlock_set(dyn_locks,i,pointer); + (void)sk_CRYPTO_dynlock_set(dyn_locks, i, pointer); CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK); - if (i == -1) - { - dynlock_destroy_callback(pointer->data,__FILE__,__LINE__); + if (i == -1) { + dynlock_destroy_callback(pointer->data, __FILE__, __LINE__); OPENSSL_free(pointer); - } - else + } else i += 1; /* to avoid 0 */ - return -i; - } + return - i; +} -void CRYPTO_destroy_dynlockid(int i) - { +void +CRYPTO_destroy_dynlockid(int i) +{ CRYPTO_dynlock *pointer = NULL; if (i) - i = -i-1; + i = -i - 1; if (dynlock_destroy_callback == NULL) return; CRYPTO_w_lock(CRYPTO_LOCK_DYNLOCK); - if (dyn_locks == NULL || i >= sk_CRYPTO_dynlock_num(dyn_locks)) - { + if (dyn_locks == NULL || i >= sk_CRYPTO_dynlock_num(dyn_locks)) { CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK); return; - } + } pointer = sk_CRYPTO_dynlock_value(dyn_locks, i); - if (pointer != NULL) - { + if (pointer != NULL) { --pointer->references; #ifdef REF_CHECK - if (pointer->references < 0) - { - fprintf(stderr,"CRYPTO_destroy_dynlockid, bad reference count\n"); + if (pointer->references < 0) { + fprintf(stderr, "CRYPTO_destroy_dynlockid, bad reference count\n"); abort(); - } - else + } else #endif - if (pointer->references <= 0) - { - (void)sk_CRYPTO_dynlock_set(dyn_locks, i, NULL); - } - else - pointer = NULL; - } + if (pointer->references <= 0) { + (void)sk_CRYPTO_dynlock_set(dyn_locks, i, NULL); + } else + pointer = NULL; + } CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK); - if (pointer) - { - dynlock_destroy_callback(pointer->data,__FILE__,__LINE__); + if (pointer) { + dynlock_destroy_callback(pointer->data, __FILE__, __LINE__); OPENSSL_free(pointer); - } } +} -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) - i = -i-1; + i = -i - 1; CRYPTO_w_lock(CRYPTO_LOCK_DYNLOCK); @@ -355,97 +343,102 @@ struct CRYPTO_dynlock_value *CRYPTO_get_dynlock_value(int i) if (pointer) return pointer->data; return NULL; - } +} -struct CRYPTO_dynlock_value *(*CRYPTO_get_dynlock_create_callback(void)) - (const char *file,int line) - { - return(dynlock_create_callback); - } +struct CRYPTO_dynlock_value *(*CRYPTO_get_dynlock_create_callback(void))( + const char *file, int line) +{ + return (dynlock_create_callback); +} void (*CRYPTO_get_dynlock_lock_callback(void))(int mode, - struct CRYPTO_dynlock_value *l, const char *file,int line) - { - return(dynlock_lock_callback); - } - -void (*CRYPTO_get_dynlock_destroy_callback(void)) - (struct CRYPTO_dynlock_value *l, const char *file,int line) - { - return(dynlock_destroy_callback); - } + struct CRYPTO_dynlock_value *l, const char *file, int line) +{ + return (dynlock_lock_callback); +} -void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *(*func) - (const char *file, int line)) - { - dynlock_create_callback=func; - } +void (*CRYPTO_get_dynlock_destroy_callback(void))( + struct CRYPTO_dynlock_value *l, const char *file, int line) +{ + return (dynlock_destroy_callback); +} -void CRYPTO_set_dynlock_lock_callback(void (*func)(int mode, - struct CRYPTO_dynlock_value *l, const char *file, int line)) - { - dynlock_lock_callback=func; - } +void +CRYPTO_set_dynlock_create_callback( + struct CRYPTO_dynlock_value *(*func)(const char *file, int line)) +{ + dynlock_create_callback = func; +} -void CRYPTO_set_dynlock_destroy_callback(void (*func) - (struct CRYPTO_dynlock_value *l, const char *file, int line)) - { - dynlock_destroy_callback=func; - } +void +CRYPTO_set_dynlock_lock_callback(void (*func)(int mode, + struct CRYPTO_dynlock_value *l, const char *file, int line)) +{ + dynlock_lock_callback = func; +} +void +CRYPTO_set_dynlock_destroy_callback( + void (*func)(struct CRYPTO_dynlock_value *l, const char *file, int line)) +{ + dynlock_destroy_callback = func; +} -void (*CRYPTO_get_locking_callback(void))(int mode,int type,const char *file, - int line) - { - return(locking_callback); - } +void (*CRYPTO_get_locking_callback(void))(int mode, int type, + const char *file, int line) +{ + return (locking_callback); +} -int (*CRYPTO_get_add_lock_callback(void))(int *num,int mount,int type, - const char *file,int line) - { - return(add_lock_callback); - } +int (*CRYPTO_get_add_lock_callback(void))(int *num, int mount, int type, + const char *file, int line) +{ + return (add_lock_callback); +} -void CRYPTO_set_locking_callback(void (*func)(int mode,int type, - const char *file,int line)) - { +void +CRYPTO_set_locking_callback(void (*func)(int mode, int type, + const char *file, int line)) +{ /* Calling this here ensures initialisation before any threads * are started. */ OPENSSL_init(); - locking_callback=func; - } + locking_callback = func; +} -void CRYPTO_set_add_lock_callback(int (*func)(int *num,int mount,int type, - const char *file,int line)) - { - add_lock_callback=func; - } +void +CRYPTO_set_add_lock_callback(int (*func)(int *num, int mount, int type, + const char *file, int line)) +{ + add_lock_callback = func; +} /* the memset() here and in set_pointer() seem overkill, but for the sake of * CRYPTO_THREADID_cmp() this avoids any platform silliness that might cause two * "equal" THREADID structs to not be memcmp()-identical. */ -void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val) - { +void +CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val) +{ memset(id, 0, sizeof(*id)); id->val = val; - } +} static const unsigned char hash_coeffs[] = { 3, 5, 7, 11, 13, 17, 19, 23 }; -void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr) - { +void +CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr) +{ unsigned char *dest = (void *)&id->val; unsigned int accum = 0; unsigned char dnum = sizeof(id->val); memset(id, 0, sizeof(*id)); id->ptr = ptr; - if (sizeof(id->val) >= sizeof(id->ptr)) - { + if (sizeof(id->val) >= sizeof(id->ptr)) { /* 'ptr' can be embedded in 'val' without loss of uniqueness */ id->val = (unsigned long)id->ptr; return; - } + } /* hash ptr ==> val. Each byte of 'val' gets the mod-256 total of a * linear function over the bytes in 'ptr', the co-efficients of which * are a sequence of low-primes (hash_coeffs is an 8-element cycle) - @@ -456,44 +449,43 @@ void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr) * a black-belt, I'd scan big-endian pointers in reverse to give * low-order bits more play, but this isn't crypto and I'd prefer nobody * mistake it as such. Plus I'm lazy. */ - while (dnum--) - { + while (dnum--) { 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; - } } +} -int CRYPTO_THREADID_set_callback(void (*func)(CRYPTO_THREADID *)) - { +int +CRYPTO_THREADID_set_callback(void (*func)(CRYPTO_THREADID *)) +{ if (threadid_callback) return 0; threadid_callback = func; return 1; - } +} void (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *) - { +{ return threadid_callback; - } +} -void CRYPTO_THREADID_current(CRYPTO_THREADID *id) - { - if (threadid_callback) - { +void +CRYPTO_THREADID_current(CRYPTO_THREADID *id) +{ + if (threadid_callback) { threadid_callback(id); return; - } + } #ifndef OPENSSL_NO_DEPRECATED /* If the deprecated callback was set, fall back to that */ - if (id_callback) - { + if (id_callback) { CRYPTO_THREADID_set_numeric(id, id_callback()); return; - } + } #endif /* Else pick a backup */ #ifdef OPENSSL_SYS_WIN16 @@ -506,64 +498,68 @@ void CRYPTO_THREADID_current(CRYPTO_THREADID *id) /* For everything else, default to using the address of 'errno' */ CRYPTO_THREADID_set_pointer(id, (void*)&errno); #endif - } +} -int CRYPTO_THREADID_cmp(const CRYPTO_THREADID *a, const CRYPTO_THREADID *b) - { +int +CRYPTO_THREADID_cmp(const CRYPTO_THREADID *a, const CRYPTO_THREADID *b) +{ return memcmp(a, b, sizeof(*a)); - } +} -void CRYPTO_THREADID_cpy(CRYPTO_THREADID *dest, const CRYPTO_THREADID *src) - { +void +CRYPTO_THREADID_cpy(CRYPTO_THREADID *dest, const CRYPTO_THREADID *src) +{ memcpy(dest, src, sizeof(*src)); - } +} -unsigned long CRYPTO_THREADID_hash(const CRYPTO_THREADID *id) - { +unsigned long +CRYPTO_THREADID_hash(const CRYPTO_THREADID *id) +{ return id->val; - } +} #ifndef OPENSSL_NO_DEPRECATED unsigned long (*CRYPTO_get_id_callback(void))(void) - { - return(id_callback); - } +{ + return (id_callback); +} -void CRYPTO_set_id_callback(unsigned long (*func)(void)) - { - id_callback=func; - } +void +CRYPTO_set_id_callback(unsigned long (*func)(void)) +{ + id_callback = func; +} -unsigned long CRYPTO_thread_id(void) - { - unsigned long ret=0; +unsigned long +CRYPTO_thread_id(void) +{ + unsigned long ret = 0; - if (id_callback == NULL) - { + if (id_callback == NULL) { #ifdef OPENSSL_SYS_WIN16 - ret=(unsigned long)GetCurrentTask(); + ret = (unsigned long)GetCurrentTask(); #elif defined(OPENSSL_SYS_WIN32) - ret=(unsigned long)GetCurrentThreadId(); + ret = (unsigned long)GetCurrentThreadId(); #elif defined(GETPID_IS_MEANINGLESS) - ret=1L; + ret = 1L; #elif defined(OPENSSL_SYS_BEOS) - ret=(unsigned long)find_thread(NULL); + ret = (unsigned long)find_thread(NULL); #else - ret=(unsigned long)getpid(); + ret = (unsigned long)getpid(); #endif - } - else - ret=id_callback(); - return(ret); - } + } else + ret = id_callback(); + return (ret); +} #endif -void CRYPTO_lock(int mode, int type, const char *file, int line) - { +void +CRYPTO_lock(int mode, int type, const char *file, int line) +{ #ifdef LOCK_DEBUG - { + { CRYPTO_THREADID id; - char *rw_text,*operation_text; + char *rw_text, *operation_text; if (mode & CRYPTO_LOCK) operation_text="lock "; @@ -580,101 +576,98 @@ void CRYPTO_lock(int mode, int type, const char *file, int line) rw_text="ERROR"; CRYPTO_THREADID_current(&id); - fprintf(stderr,"lock:%08lx:(%s)%s %-18s %s:%d\n", - CRYPTO_THREADID_hash(&id), rw_text, operation_text, - CRYPTO_get_lock_name(type), file, line); - } + fprintf(stderr, "lock:%08lx:(%s)%s %-18s %s:%d\n", + CRYPTO_THREADID_hash(&id), rw_text, operation_text, + CRYPTO_get_lock_name(type), file, line); + } #endif - if (type < 0) - { - if (dynlock_lock_callback != NULL) - { - struct CRYPTO_dynlock_value *pointer - = CRYPTO_get_dynlock_value(type); + if (type < 0) { + if (dynlock_lock_callback != NULL) { + struct CRYPTO_dynlock_value *pointer = + CRYPTO_get_dynlock_value(type); OPENSSL_assert(pointer != NULL); dynlock_lock_callback(mode, pointer, file, line); CRYPTO_destroy_dynlockid(type); - } } - else - if (locking_callback != NULL) - locking_callback(mode,type,file,line); - } + } else if (locking_callback != NULL) + locking_callback(mode, type, file, line); +} -int CRYPTO_add_lock(int *pointer, int amount, int type, const char *file, - int line) - { +int +CRYPTO_add_lock(int *pointer, int amount, int type, const char *file, + int line) +{ int ret = 0; - if (add_lock_callback != NULL) - { + if (add_lock_callback != NULL) { #ifdef LOCK_DEBUG int before= *pointer; #endif - ret=add_lock_callback(pointer,amount,type,file,line); + ret = add_lock_callback(pointer, amount, type, file, line); #ifdef LOCK_DEBUG { - CRYPTO_THREADID id; - CRYPTO_THREADID_current(&id); - fprintf(stderr,"ladd:%08lx:%2d+%2d->%2d %-18s %s:%d\n", - CRYPTO_THREADID_hash(&id), before,amount,ret, + CRYPTO_THREADID id; + CRYPTO_THREADID_current(&id); + fprintf(stderr, "ladd:%08lx:%2d+%2d->%2d %-18s %s:%d\n", + CRYPTO_THREADID_hash(&id), before, amount, ret, CRYPTO_get_lock_name(type), - file,line); + file, line); } #endif - } - else - { - CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,file,line); + } else { + CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE, type, file, line); - ret= *pointer+amount; + ret= *pointer + amount; #ifdef LOCK_DEBUG { - CRYPTO_THREADID id; - CRYPTO_THREADID_current(&id); - fprintf(stderr,"ladd:%08lx:%2d+%2d->%2d %-18s %s:%d\n", + CRYPTO_THREADID id; + CRYPTO_THREADID_current(&id); + fprintf(stderr, "ladd:%08lx:%2d+%2d->%2d %-18s %s:%d\n", CRYPTO_THREADID_hash(&id), - *pointer,amount,ret, + *pointer, amount, ret, CRYPTO_get_lock_name(type), - file,line); + file, line); } #endif - *pointer=ret; - CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,file,line); - } - return(ret); + *pointer = ret; + CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE, type, file, line); } + return (ret); +} -const char *CRYPTO_get_lock_name(int type) - { +const char +*CRYPTO_get_lock_name(int type) +{ if (type < 0) return("dynamic"); else if (type < CRYPTO_NUM_LOCKS) - return(lock_names[type]); - else if (type-CRYPTO_NUM_LOCKS > sk_OPENSSL_STRING_num(app_locks)) + return (lock_names[type]); + else if (type - CRYPTO_NUM_LOCKS > sk_OPENSSL_STRING_num(app_locks)) return("ERROR"); else - return(sk_OPENSSL_STRING_value(app_locks,type-CRYPTO_NUM_LOCKS)); - } + return (sk_OPENSSL_STRING_value(app_locks, type - CRYPTO_NUM_LOCKS)); +} #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ defined(__INTEL__) || \ defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) unsigned int OPENSSL_ia32cap_P[2]; -unsigned long *OPENSSL_ia32cap_loc(void) -{ if (sizeof(long)==4) - /* - * If 32-bit application pulls address of OPENSSL_ia32cap_P[0] - * clear second element to maintain the illusion that vector - * is 32-bit. - */ - OPENSSL_ia32cap_P[1]=0; - return (unsigned long *)OPENSSL_ia32cap_P; +unsigned long +*OPENSSL_ia32cap_loc(void) +{ + if (sizeof(long) == 4) + /* + * If 32-bit application pulls address of OPENSSL_ia32cap_P[0] + * clear second element to maintain the illusion that vector + * is 32-bit. + */ + OPENSSL_ia32cap_P[1] = 0; + return (unsigned long *)OPENSSL_ia32cap_P; } #if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY) @@ -684,43 +677,48 @@ typedef unsigned __int64 IA32CAP; #else typedef unsigned long long IA32CAP; #endif -void OPENSSL_cpuid_setup(void) -{ static int trigger=0; - IA32CAP OPENSSL_ia32_cpuid(void); - IA32CAP vec; - char *env; - - if (trigger) return; +void +OPENSSL_cpuid_setup(void) +{ + static int trigger = 0; + IA32CAP OPENSSL_ia32_cpuid(void); + IA32CAP vec; + char *env; + + if (trigger) + return; - trigger=1; - if ((env=getenv("OPENSSL_ia32cap"))) { - int off = (env[0]=='~')?1:0; + 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); + 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); + if (!sscanf(env+off, "%lli",(long long *)&vec)) vec = strtoul(env+off, NULL, 0); #endif - if (off) vec = OPENSSL_ia32_cpuid()&~vec; - } - else - vec = OPENSSL_ia32_cpuid(); + if (off) + vec = OPENSSL_ia32_cpuid()&~vec; + } else + vec = OPENSSL_ia32_cpuid(); /* * |(1<<10) sets a reserved bit to signal that variable * was initialized already... This is to avoid interference * with cpuid snippets in ELF .init segment. */ - OPENSSL_ia32cap_P[0] = (unsigned int)vec|(1<<10); - OPENSSL_ia32cap_P[1] = (unsigned int)(vec>>32); + OPENSSL_ia32cap_P[0] = (unsigned int)vec|(1 << 10); + OPENSSL_ia32cap_P[1] = (unsigned int)(vec >> 32); } #endif #else -unsigned long *OPENSSL_ia32cap_loc(void) { return NULL; } + unsigned long *OPENSSL_ia32cap_loc(void) { return NULL; +} #endif int OPENSSL_NONPIC_relocated = 0; #if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ) -void OPENSSL_cpuid_setup(void) {} +void +OPENSSL_cpuid_setup(void) {} #endif #if (defined(_WIN32) || defined(__CYGWIN__)) && defined(_WINDLL) @@ -734,25 +732,23 @@ void OPENSSL_cpuid_setup(void) {} /* All we really need to do is remove the 'error' state when a thread * detaches */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, - LPVOID lpvReserved) - { - switch(fdwReason) - { +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) { case DLL_PROCESS_ATTACH: OPENSSL_cpuid_setup(); #if defined(_WIN32_WINNT) { - IMAGE_DOS_HEADER *dos_header = (IMAGE_DOS_HEADER *)hinstDLL; - IMAGE_NT_HEADERS *nt_headers; - - if (dos_header->e_magic==IMAGE_DOS_SIGNATURE) - { - nt_headers = (IMAGE_NT_HEADERS *)((char *)dos_header - + dos_header->e_lfanew); - if (nt_headers->Signature==IMAGE_NT_SIGNATURE && - hinstDLL!=(HINSTANCE)(nt_headers->OptionalHeader.ImageBase)) - OPENSSL_NONPIC_relocated=1; + IMAGE_DOS_HEADER *dos_header = (IMAGE_DOS_HEADER *)hinstDLL; + IMAGE_NT_HEADERS *nt_headers; + + if (dos_header->e_magic == IMAGE_DOS_SIGNATURE) { + nt_headers = (IMAGE_NT_HEADERS *)((char *)dos_header + + dos_header->e_lfanew); + if (nt_headers->Signature == IMAGE_NT_SIGNATURE && + hinstDLL != (HINSTANCE)(nt_headers->OptionalHeader.ImageBase)) + OPENSSL_NONPIC_relocated = 1; } } #endif @@ -763,9 +759,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, break; case DLL_PROCESS_DETACH: break; - } - return(TRUE); } + return (TRUE); +} #endif #if defined(_WIN32) && !defined(__CYGWIN__) @@ -783,138 +779,166 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, #endif #if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333 -int OPENSSL_isservice(void) -{ HWINSTA h; - DWORD len; - WCHAR *name; - static union { void *p; int (*f)(void); } _OPENSSL_isservice = { NULL }; - - if (_OPENSSL_isservice.p == NULL) { - HANDLE h = GetModuleHandle(NULL); - if (h != NULL) - _OPENSSL_isservice.p = GetProcAddress(h,"_OPENSSL_isservice"); - if (_OPENSSL_isservice.p == NULL) - _OPENSSL_isservice.p = (void *)-1; - } - - if (_OPENSSL_isservice.p != (void *)-1) - return (*_OPENSSL_isservice.f)(); - - (void)GetDesktopWindow(); /* return value is ignored */ - - h = GetProcessWindowStation(); - if (h==NULL) return -1; - - if (GetUserObjectInformationW (h,UOI_NAME,NULL,0,&len) || - GetLastError() != ERROR_INSUFFICIENT_BUFFER) +int +OPENSSL_isservice(void) + { HWINSTA h; + DWORD len; + WCHAR *name; + static union { void *p; + int (*f)(void); + } _OPENSSL_isservice = { NULL }; + + if (_OPENSSL_isservice.p == NULL) { + HANDLE h = GetModuleHandle(NULL); + if (h != NULL) + _OPENSSL_isservice.p = GetProcAddress(h, "_OPENSSL_isservice"); + if (_OPENSSL_isservice.p == NULL) + _OPENSSL_isservice.p = (void *) - 1; + } + + if (_OPENSSL_isservice.p != (void *) - 1) + return (*_OPENSSL_isservice.f)(); + + (void)GetDesktopWindow(); /* return value is ignored */ + + h = GetProcessWindowStation(); + if (h == NULL) + return -1; + + if (GetUserObjectInformationW (h, UOI_NAME, NULL, 0, &len) || + GetLastError() != ERROR_INSUFFICIENT_BUFFER) return -1; - if (len>512) return -1; /* paranoia */ - len++,len&=~1; /* paranoia */ - name=(WCHAR *)alloca(len+sizeof(WCHAR)); - if (!GetUserObjectInformationW (h,UOI_NAME,name,len,&len)) - return -1; - - len++,len&=~1; /* paranoia */ - name[len/sizeof(WCHAR)]=L'\0'; /* paranoia */ + if (len > 512) + return -1; + /* paranoia */ + len++, len&=~1; + /* paranoia */ + name = (WCHAR *)alloca(len + sizeof(WCHAR)); + if (!GetUserObjectInformationW (h, UOI_NAME, name, len, &len)) + return -1; + + len++, len&=~1; + /* paranoia */ + name[len/sizeof(WCHAR)]=L'\0'; /* paranoia */ #if 1 /* This doesn't cover "interactive" services [working with real * WinSta0's] nor programs started non-interactively by Task * Scheduler [those are working with SAWinSta]. */ - if (wcsstr(name,L"Service-0x")) return 1; + if (wcsstr(name, L"Service-0x")) return 1; #else - /* This covers all non-interactive programs such as services. */ - if (!wcsstr(name,L"WinSta0")) return 1; + /* This covers all non-interactive programs such as services. */ + if (!wcsstr(name, L"WinSta0")) return 1; #endif - else return 0; + else return 0; } #else -int OPENSSL_isservice(void) { return 0; } + int OPENSSL_isservice(void) { return 0; +} #endif void OPENSSL_showfatal (const char *fmta,...) -{ va_list ap; - TCHAR buf[256]; - const TCHAR *fmt; + { va_list ap; + TCHAR buf[256]; + const TCHAR *fmt; #ifdef STD_ERROR_HANDLE /* what a dirty trick! */ - HANDLE h; - - if ((h=GetStdHandle(STD_ERROR_HANDLE)) != NULL && - GetFileType(h)!=FILE_TYPE_UNKNOWN) - { /* must be console application */ - va_start (ap,fmta); - vfprintf (stderr,fmta,ap); - va_end (ap); - return; - } + HANDLE h; + + if ((h = GetStdHandle(STD_ERROR_HANDLE)) != NULL && + GetFileType(h) != FILE_TYPE_UNKNOWN) + { /* must be console application */ + va_start (ap, fmta); + vfprintf (stderr, fmta, ap); + va_end (ap); + return; + } #endif - if (sizeof(TCHAR)==sizeof(char)) - fmt=(const TCHAR *)fmta; - else do - { int keepgoing; - size_t len_0=strlen(fmta)+1,i; - WCHAR *fmtw; - - fmtw = (WCHAR *)alloca(len_0*sizeof(WCHAR)); - if (fmtw == NULL) { fmt=(const TCHAR *)L"no stack?"; break; } + if (sizeof(TCHAR) == sizeof(char)) + fmt = (const TCHAR *)fmta; + else do + { int keepgoing; + size_t len_0 = strlen(fmta) + 1, i; + WCHAR *fmtw; + + fmtw = (WCHAR *)alloca(len_0*sizeof(WCHAR)); + if (fmtw == NULL) { + fmt = (const TCHAR *)L"no stack?"; + break; + } #ifndef OPENSSL_NO_MULTIBYTE - if (!MultiByteToWideChar(CP_ACP,0,fmta,len_0,fmtw,len_0)) + if (!MultiByteToWideChar(CP_ACP, 0, fmta, len_0, fmtw, len_0)) #endif - for (i=0;i<len_0;i++) fmtw[i]=(WCHAR)fmta[i]; - - for (i=0;i<len_0;i++) - { if (fmtw[i]==L'%') do - { keepgoing=0; - switch (fmtw[i+1]) - { case L'0': case L'1': case L'2': case L'3': case L'4': - case L'5': case L'6': case L'7': case L'8': case L'9': - case L'.': case L'*': - case L'-': i++; keepgoing=1; break; - case L's': fmtw[i+1]=L'S'; break; - case L'S': fmtw[i+1]=L's'; break; - case L'c': fmtw[i+1]=L'C'; break; - case L'C': fmtw[i+1]=L'c'; break; + for (i = 0;i < len_0;i++) fmtw[i] = (WCHAR)fmta[i]; + + for (i = 0; i < len_0; i++) + { if (fmtw[i]==L'%') do + { keepgoing = 0; + switch (fmtw[i + 1]) + { case L'0': case L'1': case L'2': case L'3': case L'4': + case L'5': case L'6': case L'7': case L'8': case L'9': + case L'.': case L'*': + case L'-': + i++; + keepgoing = 1; + break; + case L's': + fmtw[i + 1] = L'S'; + break; + case L'S': + fmtw[i + 1] = L's'; + break; + case L'c': + fmtw[i + 1] = L'C'; + break; + case L'C': + fmtw[i + 1] = L'c'; + break; + } + } while (keepgoing); } - } while (keepgoing); - } - fmt = (const TCHAR *)fmtw; - } while (0); + fmt = (const TCHAR *)fmtw; + } while (0); - va_start (ap,fmta); - _vsntprintf (buf,sizeof(buf)/sizeof(TCHAR)-1,fmt,ap); - buf [sizeof(buf)/sizeof(TCHAR)-1] = _T('\0'); - va_end (ap); + va_start (ap, fmta); + _vsntprintf (buf, sizeof(buf)/sizeof(TCHAR) - 1, fmt, ap); + buf [sizeof(buf)/sizeof(TCHAR) - 1] = _T('\0'); + va_end (ap); #if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333 - /* this -------------v--- guards NT-specific calls */ - if (check_winnt() && OPENSSL_isservice() > 0) - { HANDLE h = RegisterEventSource(0,_T("OPENSSL")); - const TCHAR *pmsg=buf; - ReportEvent(h,EVENTLOG_ERROR_TYPE,0,0,0,1,0,&pmsg,0); - DeregisterEventSource(h); - } - else + /* this -------------v--- guards NT-specific calls */ + if (check_winnt() && OPENSSL_isservice() > 0) + { HANDLE h = RegisterEventSource(0, _T("OPENSSL")); + const TCHAR *pmsg = buf; + ReportEvent(h, EVENTLOG_ERROR_TYPE, 0, 0, 0, 1, 0, &pmsg, 0); + DeregisterEventSource(h); + } else #endif - MessageBox (NULL,buf,_T("OpenSSL: FATAL"),MB_OK|MB_ICONSTOP); + MessageBox (NULL, buf, _T("OpenSSL: FATAL"), MB_OK|MB_ICONSTOP); } #else -void OPENSSL_showfatal (const char *fmta,...) -{ va_list ap; +void OPENSSL_showfatal(const char *fmta, ...) +{ + va_list ap; - va_start (ap,fmta); - vfprintf (stderr,fmta,ap); - va_end (ap); + va_start (ap, fmta); + vfprintf (stderr, fmta, ap); + va_end (ap); +} + +int OPENSSL_isservice(void) +{ + return 0; } -int OPENSSL_isservice (void) { return 0; } #endif -void OpenSSLDie(const char *file,int line,const char *assertion) - { +void +OpenSSLDie(const char *file, int line, const char *assertion) +{ OPENSSL_showfatal( - "%s(%d): OpenSSL internal error, assertion failed: %s\n", - file,line,assertion); + "%s(%d): OpenSSL internal error, assertion failed: %s\n", + file, line, assertion); #if !defined(_WIN32) || defined(__CYGWIN__) abort(); #else @@ -922,12 +946,16 @@ void OpenSSLDie(const char *file,int line,const char *assertion) raise(SIGABRT); _exit(3); #endif - } +} -void *OPENSSL_stderr(void) { return stderr; } +void *OPENSSL_stderr(void) +{ + return stderr; +} -int CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len) - { +int +CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len) +{ size_t i; const unsigned char *a = in_a; const unsigned char *b = in_b; @@ -937,4 +965,4 @@ int CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len) x |= a[i] ^ b[i]; return x; - } +} |