Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
5d439d69
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
5d439d69
编写于
2月 17, 2011
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make -DOPENSSL_FIPSSYMS work for assembly language builds.
上级
38bae7ba
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
30 addition
and
6 deletion
+30
-6
CHANGES
CHANGES
+3
-2
Makefile.fips
Makefile.fips
+7
-2
Makefile.org
Makefile.org
+7
-2
util/fipsas.pl
util/fipsas.pl
+13
-0
未找到文件。
CHANGES
浏览文件 @
5d439d69
...
...
@@ -6,8 +6,9 @@
*) Add experimental option FIPSSYMS to give all symbols in
fipscanister.o and FIPS or fips prefix. This will avoid
conflicts with future versions of OpenSSL. Only works for
no-asm at present.
conflicts with future versions of OpenSSL. Add perl script
util/fipsas.pl to preprocess assembly language source files
and rename any affected symbols.
[Steve Henson]
*) Add selftest checks and algorithm block of non-fips algorithms in
...
...
Makefile.fips
浏览文件 @
5d439d69
...
...
@@ -78,7 +78,7 @@ LIBDIR=lib
# dependent assembler flags. E.g. if you throw -mcpu=ultrasparc at SPARC
# gcc, then the driver will automatically translate it to -xarch=v8plus
# and pass it down to assembler.
AS
=
$(CC)
-c
#
AS=$(CC) -c
ASFLAG
=
$(CFLAG)
# For x86 assembler: Set PROCESSOR to 386 if you want to support
...
...
@@ -205,7 +205,7 @@ CLEARENV= TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS} \
BUILDENV
=
PLATFORM
=
'
$(PLATFORM)
'
PROCESSOR
=
'
$(PROCESSOR)
'
\
CC
=
'
$(CC)
'
CFLAG
=
'
$(CFLAG)
'
\
AS
=
'
$(CC)
'
AS
FLAG
=
'
$(CFLAG)
-c'
\
ASFLAG
=
'
$(CFLAG)
-c'
\
AR
=
'
$(AR)
'
NM
=
'
$(NM)
'
RANLIB
=
'
$(RANLIB)
'
\
CROSS_COMPILE
=
'
$(CROSS_COMPILE)
'
\
PERL
=
'
$(PERL)
'
ENGDIRS
=
'
$(ENGDIRS)
'
\
...
...
@@ -367,6 +367,11 @@ build_crypto:
else
\
ARX
=
'
${AR}
'
;
\
fi
;
export
ARX
;
\
if
[
$(FIPSCANISTERINTERNAL)
=
"y"
]
;
then
\
AS
=
'
$(PERL)
$
${TOP}
/util/fipsas.pl $
${TOP}
$${<}
$(CC)
'
;
\
else
\
AS
=
'
$(CC)
-c'
;
\
fi
;
export
AS
;
\
dir
=
crypto
;
target
=
all
;
$(BUILD_ONE_CMD)
build_ssl
:
@
dir
=
ssl
;
target
=
all
;
$(BUILD_ONE_CMD)
...
...
Makefile.org
浏览文件 @
5d439d69
...
...
@@ -78,7 +78,7 @@ LIBDIR=lib
# dependent assembler flags. E.g. if you throw -mcpu=ultrasparc at SPARC
# gcc, then the driver will automatically translate it to -xarch=v8plus
# and pass it down to assembler.
AS
=
$(CC)
-c
#
AS=$(CC) -c
ASFLAG
=
$(CFLAG)
# For x86 assembler: Set PROCESSOR to 386 if you want to support
...
...
@@ -205,7 +205,7 @@ CLEARENV= TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS} \
BUILDENV
=
PLATFORM
=
'
$(PLATFORM)
'
PROCESSOR
=
'
$(PROCESSOR)
'
\
CC
=
'
$(CC)
'
CFLAG
=
'
$(CFLAG)
'
\
AS
=
'
$(CC)
'
AS
FLAG
=
'
$(CFLAG)
-c'
\
ASFLAG
=
'
$(CFLAG)
-c'
\
AR
=
'
$(AR)
'
NM
=
'
$(NM)
'
RANLIB
=
'
$(RANLIB)
'
\
CROSS_COMPILE
=
'
$(CROSS_COMPILE)
'
\
PERL
=
'
$(PERL)
'
ENGDIRS
=
'
$(ENGDIRS)
'
\
...
...
@@ -367,6 +367,11 @@ build_crypto:
else
\
ARX
=
'
${AR}
'
;
\
fi
;
export
ARX
;
\
if
[
$(FIPSCANISTERINTERNAL)
=
"y"
]
;
then
\
AS
=
'
$(PERL)
$
${TOP}
/util/fipsas.pl $
${TOP}
$${<}
$(CC)
-c'
;
\
else
\
AS
=
'
$(CC)
-c'
;
\
fi
;
export
AS
;
\
dir
=
crypto
;
target
=
all
;
$(BUILD_ONE_CMD)
build_ssl
:
@
dir
=
ssl
;
target
=
all
;
$(BUILD_ONE_CMD)
...
...
util/fipsas.pl
浏览文件 @
5d439d69
...
...
@@ -9,6 +9,19 @@ my @ARGS = @ARGV;
my
$top
=
shift
@ARGS
;
my
$target
=
shift
@ARGS
;
# HACK to disable operation if no OPENSSL_FIPSSYMS option.
# will go away when tested more fully.
my
$enabled
=
0
;
foreach
(
@ARGS
)
{
$enabled
=
1
if
/-DOPENSSL_FIPSSYMS/
;
}
if
(
$enabled
==
0
)
{
system
@ARGS
;
exit
$?
}
# Open symbol rename file.
open
(
IN
,
"
$top
/fips/fipssyms.h
")
||
die
"
Can't open fipssyms.h
";
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录