Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
6928b617
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
12 个月 前同步成功
通知
8
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,发现更多精彩内容 >>
提交
6928b617
编写于
3月 03, 2016
作者:
R
Richard Levitte
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change names of ordinals and libs, libeay => libcrypto and ssleay => libssl
Reviewed-by:
N
Rich Salz
<
rsalz@openssl.org
>
上级
65963bbe
变更
19
隐藏空白更改
内联
并排
Showing
19 changed file
with
66 addition
and
66 deletion
+66
-66
Configurations/README.design
Configurations/README.design
+4
-4
Configure
Configure
+6
-6
INSTALL.WIN
INSTALL.WIN
+2
-2
Makefile.in
Makefile.in
+3
-3
doc/crypto/OPENSSL_init_crypto.pod
doc/crypto/OPENSSL_init_crypto.pod
+1
-1
ms/32all.bat
ms/32all.bat
+2
-2
ms/do_ms.bat
ms/do_ms.bat
+2
-2
ms/do_nasm.bat
ms/do_nasm.bat
+2
-2
ms/do_nt.bat
ms/do_nt.bat
+2
-2
ms/do_win64a.bat
ms/do_win64a.bat
+2
-2
ms/do_win64i.bat
ms/do_win64i.bat
+2
-2
ms/mw.bat
ms/mw.bat
+4
-4
ms/testce.bat
ms/testce.bat
+2
-2
test/recipes/01-test_ordinals.t
test/recipes/01-test_ordinals.t
+2
-2
util/do_ms.sh
util/do_ms.sh
+4
-4
util/mkdef.pl
util/mkdef.pl
+17
-17
util/pl/BC-32.pl
util/pl/BC-32.pl
+2
-2
util/pl/VC-32.pl
util/pl/VC-32.pl
+5
-5
util/pl/netware.pl
util/pl/netware.pl
+2
-2
未找到文件。
Configurations/README.design
浏览文件 @
6928b617
...
...
@@ -296,12 +296,12 @@ section above would be digested into a %unified_info table:
"libcrypto" =>
[
"crypto",
"util/lib
eay
.num",
"util/lib
crypto
.num",
],
"libssl" =>
[
"ssl",
"util/
ssleay
.num",
"util/
libssl
.num",
],
},
"programs" =>
...
...
@@ -442,7 +442,7 @@ etc.
this library. 'ordinals' MAY be present, and when
it is, its value is an array where the word is
"crypto" or "ssl" and the file is one of the ordinal
files util/lib
eay.num or util/ssleay
.num in the
files util/lib
crypto.num or util/libssl
.num in the
source directory.
This function has a choice; it can use the
...
...
@@ -515,7 +515,7 @@ following calls:
lib => "libssl",
objs => [ "ssl/tls.o" ],
deps => [ "libcrypto" ]
ordinals => [ "ssl", "util/
ssleay
.num" ]);
ordinals => [ "ssl", "util/
libssl
.num" ]);
obj2lib(lib => "libssl"
objs => [ "ssl/tls.o" ]);
...
...
Configure
浏览文件 @
6928b617
...
...
@@ -1457,9 +1457,9 @@ EOF
my
%known_ordinals
=
(
crypto
=>
cleanfile
(
$sourced
,
catfile
("
util
",
"
lib
eay
.num
"),
$blddir
),
cleanfile
(
$sourced
,
catfile
("
util
",
"
lib
crypto
.num
"),
$blddir
),
ssl
=>
cleanfile
(
$sourced
,
catfile
("
util
",
"
ssleay
.num
"),
$blddir
)
cleanfile
(
$sourced
,
catfile
("
util
",
"
libssl
.num
"),
$blddir
)
);
my
$o
=
$known_ordinals
{
$_
};
die
"
Ordinals for
$ddest
defined more than once
\n
"
...
...
@@ -1815,11 +1815,11 @@ BEGIN
VALUE "FileDescription", "OpenSSL Shared Library\\0"
VALUE "FileVersion", "$config{version}\\0"
#if defined(CRYPTO)
VALUE "InternalName", "lib
eay
32\\0"
VALUE "OriginalFilename", "lib
eay
32.dll\\0"
VALUE "InternalName", "lib
crypto
32\\0"
VALUE "OriginalFilename", "lib
crypto
32.dll\\0"
#elif defined(SSL)
VALUE "InternalName", "
ssleay
32\\0"
VALUE "OriginalFilename", "
ssleay
32.dll\\0"
VALUE "InternalName", "
libssl
32\\0"
VALUE "OriginalFilename", "
libssl
32.dll\\0"
#endif
VALUE "ProductName", "The OpenSSL Toolkit\\0"
VALUE "ProductVersion", "$config{version}\\0"
...
...
INSTALL.WIN
浏览文件 @
6928b617
...
...
@@ -80,7 +80,7 @@
By default in 1.1.0 OpenSSL will compile builtin ENGINES into separate shared
libraries. If you specify the "enable-static-engine" option on the command line
to Configure the shared library build (ms\ntdll.mak) will compile the engines
into lib
eay
32.dll instead.
into lib
crypto
32.dll instead.
You can also build a static version of the library using the Makefile
ms\nt.mak
...
...
@@ -160,7 +160,7 @@
possible targets include x86_64-w64-mingw32- and i686-w64-mingw32-.
libcrypto.a and libssl.a are the static libraries. To use the DLLs,
link with lib
eay
32.a and libssl32.a instead.
link with lib
crypto
32.a and libssl32.a instead.
Linking your application
------------------------
...
...
Makefile.in
浏览文件 @
6928b617
...
...
@@ -510,10 +510,10 @@ errors:
$(PERL)
util/mkerr.pl
-recurse
-write
(
cd
engines
;
$(MAKE)
PERL
=
$(PERL)
errors
)
ordinals
:
util/lib
eay.num util/ssleay
.num test_ordinals TABLE
util/lib
eay
.num
::
ordinals
:
util/lib
crypto.num util/libssl
.num test_ordinals TABLE
util/lib
crypto
.num
::
$(PERL)
util/mkdef.pl crypto update
util/
ssleay
.num
::
util/
libssl
.num
::
$(PERL)
util/mkdef.pl ssl update
test_ordinals
:
TOP
=
$(TOP)
PERL
=
$(PERL)
$(PERL)
test
/run_tests.pl test_ordinals
...
...
doc/crypto/OPENSSL_init_crypto.pod
浏览文件 @
6928b617
...
...
@@ -199,7 +199,7 @@ object can be released with OPENSSL_INIT_free() when done.
Resources local to a thread are deallocated automatically when the thread exits
(e.g. in a pthreads environment, when pthread_exit() is called). On Windows
platforms this is done in response to a DLL_THREAD_DETACH message being sent to
the lib
eay
32.dll entry point. Some windows functions may cause threads to exit
the lib
crypto
32.dll entry point. Some windows functions may cause threads to exit
without sending this message (for example ExitProcess()). If the application
uses such functions, then the application must free up OpenSSL resources
directly via a call to OPENSSL_thread_stop(). Similarly this message will
...
...
ms/32all.bat
浏览文件 @
6928b617
...
...
@@ -6,8 +6,8 @@ perl util\mk1mf.pl %OPTS% debug VC-WIN32 >d32.mak
perl
util
\mk1mf.pl
%OPTS%
VC
-WIN
32
>
32
.mak
perl
util
\mk1mf.pl
%OPTS%
debug
dll
VC
-WIN
32
>
d32dll
.mak
perl
util
\mk1mf.pl
%OPTS%
dll
VC
-WIN
32
>
32
dll
.mak
perl
util
\mkdef.pl
32
lib
eay
>
ms
\libeay
32.def
perl
util
\mkdef.pl
32
ssleay
>
ms
\ssleay
32.def
perl
util
\mkdef.pl
32
lib
crypto
>
ms
\libcrypto
32.def
perl
util
\mkdef.pl
32
libssl
>
ms
\libssl
32.def
nmake
-f
d32
.mak
@if
errorlevel
1
goto
end
...
...
ms/do_ms.bat
浏览文件 @
6928b617
...
...
@@ -7,5 +7,5 @@ perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak
perl
util
\mk1mf.pl
dll
no
-asm
VC
-CE
>
ms
\cedll.mak
:skipce
perl
util
\mkdef.pl
32
lib
eay
>
ms
\libeay
32.def
perl
util
\mkdef.pl
32
ssleay
>
ms
\ssleay
32.def
perl
util
\mkdef.pl
32
lib
crypto
>
ms
\libcrypto
32.def
perl
util
\mkdef.pl
32
libssl
>
ms
\libssl
32.def
ms/do_nasm.bat
浏览文件 @
6928b617
...
...
@@ -4,5 +4,5 @@ perl util\mk1mf.pl nasm VC-WIN32 >ms\nt.mak
perl
util
\mk1mf.pl
dll
nasm
VC
-WIN
32
>
ms
\ntdll.mak
perl
util
\mk1mf.pl
nasm
BC
-NT
>
ms
\bcb.mak
perl
util
\mkdef.pl
32
lib
eay
>
ms
\libeay
32.def
perl
util
\mkdef.pl
32
ssleay
>
ms
\ssleay
32.def
perl
util
\mkdef.pl
32
lib
crypto
>
ms
\libcrypto
32.def
perl
util
\mkdef.pl
32
libssl
>
ms
\libssl
32.def
ms/do_nt.bat
浏览文件 @
6928b617
...
...
@@ -3,5 +3,5 @@ perl util\mkfiles.pl >MINFO
perl
util
\mk1mf.pl
no
-asm
VC
-NT
>
ms
\nt.mak
perl
util
\mk1mf.pl
dll
no
-asm
VC
-NT
>
ms
\ntdll.mak
perl
util
\mkdef.pl
lib
eay
NT
>
ms
\libeay
32.def
perl
util
\mkdef.pl
ssleay
NT
>
ms
\ssleay
32.def
perl
util
\mkdef.pl
lib
crypto
NT
>
ms
\libcrypto
32.def
perl
util
\mkdef.pl
libssl
NT
>
ms
\libssl
32.def
ms/do_win64a.bat
浏览文件 @
6928b617
...
...
@@ -15,5 +15,5 @@ ml64 -c -Foms\uptable.obj ms\uptable.asm
perl
util
\mk1mf.pl
VC
-WIN
64
A
>
ms
\nt.mak
perl
util
\mk1mf.pl
dll
VC
-WIN
64
A
>
ms
\ntdll.mak
perl
util
\mkdef.pl
32
lib
eay
>
ms
\libeay
32.def
perl
util
\mkdef.pl
32
ssleay
>
ms
\ssleay
32.def
perl
util
\mkdef.pl
32
lib
crypto
>
ms
\libcrypto
32.def
perl
util
\mkdef.pl
32
libssl
>
ms
\libssl
32.def
ms/do_win64i.bat
浏览文件 @
6928b617
...
...
@@ -5,5 +5,5 @@ ias -o ms\uptable.obj ms\uptable.asm
perl
util
\mk1mf.pl
VC
-WIN
64
I
>
ms
\nt.mak
perl
util
\mk1mf.pl
dll
VC
-WIN
64
I
>
ms
\ntdll.mak
perl
util
\mkdef.pl
32
lib
eay
>
ms
\libeay
32.def
perl
util
\mkdef.pl
32
ssleay
>
ms
\ssleay
32.def
perl
util
\mkdef.pl
32
lib
crypto
>
ms
\libcrypto
32.def
perl
util
\mkdef.pl
32
libssl
>
ms
\libssl
32.def
ms/mw.bat
浏览文件 @
6928b617
...
...
@@ -5,9 +5,9 @@
perl
util
\mkfiles.pl
>
MINFO
perl
util
\mk1mf.pl
Mingw32
>
ms
\mingw32.mak
@rem DLL definition files
perl
util
\mkdef.pl
32
lib
eay
>
ms
\libeay
32.def
perl
util
\mkdef.pl
32
lib
crypto
>
ms
\libcrypto
32.def
if
errorlevel
1
goto
end
perl
util
\mkdef.pl
32
ssleay
>
ms
\ssleay
32.def
perl
util
\mkdef.pl
32
libssl
>
ms
\libssl
32.def
if
errorlevel
1
goto
end
@rem Build the libraries
...
...
@@ -15,9 +15,9 @@ make -f ms/mingw32.mak
if
errorlevel
1
goto
end
@rem Generate the DLLs and input libraries
dllwrap
--dllname
lib
eay32
.dll
--output-lib
out
/libeay
32
.a
--def
ms
/libeay
32
.def
out
/libcrypto
.a
-lws
2
_32
-lgdi
32
dllwrap
--dllname
lib
crypto32
.dll
--output-lib
out
/libcrypto
32
.a
--def
ms
/libcrypto
32
.def
out
/libcrypto
.a
-lws
2
_32
-lgdi
32
if
errorlevel
1
goto
end
dllwrap
--dllname
libssl32
.dll
--output-lib
out
/libssl
32
.a
--def
ms
/
ssleay
32
.def
out
/libssl
.a
out
/libeay
32
.a
dllwrap
--dllname
libssl32
.dll
--output-lib
out
/libssl
32
.a
--def
ms
/
libssl
32
.def
out
/libssl
.a
out
/libcrypto
32
.a
if
errorlevel
1
goto
end
echo
Done
compiling
OpenSSL
...
...
ms/testce.bat
浏览文件 @
6928b617
...
...
@@ -13,8 +13,8 @@ set CERUN_PASS_ENV=OPENSSL_CONF HOME
rem run this from inside the bin directory
rem Copy the DLL's (though they'll only exist if we're in out32dll)
if
exist
lib
eay32
.dll
cecopy
libeay
32
.dll
CE
:\OpenSSL
if
exist
ssleay32
.dll
cecopy
ssleay
32
.dll
CE
:\OpenSSL
if
exist
lib
crypto32
.dll
cecopy
libcrypto
32
.dll
CE
:\OpenSSL
if
exist
libssl32
.dll
cecopy
libssl
32
.dll
CE
:\OpenSSL
echo
rsa_test
call
%test%
\testce2
rsa_test
...
...
test/recipes/01-test_ordinals.t
浏览文件 @
6928b617
...
...
@@ -59,8 +59,8 @@ setup("test_ordinals");
plan
tests
=>
2
;
ok
(
testordinals
(
srctop_file
("
util
",
"
lib
eay.num
")),
"
Test libeay
.num
");
ok
(
testordinals
(
srctop_file
("
util
",
"
ssleay.num
")),
"
Test ssleay
.num
");
ok
(
testordinals
(
srctop_file
("
util
",
"
lib
crypto.num
")),
"
Test libcrypto
.num
");
ok
(
testordinals
(
srctop_file
("
util
",
"
libssl.num
")),
"
Test libssl
.num
");
sub
testordinals
{
...
...
util/do_ms.sh
浏览文件 @
6928b617
...
...
@@ -13,7 +13,7 @@ perl util/mk1mf.pl dll VC-WIN32 >ms/ntdll.mak
perl util/mk1mf.pl Mingw32
>
ms/mingw32.mak
perl util/mk1mf.pl Mingw32-files
>
ms/mingw32f.mak
perl util/mkdef.pl 16 lib
eay
>
ms/libeay
16.def
perl util/mkdef.pl 32 lib
eay
>
ms/libeay
32.def
perl util/mkdef.pl 16
ssleay
>
ms/ssleay
16.def
perl util/mkdef.pl 32
ssleay
>
ms/ssleay
32.def
perl util/mkdef.pl 16 lib
crypto
>
ms/libcrypto
16.def
perl util/mkdef.pl 32 lib
crypto
>
ms/libcrypto
32.def
perl util/mkdef.pl 16
libssl
>
ms/libssl
16.def
perl util/mkdef.pl 32
libssl
>
ms/libssl
32.def
util/mkdef.pl
浏览文件 @
6928b617
...
...
@@ -5,7 +5,7 @@
# It does this by parsing the header files and looking for the
# prototyped functions: it then prunes the output.
#
# Intermediary files are created, call lib
eay.num and ssleay
.num,
# Intermediary files are created, call lib
crypto.num and libssl
.num,
# The format of these files is:
#
# routine-name nnnn vers info
...
...
@@ -44,8 +44,8 @@ use File::Spec::Functions;
my
$debug
=
0
;
my
$crypto_num
=
catfile
(
$config
{
sourcedir
},"
util
","
lib
eay
.num
");
my
$ssl_num
=
catfile
(
$config
{
sourcedir
},"
util
","
ssleay
.num
");
my
$crypto_num
=
catfile
(
$config
{
sourcedir
},"
util
","
lib
crypto
.num
");
my
$ssl_num
=
catfile
(
$config
{
sourcedir
},"
util
","
libssl
.num
");
my
$libname
;
my
$do_update
=
0
;
...
...
@@ -159,12 +159,12 @@ foreach (@ARGV, split(/ /, $config{options}))
$zlib
=
1
;
}
$do_ssl
=
1
if
$_
eq
"
ssleay
";
$do_ssl
=
1
if
$_
eq
"
libssl
";
if
(
$_
eq
"
ssl
")
{
$do_ssl
=
1
;
$libname
=
$_
}
$do_crypto
=
1
if
$_
eq
"
lib
eay
";
$do_crypto
=
1
if
$_
eq
"
lib
crypto
";
if
(
$_
eq
"
crypto
")
{
$do_crypto
=
1
;
$libname
=
$_
;
...
...
@@ -202,10 +202,10 @@ foreach (@ARGV, split(/ /, $config{options}))
if
(
!
$libname
)
{
if
(
$do_ssl
)
{
$libname
=
"
SSLEAY
";
$libname
=
"
LIBSSL
";
}
if
(
$do_crypto
)
{
$libname
=
"
LIB
EAY
";
$libname
=
"
LIB
CRYPTO
";
}
}
...
...
@@ -299,34 +299,34 @@ $crypto.=" include/openssl/kdf.h";
my
$symhacks
=
"
include/openssl/symhacks.h
";
my
@ssl_symbols
=
&do_defs
("
SSLEAY
",
$ssl
,
$symhacks
);
my
@crypto_symbols
=
&do_defs
("
LIB
EAY
",
$crypto
,
$symhacks
);
my
@ssl_symbols
=
&do_defs
("
LIBSSL
",
$ssl
,
$symhacks
);
my
@crypto_symbols
=
&do_defs
("
LIB
CRYPTO
",
$crypto
,
$symhacks
);
if
(
$do_update
)
{
if
(
$do_ssl
==
1
)
{
&maybe_add_info
("
SSLEAY
",
*ssl_list
,
@ssl_symbols
);
&maybe_add_info
("
LIBSSL
",
*ssl_list
,
@ssl_symbols
);
if
(
$do_rewrite
==
1
)
{
open
(
OUT
,
"
>
$ssl_num
");
&rewrite_numbers
(
*OUT
,"
SSLEAY
",
*ssl_list
,
@ssl_symbols
);
&rewrite_numbers
(
*OUT
,"
LIBSSL
",
*ssl_list
,
@ssl_symbols
);
}
else
{
open
(
OUT
,
"
>>
$ssl_num
");
}
&update_numbers
(
*OUT
,"
SSLEAY
",
*ssl_list
,
$max_ssl
,
@ssl_symbols
);
&update_numbers
(
*OUT
,"
LIBSSL
",
*ssl_list
,
$max_ssl
,
@ssl_symbols
);
close
OUT
;
}
if
(
$do_crypto
==
1
)
{
&maybe_add_info
("
LIB
EAY
",
*crypto_list
,
@crypto_symbols
);
&maybe_add_info
("
LIB
CRYPTO
",
*crypto_list
,
@crypto_symbols
);
if
(
$do_rewrite
==
1
)
{
open
(
OUT
,
"
>
$crypto_num
");
&rewrite_numbers
(
*OUT
,"
LIB
EAY
",
*crypto_list
,
@crypto_symbols
);
&rewrite_numbers
(
*OUT
,"
LIB
CRYPTO
",
*crypto_list
,
@crypto_symbols
);
}
else
{
open
(
OUT
,
"
>>
$crypto_num
");
}
&update_numbers
(
*OUT
,"
LIB
EAY
",
*crypto_list
,
$max_crypto
,
@crypto_symbols
);
&update_numbers
(
*OUT
,"
LIB
CRYPTO
",
*crypto_list
,
$max_crypto
,
@crypto_symbols
);
close
OUT
;
}
...
...
@@ -346,10 +346,10 @@ if($do_crypto == 1) {
int main()
{
EOF
&print_test_file
(
*STDOUT
,"
SSLEAY
",
*ssl_list
,
$do_ctestall
,
@ssl_symbols
)
&print_test_file
(
*STDOUT
,"
LIBSSL
",
*ssl_list
,
$do_ctestall
,
@ssl_symbols
)
if
$do_ssl
==
1
;
&print_test_file
(
*STDOUT
,"
LIB
EAY
",
*crypto_list
,
$do_ctestall
,
@crypto_symbols
)
&print_test_file
(
*STDOUT
,"
LIB
CRYPTO
",
*crypto_list
,
$do_ctestall
,
@crypto_symbols
)
if
$do_crypto
==
1
;
print
"
}
\n
";
...
...
util/pl/BC-32.pl
浏览文件 @
6928b617
...
...
@@ -2,8 +2,8 @@
# Borland C++ builder 3 and 4 -- Janez Jere <jj@void.si>
#
$ssl
=
"
ssleay
32
";
$crypto
=
"
lib
eay
32
";
$ssl
=
"
libssl
32
";
$crypto
=
"
lib
crypto
32
";
$o
=
'
\\
';
$cp
=
'
copy
';
...
...
util/pl/VC-32.pl
浏览文件 @
6928b617
...
...
@@ -3,17 +3,17 @@
# Win64 and WinCE [follow $FLAVOR variable to trace the differences].
#
$ssl
=
"
ssleay
32
";
$crypto
=
"
lib
eay
32
";
$ssl
=
"
libssl
32
";
$crypto
=
"
lib
crypto
32
";
if
(
$fips
&&
!
$shlib
)
{
$crypto
=
"
lib
eay
fips32
";
$crypto_compat
=
"
lib
eay
compat32.lib
";
$crypto
=
"
lib
crypto
fips32
";
$crypto_compat
=
"
lib
crypto
compat32.lib
";
}
else
{
$crypto
=
"
lib
eay
32
";
$crypto
=
"
lib
crypto
32
";
}
if
(
$fipscanisterbuild
)
...
...
util/pl/netware.pl
浏览文件 @
6928b617
...
...
@@ -90,8 +90,8 @@ $include_path = join(" -I", split(/;/, $include_path));
# check for gcc compiler
$gnuc
=
$ENV
{"
GNUC
"};
#$ssl= "
ssleay
32";
#$crypto="lib
eay
32";
#$ssl= "
libssl
32";
#$crypto="lib
crypto
32";
if
(
$gnuc
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录