Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
openssl
提交
536a1643
O
openssl
项目概览
btwise
/
openssl
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
536a1643
编写于
10月 27, 2012
作者:
A
Andy Polyakov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
util/fipslink.pl: further adjustments.
上级
7f5bf370
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
4 deletion
+23
-4
fips/sha/Makefile
fips/sha/Makefile
+2
-1
test/Makefile
test/Makefile
+1
-0
util/fipslink.pl
util/fipslink.pl
+20
-3
未找到文件。
fips/sha/Makefile
浏览文件 @
536a1643
...
@@ -30,7 +30,8 @@ LIB=$(TOP)/libcrypto.a
...
@@ -30,7 +30,8 @@ LIB=$(TOP)/libcrypto.a
LIBSRC
=
fips_sha1_selftest.c
LIBSRC
=
fips_sha1_selftest.c
LIBOBJ
=
fips_sha1_selftest.o
LIBOBJ
=
fips_sha1_selftest.o
SRC
=
$(LIBSRC)
fips_standalone_sha1.c
SRC
=
$(LIBSRC)
PROGS
=
fips_standalone_sha1.c
EXHEADER
=
EXHEADER
=
HEADER
=
HEADER
=
...
...
test/Makefile
浏览文件 @
536a1643
...
@@ -12,6 +12,7 @@ PERL= perl
...
@@ -12,6 +12,7 @@ PERL= perl
# KRB5 stuff
# KRB5 stuff
KRB5_INCLUDES
=
KRB5_INCLUDES
=
LIBKRB5
=
LIBKRB5
=
TEST
=
fips_algvs.c
PEX_LIBS
=
PEX_LIBS
=
EX_LIBS
=
#-lnsl -lsocket
EX_LIBS
=
#-lnsl -lsocket
...
...
util/fipslink.pl
浏览文件 @
536a1643
...
@@ -33,12 +33,12 @@ check_hash($sha1_exe, "fipscanister.lib");
...
@@ -33,12 +33,12 @@ check_hash($sha1_exe, "fipscanister.lib");
print
"
Integrity check OK
\n
";
print
"
Integrity check OK
\n
";
if
(
grep
/fips_premain\.obj/
,
@ARGV
)
{
if
(
is_premain_linked
(
@ARGV
)
)
{
print
"
$fips_cc
$fips_cc_args
$fips_libdir
/fips_premain.c
\n
";
print
"
$fips_cc
$fips_cc_args
$fips_libdir
/fips_premain.c
\n
";
system
"
$fips_cc
$fips_cc_args
$fips_libdir
/fips_premain.c
";
system
"
$fips_cc
$fips_cc_args
$fips_libdir
/fips_premain.c
";
die
"
First stage Compile failure
"
if
$?
!=
0
;
die
"
First stage Compile failure
"
if
$?
!=
0
;
}
elsif
(
!
defined
(
$ENV
{
FIPS_SIG
}))
{
}
elsif
(
!
defined
(
$ENV
{
FIPS_SIG
}))
{
die
"
no fips_premain.obj
";
die
"
no fips_premain.obj
linked
";
}
}
print
"
$fips_link
@ARGV
\n
";
print
"
$fips_link
@ARGV
\n
";
...
@@ -46,7 +46,8 @@ system "$fips_link @ARGV";
...
@@ -46,7 +46,8 @@ system "$fips_link @ARGV";
die
"
First stage Link failure
"
if
$?
!=
0
;
die
"
First stage Link failure
"
if
$?
!=
0
;
if
(
defined
(
$ENV
{
FIPS_SIG
}))
{
if
(
defined
(
$ENV
{
FIPS_SIG
}))
{
system
"
$ENV
{FIPS_SIG}
$fips_target
"
print
"
$ENV
{FIPS_SIG}
$fips_target
\n
";
system
"
$ENV
{FIPS_SIG}
$fips_target
";
die
"
$ENV
{FIPS_SIG}
$fips_target
failed
"
if
$?
!=
0
;
die
"
$ENV
{FIPS_SIG}
$fips_target
failed
"
if
$?
!=
0
;
exit
;
exit
;
}
}
...
@@ -71,6 +72,22 @@ print "$fips_link @ARGV\n";
...
@@ -71,6 +72,22 @@ print "$fips_link @ARGV\n";
system
"
$fips_link
@ARGV
";
system
"
$fips_link
@ARGV
";
die
"
Second stage Link failure
"
if
$?
!=
0
;
die
"
Second stage Link failure
"
if
$?
!=
0
;
sub
is_premain_linked
{
return
1
if
(
grep
/fips_premain\.obj/
,
@
_
);
foreach
(
@
_
)
{
if
(
/^@(.*)/
&&
-
f
$
1
)
{
open
FD
,
$
1
or
die
"
can't open $1
";
my
$ret
=
(
grep
/fips_premain\.obj/
,
<
FD
>
)?
1
:
0
;
close
FD
;
return
$ret
;
}
}
return
0
;
}
sub
check_hash
sub
check_hash
{
{
my
(
$sha1_exe
,
$filename
)
=
@_
;
my
(
$sha1_exe
,
$filename
)
=
@_
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录