Provisional support for auto called OPENSSL_init() function. This can be
used to set up any appropriate functions such as FIPS callbacks without requiring an explicit application call.
This commit is contained in:
Dr. Stephen Henson
parent
011c865640
commit
3f7468318d
@ -34,8 +34,12 @@ GENERAL=Makefile README crypto-lib.com install.com
|
||||
|
||||
LIB= $(TOP)/libcrypto.a
|
||||
SHARED_LIB= libcrypto$(SHLIB_EXT)
|
||||
LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c ebcdic.c uid.c o_time.c o_str.c o_dir.c thr_id.c lock.c fips_ers.c
|
||||
LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o uid.o o_time.o o_str.o o_dir.o thr_id.o lock.o fips_ers.o $(CPUID_OBJ)
|
||||
LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c \
|
||||
ebcdic.c uid.c o_time.c o_str.c o_dir.c thr_id.c lock.c fips_ers.c \
|
||||
o_init.c
|
||||
LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o \
|
||||
ebcdic.o uid.o o_time.o o_str.o o_dir.o thr_id.o lock.o fips_ers.o \
|
||||
o_init.o $(CPUID_OBJ)
|
||||
|
||||
SRC= $(LIBSRC)
|
||||
|
||||
@ -84,6 +88,9 @@ pariscid.s: pariscid.pl; $(PERL) pariscid.pl $(PERLASM_SCHEME) $@
|
||||
alphacpuid.s: alphacpuid.pl
|
||||
$(PERL) $< | $(CC) -E - | tee $@ > /dev/null
|
||||
|
||||
o_init.o: o_init.c
|
||||
$(CC) $(CFLAGS) -c -o $@ $<
|
||||
|
||||
testapps:
|
||||
[ -z "$(THIS)" ] || ( if expr " $(SDIRS) " : ".* des " >/dev/null; \
|
||||
then cd des && $(MAKE) -e des; fi )
|
||||
|
||||
@ -560,6 +560,8 @@ unsigned int *OPENSSL_ia32cap_loc(void);
|
||||
#define OPENSSL_ia32cap ((OPENSSL_ia32cap_loc())[0])
|
||||
int OPENSSL_isservice(void);
|
||||
|
||||
void OPENSSL_init(void);
|
||||
|
||||
/* BEGIN ERROR CODES */
|
||||
/* 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.
|
||||
|
||||
118
crypto/o_init.c
Normal file
118
crypto/o_init.c
Normal file
@ -0,0 +1,118 @@
|
||||
/* o_init.c */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project.
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2011 The OpenSSL Project. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* 3. All advertising materials mentioning features or use of this
|
||||
* software must display the following acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
|
||||
*
|
||||
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
||||
* endorse or promote products derived from this software without
|
||||
* prior written permission. For written permission, please contact
|
||||
* openssl-core@openssl.org.
|
||||
*
|
||||
* 5. Products derived from this software may not be called "OpenSSL"
|
||||
* nor may "OpenSSL" appear in their names without prior written
|
||||
* permission of the OpenSSL Project.
|
||||
*
|
||||
* 6. Redistributions of any form whatsoever must retain the following
|
||||
* acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
||||
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
||||
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
* ====================================================================
|
||||
*
|
||||
*/
|
||||
|
||||
#include <e_os.h>
|
||||
#include <openssl/err.h>
|
||||
|
||||
#if defined(__GNUC__) && __GNUC__>=2
|
||||
void OPENSSL_init(void) __attribute__((constructor));
|
||||
/* Most commonly this results in pointer to OPENSSL_init to be dropped
|
||||
* to .ctors segment, which is traversed by GCC crtbegin.o upon
|
||||
* program startup. Except on a.out OpenBSD where it results in
|
||||
* _GLOBAL_$I$init() {init();} being auto-generated by
|
||||
* compiler... But one way or another this is believed to cover
|
||||
* *all* GCC targets. */
|
||||
#elif defined(_MSC_VER)
|
||||
# ifdef _WINDLL
|
||||
__declspec(dllexport) /* this is essentially cosmetics... */
|
||||
# endif
|
||||
void OPENSSL_init(void);
|
||||
static int init_wrapper(void) { OPENSSL_init(); return 0; }
|
||||
# ifdef _WIN64
|
||||
# pragma section(".CRT$XCU",read)
|
||||
__declspec(allocate(".CRT$XCU"))
|
||||
# else
|
||||
# pragma data_seg(".CRT$XCU")
|
||||
# endif
|
||||
static int (*p)(void) = init_wrapper;
|
||||
/* This results in pointer to init to appear in .CRT segment,
|
||||
* which is traversed by Visual C run-time initialization code.
|
||||
* This applies to both Win32 and [all flavors of] Win64. */
|
||||
# pragma data_seg()
|
||||
#elif defined(__SUNPRO_C)
|
||||
void OPENSSL_init(void);
|
||||
# pragma init(OPENSSL_init)
|
||||
/* This results in a call to init to appear in .init segment. */
|
||||
#elif defined(__DECC) && (defined(__VMS) || defined(VMS))
|
||||
void OPENSSL_init(void);
|
||||
# pragma __nostandard
|
||||
globaldef { "LIB$INITIALIZ" } readonly _align (LONGWORD)
|
||||
int spare[8] = {0};
|
||||
globaldef { "LIB$INITIALIZE" } readonly _align (LONGWORD)
|
||||
void (*x_OPENSSL_init)(void) = OPENSSL_init;
|
||||
/* Refer to LIB$INITIALIZE to ensure it exists in the image. */
|
||||
int lib$initialize();
|
||||
globaldef int (*lib_init_ref)() = lib$initialize;
|
||||
# pragma __standard
|
||||
#elif 0
|
||||
The rest has to be taken care of through command line:
|
||||
|
||||
-Wl,-init,OPENSSL_init on OSF1 and IRIX
|
||||
-Wl,+init,OPENSSL_init on HP-UX
|
||||
-Wl,-binitfini:OPENSSL_init on AIX
|
||||
|
||||
On ELF platforms this results in a call to OPENSSL_init to appear in
|
||||
.init segment...
|
||||
#endif
|
||||
|
||||
/* Perform any essential OpenSSL initialization operations.
|
||||
* Currently only sets FIPS callbacks
|
||||
*/
|
||||
|
||||
void OPENSSL_init(void)
|
||||
{
|
||||
fprintf(stderr, "Called OPENSSL_init\n");
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user