generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add additional OPENSSL_init() handling add dummy call to (hopefully)

Browse Source 
ensure OPENSSL_init() is always linked into an application.
This commit is contained in:
Dr. Stephen Henson 2011-04-01 15:46:03 +00:00
parent 3f7468318d
commit c4acfb1fd0
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/Makefile
View File

@ -89,7 +89,15 @@ alphacpuid.s: alphacpuid.pl
$(PERL) $< | $(CC) -E - | tee $@ > /dev/null $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
o_init.o: o_init.c o_init.o: o_init.c
$(CC) $(CFLAGS) -c -o $@ $< case "`(uname -s) 2>/dev/null`" in \
OSF1|IRIX*) _WL_INIT="-Wl,-init,OPENSSL_init" ;; \
HP-UX) _WL_INIT="-Wl,+init,OPENSSL_init" ;; \
AIX) _WL_INIT="-Wl,-binitfini:OPENSSL_init,-bnoobjreorder";; \
Darwin) ( while [ "x$1" != "x" -a "x$1" != "x-dynamiclib" ]; do shift; done; \
[ $# -ge 1 ] \
) && _WL_INIT="-Wl,-init,_OPENSSL_init" ;; \
esac ; \
$(CC) $(CFLAGS) $(_WL_INIT) -c -o $@ $<
testapps: testapps:
[ -z "$(THIS)" ] || ( if expr " $(SDIRS) " : ".* des " >/dev/null; \ [ -z "$(THIS)" ] || ( if expr " $(SDIRS) " : ".* des " >/dev/null; \

2
crypto/crypto.h
View File

@ -560,8 +560,6 @@ unsigned int *OPENSSL_ia32cap_loc(void);
#define OPENSSL_ia32cap ((OPENSSL_ia32cap_loc())[0]) #define OPENSSL_ia32cap ((OPENSSL_ia32cap_loc())[0])
int OPENSSL_isservice(void); int OPENSSL_isservice(void);
void OPENSSL_init(void);
/* BEGIN ERROR CODES */ /* BEGIN ERROR CODES */
/* The following lines are auto generated by the script mkerr.pl. Any changes /* The following lines are auto generated by the script mkerr.pl. Any changes
* made after this point may be overwritten when the script is next run. * made after this point may be overwritten when the script is next run.

3
crypto/mem.c
View File

@ -121,10 +121,13 @@ static void (*set_debug_options_func)(long) = NULL;
static long (*get_debug_options_func)(void) = NULL; static long (*get_debug_options_func)(void) = NULL;
#endif #endif
extern void OPENSSL_init(void);
int CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t), int CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t),
void (*f)(void *)) void (*f)(void *))
{ {
/* Dummy call just to ensure OPENSSL_init() gets linked in */
OPENSSL_init();
if (!allow_customize) if (!allow_customize)
return 0; return 0;
if ((m == 0) || (r == 0) || (f == 0)) if ((m == 0) || (r == 0) || (f == 0))

7
crypto/o_init.c
View File

@ -112,7 +112,12 @@
void OPENSSL_init(void) void OPENSSL_init(void)
{ {
static int done = 0;
if (done)
return;
done = 1;
#if 1
fprintf(stderr, "Called OPENSSL_init\n"); fprintf(stderr, "Called OPENSSL_init\n");
#endif
} }