Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
openssl
提交
c876a4b7
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,发现更多精彩内容 >>
提交
c876a4b7
编写于
2月 14, 2011
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Include support for an add_lock callback to tiny FIPS locking API.
上级
c9661204
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
24 addition
and
7 deletion
+24
-7
crypto/lock.c
crypto/lock.c
+2
-2
fips/fips.h
fips/fips.h
+5
-2
fips/utl/fips_lck.c
fips/utl/fips_lck.c
+16
-2
util/libeay.num
util/libeay.num
+1
-1
未找到文件。
crypto/lock.c
浏览文件 @
c876a4b7
...
...
@@ -384,7 +384,7 @@ void CRYPTO_set_dynlock_lock_callback(void (*func)(int mode,
struct
CRYPTO_dynlock_value
*
l
,
const
char
*
file
,
int
line
))
{
#ifdef OPENSSL_FIPS
FIPS_set_locking_callback
(
CRYPTO
_lock
);
FIPS_set_locking_callback
s
(
CRYPTO_lock
,
CRYPTO_add
_lock
);
#endif
dynlock_lock_callback
=
func
;
}
...
...
@@ -412,7 +412,7 @@ void CRYPTO_set_locking_callback(void (*func)(int mode,int type,
const
char
*
file
,
int
line
))
{
#ifdef OPENSSL_FIPS
FIPS_set_locking_callback
(
CRYPTO
_lock
);
FIPS_set_locking_callback
s
(
CRYPTO_lock
,
CRYPTO_add
_lock
);
#endif
locking_callback
=
func
;
}
...
...
fips/fips.h
浏览文件 @
c876a4b7
...
...
@@ -109,14 +109,17 @@ int fips_cipher_test(struct evp_cipher_ctx_st *ctx,
void
fips_set_selftest_fail
(
void
);
int
fips_check_rsa
(
struct
rsa_st
*
rsa
);
void
FIPS_set_locking_callback
(
void
(
*
func
)(
int
mode
,
int
type
,
const
char
*
file
,
int
line
));
void
FIPS_set_locking_callbacks
(
void
(
*
func
)(
int
mode
,
int
type
,
const
char
*
file
,
int
line
),
int
(
*
add_cb
)(
int
*
pointer
,
int
amount
,
int
type
,
const
char
*
file
,
int
line
));
/* Where necessary redirect standard OpenSSL APIs to FIPS versions */
#if defined(OPENSSL_FIPSCANISTER) && defined(OPENSSL_FIPSAPI)
#define CRYPTO_lock FIPS_lock
#define CRYPTO_add_lock FIPS_add_lock
#define CRYPTO_malloc FIPS_malloc
#define CRYPTO_free FIPS_free
...
...
fips/utl/fips_lck.c
浏览文件 @
c876a4b7
...
...
@@ -59,6 +59,8 @@
/* FIPS locking callbacks */
static
void
(
*
fips_lck_cb
)(
int
mode
,
int
type
,
const
char
*
file
,
int
line
)
=
0
;
static
int
(
*
fips_add_cb
)(
int
*
pointer
,
int
amount
,
int
type
,
const
char
*
file
,
int
line
);
void
FIPS_lock
(
int
mode
,
int
type
,
const
char
*
file
,
int
line
)
{
...
...
@@ -66,8 +68,20 @@ void FIPS_lock(int mode, int type,const char *file,int line)
fips_lck_cb
(
mode
,
type
,
file
,
line
);
}
void
FIPS_set_locking_callback
(
void
(
*
func
)(
int
mode
,
int
type
,
const
char
*
file
,
int
line
))
void
FIPS_set_locking_callbacks
(
void
(
*
func
)(
int
mode
,
int
type
,
const
char
*
file
,
int
line
),
int
(
*
add_cb
)(
int
*
pointer
,
int
amount
,
int
type
,
const
char
*
file
,
int
line
))
{
fips_lck_cb
=
func
;
fips_add_cb
=
add_cb
;
}
int
FIPS_add_lock
(
int
*
pointer
,
int
amount
,
int
type
,
const
char
*
file
,
int
line
)
{
if
(
fips_add_cb
)
return
fips_add_cb
(
pointer
,
amount
,
type
,
file
,
line
);
*
pointer
+=
amount
;
return
*
pointer
;
}
util/libeay.num
浏览文件 @
c876a4b7
...
...
@@ -4251,7 +4251,7 @@ ASN1_SCTX_new 4621 EXIST::FUNCTION:
EC_GFp_nistp224_method 4622 EXIST:!WIN32:FUNCTION:EC
FIPS_rsa_verify_ctx 4623 EXIST:OPENSSL_FIPS:FUNCTION:RSA
FIPS_selftest 4624 EXIST:OPENSSL_FIPS:FUNCTION:
FIPS_set_locking_callback
4625 EXIST:OPENSSL_FIPS:FUNCTION:
FIPS_set_locking_callback
s
4625 EXIST:OPENSSL_FIPS:FUNCTION:
fips_set_selftest_fail 4626 EXIST:OPENSSL_FIPS:FUNCTION:
fips_check_rsa 4627 EXIST:OPENSSL_FIPS:FUNCTION:
FIPS_check_incore_fingerprint 4628 EXIST:OPENSSL_FIPS:FUNCTION:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录