Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
74e3931f
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,发现更多精彩内容 >>
提交
74e3931f
编写于
10月 06, 2002
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Various Win32 fixes.
Resolve signed/unsigned conflicts Make dso_win32.c compile.
上级
12dadc55
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
26 addition
and
9 deletion
+26
-9
crypto/asn1/t_pkey.c
crypto/asn1/t_pkey.c
+1
-1
crypto/dso/dso_win32.c
crypto/dso/dso_win32.c
+24
-7
crypto/engine/hw_cswift.c
crypto/engine/hw_cswift.c
+1
-1
未找到文件。
crypto/asn1/t_pkey.c
浏览文件 @
74e3931f
...
...
@@ -627,7 +627,7 @@ static int print(BIO *bp, const char *number, BIGNUM *num, unsigned char *buf,
static
int
print_bin
(
BIO
*
fp
,
const
char
*
name
,
const
unsigned
char
*
buf
,
size_t
len
,
int
off
)
{
in
t
i
;
size_
t
i
;
char
str
[
128
];
if
(
buf
==
NULL
)
...
...
crypto/dso/dso_win32.c
浏览文件 @
74e3931f
...
...
@@ -86,6 +86,8 @@ static char *win32_name_converter(DSO *dso, const char *filename);
static
char
*
win32_merger
(
DSO
*
dso
,
const
char
*
filespec1
,
const
char
*
filespec2
);
static
const
char
*
openssl_strnchr
(
const
char
*
string
,
int
c
,
size_t
len
);
static
DSO_METHOD
dso_meth_win32
=
{
"OpenSSL 'win32' shared library method"
,
win32_load
,
...
...
@@ -258,7 +260,7 @@ struct file_st
const
char
*
predir
;
int
predirlen
;
const
char
*
dir
;
int
dirlen
;
const
char
*
file
;
int
filelen
;
}
}
;
static
struct
file_st
*
win32_splitter
(
DSO
*
dso
,
const
char
*
filename
,
int
assume_last_is_dir
)
...
...
@@ -270,7 +272,8 @@ static struct file_st *win32_splitter(DSO *dso, const char *filename,
if
(
!
filename
)
{
DSOerr
(
DSO_F_WIN32_MERGER
,
DSO_R_NO_FILENAME
);
goto
err
;
/*goto err;*/
return
(
NULL
);
}
result
=
OPENSSL_malloc
(
sizeof
(
struct
file_st
));
...
...
@@ -302,7 +305,8 @@ static struct file_st *win32_splitter(DSO *dso, const char *filename,
{
DSOerr
(
DSO_F_WIN32_MERGER
,
DSO_R_INCORRECT_FILE_SYNTAX
);
goto
err
;
/*goto err;*/
return
(
NULL
);
}
result
->
device
=
start
;
result
->
devicelen
=
filename
-
start
;
...
...
@@ -354,14 +358,14 @@ static struct file_st *win32_splitter(DSO *dso, const char *filename,
while
(
*
filename
);
if
(
!
result
->
nodelen
)
result
->
node
=
NULL
;
if
(
!
result
->
devicelen
)
result
->
devic
c
e
=
NULL
;
if
(
!
result
->
devicelen
)
result
->
device
=
NULL
;
if
(
!
result
->
dirlen
)
result
->
dir
=
NULL
;
if
(
!
result
->
filelen
)
result
->
file
=
NULL
;
return
(
result
);
}
static
char
*
win32_joiner
(
DSO
*
dso
,
const
file_st
*
file_split
)
static
char
*
win32_joiner
(
DSO
*
dso
,
const
struct
file_st
*
file_split
)
{
int
len
=
0
,
offset
=
0
;
char
*
result
=
NULL
;
...
...
@@ -428,7 +432,7 @@ static char *win32_joiner(DSO *dso, const file_st *file_split)
start
=
file_split
->
predir
;
while
(
file_split
->
predirlen
>
(
start
-
file_split
->
predir
))
{
const
char
*
end
=
strnchr
(
start
,
'/'
,
const
char
*
end
=
openssl_
strnchr
(
start
,
'/'
,
file_split
->
predirlen
-
(
start
-
file_split
->
predir
));
if
(
!
end
)
end
=
start
...
...
@@ -446,7 +450,7 @@ static char *win32_joiner(DSO *dso, const file_st *file_split)
start
=
file_split
->
dir
;
while
(
file_split
->
dirlen
>
(
start
-
file_split
->
dir
))
{
const
char
*
end
=
strnchr
(
start
,
'/'
,
const
char
*
end
=
openssl_
strnchr
(
start
,
'/'
,
file_split
->
dirlen
-
(
start
-
file_split
->
dir
));
if
(
!
end
)
end
=
start
...
...
@@ -577,4 +581,17 @@ static char *win32_name_converter(DSO *dso, const char *filename)
return
(
translated
);
}
static
const
char
*
openssl_strnchr
(
const
char
*
string
,
int
c
,
size_t
len
)
{
size_t
i
;
const
char
*
p
;
for
(
i
=
0
,
p
=
string
;
i
<
len
&&
*
p
;
i
++
,
p
++
)
{
if
(
*
p
==
c
)
return
p
;
}
return
NULL
;
}
#endif
/* OPENSSL_SYS_WIN32 */
crypto/engine/hw_cswift.c
浏览文件 @
74e3931f
...
...
@@ -939,7 +939,7 @@ static int cswift_rand_bytes(unsigned char *buf, int num)
}
acquired
=
1
;
while
(
nbytes
<
num
)
while
(
nbytes
<
(
size_t
)
num
)
{
/* tell CryptoSwift how many bytes we want and where we want it.
* Note: - CryptoSwift cannot do more than 4096 bytes at a time.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录