Skip to content

T
Third Party Openssl

OpenHarmony / Third Party Openssl
1 年多 前同步成功

通知 10
Star 18
Fork 1
T
Third Party Openssl
提交 492279f6 编写于 作者: A Andy Polyakov
浏览文件
操作

AIX build updates.

上级 3ad74edc
显示空白变更内容
内联 并排
Showing with 74 addition and 28 deletion
Configure
浏览文件 @ 492279f6
...@@ -426,12 +426,12 @@ my %table=( ...@@ -426,12 +426,12 @@ my %table=(
#### IBM's AIX. #### IBM's AIX.
"aix3-cc", "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::", "aix3-cc", "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",
"aix-gcc", "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32", "aix-gcc", "gcc:-O -DB_ENDIAN::-pthread:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X32",
"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64", "aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-pthread:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-maix64 -shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",
# Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE # Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE
# at build time. $OBJECT_MODE is respected at ./config stage! # at build time. $OBJECT_MODE is respected at ./config stage!
"aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32", "aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-q64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64", "aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",
# #
# Cray T90 and similar (SDSC) # Cray T90 and similar (SDSC)
......
Makefile.shared
浏览文件 @ 492279f6
...@@ -521,23 +521,23 @@ link_app.hpux: ...@@ -521,23 +521,23 @@ link_app.hpux:
link_o.aix: link_o.aix:
@ $(CALC_VERSIONS); \ @ $(CALC_VERSIONS); \
OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]*\(64\)'` || :; \ OBJECT_MODE=`expr "x$(SHARED_LDFLAGS)" : 'x\-[a-z]*\(64\)'` || :; \
OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \ OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
SHLIB=lib$(LIBNAME).so; \ SHLIB=lib$(LIBNAME).so; \
SHLIB_SUFFIX=; \ SHLIB_SUFFIX=; \
ALLSYMSFLAGS=''; \ ALLSYMSFLAGS=''; \
NOALLSYMSFLAGS=''; \ NOALLSYMSFLAGS=''; \
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-G,-bexpall,-bnolibpath,-bM:SRE'; \ SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \
$(LINK_SO_O); $(LINK_SO_O);
link_a.aix: link_a.aix:
@ $(CALC_VERSIONS); \ @ $(CALC_VERSIONS); \
OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]*\(64\)'` || : ; \ OBJECT_MODE=`expr "x$(SHARED_LDFLAGS)" : 'x\-[a-z]*\(64\)'` || : ; \
OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \ OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
SHLIB=lib$(LIBNAME).so; \ SHLIB=lib$(LIBNAME).so; \
SHLIB_SUFFIX=; \ SHLIB_SUFFIX=; \
ALLSYMSFLAGS='-bnogc'; \ ALLSYMSFLAGS='-bnogc'; \
NOALLSYMSFLAGS=''; \ NOALLSYMSFLAGS=''; \
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-G,-bexpall,-bnolibpath,-bM:SRE'; \ SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \
$(LINK_SO_A_VIA_O) $(LINK_SO_A_VIA_O)
link_app.aix: link_app.aix:
LDFLAGS="$(CFLAGS) -Wl,-brtl,-blibpath:$(LIBRPATH):$${LIBPATH:-/usr/lib:/lib}"; \ LDFLAGS="$(CFLAGS) -Wl,-brtl,-blibpath:$(LIBRPATH):$${LIBPATH:-/usr/lib:/lib}"; \
......
TABLE
浏览文件 @ 492279f6
...@@ -745,7 +745,7 @@ $perlasm_scheme = aix32 ...@@ -745,7 +745,7 @@ $perlasm_scheme = aix32
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= aix-shared $shared_target= aix-shared
$shared_cflag = $shared_cflag =
$shared_ldflag = -q32 $shared_ldflag = -q32 -G
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) $shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
$ranlib = $ranlib =
$arflags = -X 32 $arflags = -X 32
...@@ -754,7 +754,7 @@ $arflags = -X 32 ...@@ -754,7 +754,7 @@ $arflags = -X 32
$cc = gcc $cc = gcc
$cflags = -O -DB_ENDIAN $cflags = -O -DB_ENDIAN
$unistd = $unistd =
$thread_cflag = -D_THREAD_SAFE $thread_cflag = -pthread
$sys_id = AIX $sys_id = AIX
$lflags = $lflags =
$bn_ops = BN_LLONG RC4_CHAR $bn_ops = BN_LLONG RC4_CHAR
...@@ -775,10 +775,10 @@ $perlasm_scheme = aix32 ...@@ -775,10 +775,10 @@ $perlasm_scheme = aix32
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= aix-shared $shared_target= aix-shared
$shared_cflag = $shared_cflag =
$shared_ldflag = $shared_ldflag = -shared -Wl,-G
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) $shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
$ranlib = $ranlib =
$arflags = -X 32 $arflags = -X32
*** aix3-cc *** aix3-cc
$cc = cc $cc = cc
...@@ -835,7 +835,7 @@ $perlasm_scheme = aix64 ...@@ -835,7 +835,7 @@ $perlasm_scheme = aix64
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= aix-shared $shared_target= aix-shared
$shared_cflag = $shared_cflag =
$shared_ldflag = -q64 $shared_ldflag = -q64 -G
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) $shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
$ranlib = $ranlib =
$arflags = -X 64 $arflags = -X 64
...@@ -844,7 +844,7 @@ $arflags = -X 64 ...@@ -844,7 +844,7 @@ $arflags = -X 64
$cc = gcc $cc = gcc
$cflags = -maix64 -O -DB_ENDIAN $cflags = -maix64 -O -DB_ENDIAN
$unistd = $unistd =
$thread_cflag = -D_THREAD_SAFE $thread_cflag = -pthread
$sys_id = AIX $sys_id = AIX
$lflags = $lflags =
$bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHAR $bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHAR
...@@ -865,7 +865,7 @@ $perlasm_scheme = aix64 ...@@ -865,7 +865,7 @@ $perlasm_scheme = aix64
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= aix-shared $shared_target= aix-shared
$shared_cflag = $shared_cflag =
$shared_ldflag = -maix64 $shared_ldflag = -maix64 -shared -Wl,-G
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) $shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
$ranlib = $ranlib =
$arflags = -X64 $arflags = -X64
...@@ -1500,14 +1500,44 @@ $shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib ...@@ -1500,14 +1500,44 @@ $shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
$ranlib = $ranlib =
$arflags = $arflags =
*** debug-geoff *** debug-geoff32
$cc = gcc
$cflags = -DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -DMD32_REG_T=int -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long
$unistd =
$thread_cflag = -D_REENTRANT
$sys_id =
$lflags = -ldl
$bn_ops = BN_LLONG
$cpuid_obj =
$bn_obj =
$des_obj =
$aes_obj =
$bf_obj =
$md5_obj =
$sha1_obj =
$cast_obj =
$rc4_obj =
$rmd160_obj =
$rc5_obj =
$wp_obj =
$cmll_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= linux-shared
$shared_cflag = -fPIC
$shared_ldflag =
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
$ranlib =
$arflags =
*** debug-geoff64
$cc = gcc $cc = gcc
$cflags = -DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -DMD32_REG_T=int -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long $cflags = -DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -DMD32_REG_T=int -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long
$unistd = $unistd =
$thread_cflag = -D_REENTRANT $thread_cflag = -D_REENTRANT
$sys_id = $sys_id =
$lflags = -ldl $lflags = -ldl
$bn_ops = SIXTY_FOUR_BIT_LONG $bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
$cpuid_obj = $cpuid_obj =
$bn_obj = $bn_obj =
$des_obj = $des_obj =
...@@ -1952,7 +1982,7 @@ $arflags = ...@@ -1952,7 +1982,7 @@ $arflags =
*** debug-steve-opt *** debug-steve-opt
$cc = gcc $cc = gcc
$cflags = -m64 -O3 -DL_ENDIAN -DTERMIO -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -pedantic -Wall -Werror -Wno-long-long -DMD32_REG_T=int $cflags = -m64 -O3 -DL_ENDIAN -DTERMIO -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -DOPENSSSL_NO_DEPRECATED -g -pedantic -Wall -Werror -Wno-long-long -DMD32_REG_T=int
$unistd = $unistd =
$thread_cflag = -D_REENTRANT $thread_cflag = -D_REENTRANT
$sys_id = $sys_id =
...@@ -1982,7 +2012,7 @@ $arflags = ...@@ -1982,7 +2012,7 @@ $arflags =
*** debug-steve32 *** debug-steve32
$cc = gcc $cc = gcc
$cflags = -m32 -DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe $cflags = -m32 -DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -DOPENSSSL_NO_DEPRECATED -g -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe
$unistd = $unistd =
$thread_cflag = -D_REENTRANT $thread_cflag = -D_REENTRANT
$sys_id = $sys_id =
...@@ -2012,7 +2042,7 @@ $arflags = ...@@ -2012,7 +2042,7 @@ $arflags =
*** debug-steve64 *** debug-steve64
$cc = gcc $cc = gcc
$cflags = -m64 -DL_ENDIAN -DTERMIO -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -pedantic -Wall -Werror -Wno-long-long -DMD32_REG_T=int $cflags = -m64 -DL_ENDIAN -DTERMIO -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -DOPENSSSL_NO_DEPRECATED -g -pedantic -Wall -Werror -Wno-long-long -DMD32_REG_T=int
$unistd = $unistd =
$thread_cflag = -D_REENTRANT $thread_cflag = -D_REENTRANT
$sys_id = $sys_id =
...@@ -3505,7 +3535,7 @@ $perlasm_scheme = coff ...@@ -3505,7 +3535,7 @@ $perlasm_scheme = coff
$dso_scheme = win32 $dso_scheme = win32
$shared_target= cygwin-shared $shared_target= cygwin-shared
$shared_cflag = -D_WINDLL -DOPENSSL_USE_APPLINK $shared_cflag = -D_WINDLL -DOPENSSL_USE_APPLINK
$shared_ldflag = -mno-cygwin -shared $shared_ldflag = -mno-cygwin
$shared_extension = .dll.a $shared_extension = .dll.a
$ranlib = $ranlib =
$arflags = $arflags =
......
crypto/Makefile
浏览文件 @ 492279f6
...@@ -74,7 +74,7 @@ x86_64cpuid.s: x86_64cpuid.pl ...@@ -74,7 +74,7 @@ x86_64cpuid.s: x86_64cpuid.pl
$(PERL) x86_64cpuid.pl $@ $(PERL) x86_64cpuid.pl $@
ia64cpuid.s: ia64cpuid.S ia64cpuid.s: ia64cpuid.S
$(CC) $(CFLAGS) -E ia64cpuid.S > $@ $(CC) $(CFLAGS) -E ia64cpuid.S > $@
ppccpuid.s: ppccpuid.pl; $(PERL) $< $(PERLASM_SCHEME) $@ ppccpuid.s: ppccpuid.pl; $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@
testapps: testapps:
[ -z "$(THIS)" ] || ( if echo ${SDIRS} | fgrep ' des '; \ [ -z "$(THIS)" ] || ( if echo ${SDIRS} | fgrep ' des '; \
......
crypto/aes/asm/aes-ppc.pl
浏览文件 @ 492279f6
...@@ -92,6 +92,7 @@ $mask80=$Tbl2; ...@@ -92,6 +92,7 @@ $mask80=$Tbl2;
$mask1b=$Tbl3; $mask1b=$Tbl3;
$code.=<<___; $code.=<<___;
.machine "any"
.text .text
.align 7 .align 7
......
crypto/bn/asm/ppc.pl
浏览文件 @ 492279f6
...@@ -254,7 +254,7 @@ $data=<<EOF; ...@@ -254,7 +254,7 @@ $data=<<EOF;
# .text section # .text section
.machine $ISA .machine "any"
# #
# NOTE: The following label name should be changed to # NOTE: The following label name should be changed to
......
crypto/ppccpuid.pl
浏览文件 @ 492279f6
...@@ -20,6 +20,7 @@ if ($flavour=~/64/) { ...@@ -20,6 +20,7 @@ if ($flavour=~/64/) {
} }
$code=<<___; $code=<<___;
.machine "any"
.text .text
.globl .OPENSSL_cpuid_setup .globl .OPENSSL_cpuid_setup
......
crypto/sha/asm/sha1-ppc.pl
浏览文件 @ 492279f6
...@@ -156,6 +156,7 @@ ___ ...@@ -156,6 +156,7 @@ ___
} }
$code=<<___; $code=<<___;
.machine "any"
.text .text
.globl .sha1_block_data_order .globl .sha1_block_data_order
......
crypto/sha/asm/sha512-ppc.pl
浏览文件 @ 492279f6
...@@ -173,6 +173,7 @@ ___ ...@@ -173,6 +173,7 @@ ___
} }
$code=<<___; $code=<<___;
.machine "any"
.text .text
.globl $func .globl $func
......
engines/e_capi.c
浏览文件 @ 492279f6
...@@ -1770,5 +1770,12 @@ static int cert_select_dialog(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs) ...@@ -1770,5 +1770,12 @@ static int cert_select_dialog(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs)
} }
#endif #endif
#endif
#else /* !WIN32 */
#include <openssl/engine.h>
#ifndef OPENSSL_NO_DYNAMIC_ENGINE
OPENSSL_EXPORT
int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { return 0; }
IMPLEMENT_DYNAMIC_CHECK_FN()
#endif #endif
#endif #endif
engines/e_gmp.c
浏览文件 @ 492279f6
...@@ -451,9 +451,13 @@ static int e_gmp_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) ...@@ -451,9 +451,13 @@ static int e_gmp_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
} }
#endif #endif
#endif /* !OPENSSL_NO_GMP */
/* This stuff is needed if this ENGINE is being compiled into a self-contained /* This stuff is needed if this ENGINE is being compiled into a self-contained
* shared-library. */ * shared-library. */
#ifdef ENGINE_DYNAMIC_SUPPORT #ifndef OPENSSL_NO_DYNAMIC_ENGINE
IMPLEMENT_DYNAMIC_CHECK_FN()
#ifndef OPENSSL_NO_GMP
static int bind_fn(ENGINE *e, const char *id) static int bind_fn(ENGINE *e, const char *id)
{ {
if(id && (strcmp(id, engine_e_gmp_id) != 0)) if(id && (strcmp(id, engine_e_gmp_id) != 0))
...@@ -462,10 +466,11 @@ static int bind_fn(ENGINE *e, const char *id) ...@@ -462,10 +466,11 @@ static int bind_fn(ENGINE *e, const char *id)
return 0; return 0;
return 1; return 1;
} }
IMPLEMENT_DYNAMIC_CHECK_FN()
IMPLEMENT_DYNAMIC_BIND_FN(bind_fn) IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
#endif /* ENGINE_DYNAMIC_SUPPORT */ #else
OPENSSL_EXPORT
int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { return 0; }
#endif
#endif /* !OPENSSL_NO_DYNAMIC_ENGINE */
#endif /* !OPENSSL_NO_GMP */
#endif /* !OPENSSL_NO_HW */ #endif /* !OPENSSL_NO_HW */
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或