Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
fbf002bb
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
大约 1 年 前同步成功
通知
9
Star
18
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fbf002bb
编写于
11月 06, 2005
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update from stable branch.
上级
9135fddb
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
130 addition
and
15 deletion
+130
-15
CHANGES
CHANGES
+4
-0
Configure
Configure
+11
-6
crypto/engine/engine.h
crypto/engine/engine.h
+2
-1
util/copy.pl
util/copy.pl
+58
-0
util/mk1mf.pl
util/mk1mf.pl
+41
-3
util/mkdef.pl
util/mkdef.pl
+2
-0
util/mkdir-p.pl
util/mkdir-p.pl
+1
-0
util/pl/VC-32.pl
util/pl/VC-32.pl
+11
-5
未找到文件。
CHANGES
浏览文件 @
fbf002bb
...
...
@@ -53,6 +53,10 @@
Changes between 0.9.8a and 0.9.8b [XX xxx XXXX]
*) Add support for building of engines under engine/ as shared libraries
under VC++ build system.
[Steve Henson]
*) Corrected the numerous bugs in the Win32 path splitter in DSO.
Hopefully, we will not see any false combination of paths any more.
[Richard Levitte]
...
...
Configure
浏览文件 @
fbf002bb
...
...
@@ -866,6 +866,8 @@ foreach (sort (keys %disabled))
{ $no_shared = 1; }
elsif (/^zlib$/)
{ $zlib = 0; }
elsif (/^static-engine$/)
{ }
elsif (/^zlib-dynamic$/)
{ }
elsif (/^symlinks$/)
...
...
@@ -1124,13 +1126,16 @@ if (!$no_shared)
}
}
if (
$no_shared
)
if (
!$IsMK1MF
)
{
$openssl_other_defines.="#define OPENSSL_NO_DYNAMIC_ENGINE\n";
}
else
{
$openssl_other_defines.="#define OPENSSL_NO_STATIC_ENGINE\n";
if ($no_shared)
{
$openssl_other_defines.="#define OPENSSL_NO_DYNAMIC_ENGINE\n";
}
else
{
$openssl_other_defines.="#define OPENSSL_NO_STATIC_ENGINE\n";
}
}
$cpuid_obj.=" uplink.o uplink-cof.o" if ($cflags =~ /\-DOPENSSL_USE_APPLINK/);
...
...
crypto/engine/engine.h
浏览文件 @
fbf002bb
...
...
@@ -637,7 +637,7 @@ typedef struct st_dynamic_fns {
* can be fully instantiated with IMPLEMENT_DYNAMIC_CHECK_FN(). */
typedef
unsigned
long
(
*
dynamic_v_check_fn
)(
unsigned
long
ossl_version
);
#define IMPLEMENT_DYNAMIC_CHECK_FN() \
unsigned long v_check(unsigned long v) { \
OPENSSL_EXPORT
unsigned long v_check(unsigned long v) { \
if(v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \
return 0; }
...
...
@@ -659,6 +659,7 @@ typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version);
typedef
int
(
*
dynamic_bind_engine
)(
ENGINE
*
e
,
const
char
*
id
,
const
dynamic_fns
*
fns
);
#define IMPLEMENT_DYNAMIC_BIND_FN(fn) \
OPENSSL_EXPORT \
int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { \
if(ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \
if(!CRYPTO_set_mem_functions(fns->mem_fns.malloc_cb, \
...
...
util/copy.pl
0 → 100644
浏览文件 @
fbf002bb
#!/usr/local/bin/perl
use
Fcntl
;
# copy.pl
# Perl script 'copy' comment. On Windows the built in "copy" command also
# copies timestamps: this messes up Makefile dependencies.
my
$arg
;
foreach
$arg
(
@ARGV
)
{
foreach
(
glob
$arg
)
{
push
@filelist
,
$_
;
}
}
$fnum
=
@filelist
;
if
(
$fnum
<=
1
)
{
die
"
Need at least two filenames
";
}
$dest
=
pop
@filelist
;
if
(
$fnum
>
2
&&
!
-
d
$dest
)
{
die
"
Destination must be a directory
";
}
foreach
(
@filelist
)
{
if
(
-
d
$dest
)
{
$dfile
=
$_
;
$dfile
=~
s|^.*[/\\]([^/\\]*)$|$1|
;
$dfile
=
"
$dest
/
$dfile
";
}
else
{
$dfile
=
$dest
;
}
sysopen
(
IN
,
$_
,
O_RDONLY
|
O_BINARY
)
||
die
"
Can't Open
$_
";
sysopen
(
OUT
,
$dfile
,
O_WRONLY
|
O_CREAT
|
O_TRUNC
|
O_BINARY
)
||
die
"
Can't Open
$dfile
";
while
(
sysread
IN
,
$buf
,
10240
)
{
syswrite
(
OUT
,
$buf
,
length
(
$buf
));
}
close
(
IN
);
close
(
OUT
);
print
"
Copying:
$_
to
$dfile
\n
";
}
util/mk1mf.pl
浏览文件 @
fbf002bb
...
...
@@ -10,6 +10,10 @@ $OPTIONS="";
$ssl_version
=
"";
$banner
=
"
\t\@
echo Building OpenSSL
";
my
$no_static_engine
=
0
;
my
$engines
=
"";
open
(
IN
,"
<Makefile
")
||
die
"
unable to open Makefile!
\n
";
while
(
<
IN
>
)
{
$ssl_version
=
$
1
if
(
/^VERSION=(.*)$/
);
...
...
@@ -95,6 +99,8 @@ foreach (grep(!/^$/, split(/ /, $OPTIONS)))
print
STDERR
"
unknown option -
$_
\n
"
if
!
&read_options
;
}
$no_static_engine
=
0
if
(
!
$shlib
);
$no_mdc2
=
1
if
(
$no_des
);
$no_ssl3
=
1
if
(
$no_md5
||
$no_sha
);
...
...
@@ -214,6 +220,16 @@ $cflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa;
$cflags
.=
"
-DOPENSSL_NO_ECDH
"
if
$no_ecdh
;
$cflags
.=
"
-DOPENSSL_NO_ENGINE
"
if
$no_engine
;
$cflags
.=
"
-DOPENSSL_NO_HW
"
if
$no_hw
;
if
(
$no_static_engine
)
{
$cflags
.=
"
-DOPENSSL_NO_STATIC_ENGINE
";
}
else
{
$cflags
.=
"
-DOPENSSL_NO_DYNAMIC_ENGINE
";
}
#$cflags.=" -DRSAref" if $rsaref ne "";
## if ($unix)
...
...
@@ -288,8 +304,10 @@ for (;;)
if
(
$key
eq
"
HEADER
")
{
$header
.=
&var_add
(
$dir
,
$val
,
1
);
}
if
(
$key
eq
"
LIBOBJ
")
if
(
$key
eq
"
LIBOBJ
"
&&
(
$dir
ne
"
engines
"
||
!
$no_static_engine
)
)
{
$libobj
=
&var_add
(
$dir
,
$val
,
0
);
}
if
(
$key
eq
"
LIBNAMES
"
&&
$dir
eq
"
engines
"
&&
$no_static_engine
)
{
$engines
.=
$val
}
if
(
!
(
$_
=<
IN
>
))
{
$_
=
"
RELATIVE_DIRECTORY=FINISHED
\n
";
}
...
...
@@ -385,12 +403,14 @@ CRYPTO=$crypto
# BIN_D - Binary output directory
# TEST_D - Binary test file output directory
# LIB_D - library output directory
# ENG_D - dynamic engine output directory
# Note: if you change these point to different directories then uncomment out
# the lines around the 'NB' comment below.
#
BIN_D=\$(OUT_D)
TEST_D=\$(OUT_D)
LIB_D=\$(OUT_D)
ENG_D=\$(OUT_D)
# INCL_D - local library directory
# OBJ_D - temp object file directory
...
...
@@ -446,7 +466,7 @@ $banner
headers: \$(HEADER) \$(EXHEADER)
@
lib: \$(LIBS_DEP)
lib: \$(LIBS_DEP)
\$(E_SHLIB)
exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep
...
...
@@ -617,6 +637,16 @@ foreach (split(/\s+/,$test))
$rules
.=
&do_link_rule
("
\$
(TEST_D)
$o$t$exep
",
$tt
,"
\$
(LIBS_DEP)
","
\$
(L_LIBS)
\$
(EX_LIBS)
");
}
$defs
.=
&do_defs
("
E_SHLIB
",
$engines
,"
\$
(ENG_D)
",
$shlibp
);
foreach
(
split
(
/\s+/
,
$engines
))
{
$rules
.=
&do_compile_rule
("
\$
(OBJ_D)
","
engines
${o}
e_
$_
",
$lib
);
$rules
.=
&do_lib_rule
("
\$
(OBJ_D)
${o}
e_
${_}
.obj
","
\$
(ENG_D)
$o$_$shlibp
","",
$shlib
,"");
}
$rules
.=
&do_lib_rule
("
\$
(SSLOBJ)
","
\$
(O_SSL)
",
$ssl
,
$shlib
,"
\$
(SO_SSL)
");
$rules
.=
&do_lib_rule
("
\$
(CRYPTOOBJ)
","
\$
(O_CRYPTO)
",
$crypto
,
$shlib
,"
\$
(SO_CRYPTO)
");
...
...
@@ -777,7 +807,7 @@ sub do_defs
elsif
(
$var
eq
"
SSLOBJ
")
{
$ret
.=
"
\$
(OBJ_D)
\\\$
(SSL).res
";
}
}
chop
(
$ret
);
cho
m
p
(
$ret
);
$ret
.=
"
\n\n
";
return
(
$ret
);
}
...
...
@@ -960,6 +990,14 @@ sub read_options
{
$xcflags
=
"
-DZLIB_SHARED -DZLIB
$xcflags
";
}
elsif
(
/^no-static-engine/
)
{
$no_static_engine
=
1
;
}
elsif
(
/^enable-static-engine/
)
{
$no_static_engine
=
0
;
}
# There are also enable-xxx options which correspond to
# the no-xxx. Since the scalars are enabled by default
# these can be ignored.
...
...
util/mkdef.pl
浏览文件 @
fbf002bb
...
...
@@ -145,6 +145,8 @@ foreach (@ARGV, split(/ /, $options))
$do_crypto
=
1
;
$libname
=
$_
;
}
$no_static_engine
=
1
if
$_
eq
"
no-static-engine
";
$no_static_engine
=
0
if
$_
eq
"
enable-static-engine
";
$do_update
=
1
if
$_
eq
"
update
";
$do_rewrite
=
1
if
$_
eq
"
rewrite
";
$do_ctest
=
1
if
$_
eq
"
ctest
";
...
...
util/mkdir-p.pl
浏览文件 @
fbf002bb
...
...
@@ -8,6 +8,7 @@
my
$arg
;
foreach
$arg
(
@ARGV
)
{
$arg
=~
tr|\\|/|
;
&do_mkdir_p
(
$arg
);
}
...
...
util/pl/VC-32.pl
浏览文件 @
fbf002bb
...
...
@@ -235,10 +235,14 @@ $cflags.=" /Fd$out_def";
sub
do_lib_rule
{
local
(
$objs
,
$target
,
$name
,
$shlib
)
=
@_
;
local
(
$ret
,
$Name
);
local
(
$ret
);
$taget
=~
s/\//$o/g
if
$o
ne
'
/
';
(
$Name
=
$name
)
=~
tr/a-z/A-Z/
;
if
(
$name
ne
"")
{
$name
=~
tr/a-z/A-Z/
;
$name
=
"
/def:ms/
${name}
.def
";
}
# $target="\$(LIB_D)$o$target";
$ret
.=
"
$target
:
$objs
\n
";
...
...
@@ -250,8 +254,10 @@ sub do_lib_rule
}
else
{
local
(
$ex
)
=
(
$target
=~
/O_SSL/
)?'
$(L_CRYPTO)
':'';
if
(
$FLAVOR
=~
/CE/
)
local
(
$ex
)
=
(
$target
=~
/O_CRYPTO/
)?'':'
$(L_CRYPTO)
';
if
(
$name
eq
"")
{}
elsif
(
$FLAVOR
=~
/CE/
)
{
$ex
.=
'
winsock.lib $(WCECOMPAT)/lib/wcecompatex.lib
';
}
...
...
@@ -261,7 +267,7 @@ sub do_lib_rule
$ex
.=
'
wsock32.lib gdi32.lib advapi32.lib user32.lib
';
$ex
.=
'
bufferoverflowu.lib
'
if
(
$FLAVOR
=~
/WIN64/
);
}
$ret
.=
"
\t\$
(LINK)
\$
(MLFLAGS)
$efile$target
/def:ms/
${Name}
.def
@<<
\n
\$
(SHLIB_EX_OBJ)
$objs
$ex
\n
<<
\n
";
$ret
.=
"
\t\$
(LINK)
\$
(MLFLAGS)
$efile$target
$name
@<<
\n
\$
(SHLIB_EX_OBJ)
$objs
$ex
\n
<<
\n
";
}
$ret
.=
"
\n
";
return
(
$ret
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录