Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
f68854b4
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
接近 2 年 前同步成功
通知
12
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看板
提交
f68854b4
编写于
4月 19, 2005
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Various Win32 and other fixes for warnings and compilation errors.
Fix Win32 build system to use 'Makefile' instead of 'Makefile.ssl'.
上级
1cfd258e
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
11 addition
and
9 deletion
+11
-9
apps/apps.c
apps/apps.c
+1
-1
apps/apps.h
apps/apps.h
+1
-1
crypto/pem/pem_info.c
crypto/pem/pem_info.c
+1
-1
crypto/rand/rand_win.c
crypto/rand/rand_win.c
+2
-1
crypto/stack/safestack.h
crypto/stack/safestack.h
+2
-2
crypto/x509/x509_vfy.c
crypto/x509/x509_vfy.c
+2
-1
util/mk1mf.pl
util/mk1mf.pl
+1
-1
util/mkfiles.pl
util/mkfiles.pl
+1
-1
未找到文件。
apps/apps.c
浏览文件 @
f68854b4
...
@@ -2146,7 +2146,7 @@ error:
...
@@ -2146,7 +2146,7 @@ error:
/* This code MUST COME AFTER anything that uses rename() */
/* This code MUST COME AFTER anything that uses rename() */
#ifdef OPENSSL_SYS_WIN32
#ifdef OPENSSL_SYS_WIN32
int
WIN32_rename
(
c
har
*
from
,
char
*
to
)
int
WIN32_rename
(
c
onst
char
*
from
,
const
char
*
to
)
{
{
#ifndef OPENSSL_SYS_WINCE
#ifndef OPENSSL_SYS_WINCE
/* Windows rename gives an error if 'to' exists, so delete it
/* Windows rename gives an error if 'to' exists, so delete it
...
...
apps/apps.h
浏览文件 @
f68854b4
...
@@ -136,7 +136,7 @@ long app_RAND_load_files(char *file); /* `file' is a list of files to read,
...
@@ -136,7 +136,7 @@ long app_RAND_load_files(char *file); /* `file' is a list of files to read,
#ifdef OPENSSL_SYS_WIN32
#ifdef OPENSSL_SYS_WIN32
#define rename(from,to) WIN32_rename((from),(to))
#define rename(from,to) WIN32_rename((from),(to))
int
WIN32_rename
(
c
har
*
oldname
,
char
*
newname
);
int
WIN32_rename
(
c
onst
char
*
oldname
,
const
char
*
newname
);
#endif
#endif
#ifndef MONOLITH
#ifndef MONOLITH
...
...
crypto/pem/pem_info.c
浏览文件 @
f68854b4
...
@@ -186,7 +186,7 @@ start:
...
@@ -186,7 +186,7 @@ start:
#ifndef OPENSSL_NO_DSA
#ifndef OPENSSL_NO_DSA
if
(
strcmp
(
name
,
PEM_STRING_DSA
)
==
0
)
if
(
strcmp
(
name
,
PEM_STRING_DSA
)
==
0
)
{
{
(
D2I_OF
(
R
SA
))
d2i
=
d2i_DSAPrivateKey
;
(
D2I_OF
(
D
SA
))
d2i
=
d2i_DSAPrivateKey
;
if
(
xi
->
x_pkey
!=
NULL
)
if
(
xi
->
x_pkey
!=
NULL
)
{
{
if
(
!
sk_X509_INFO_push
(
ret
,
xi
))
goto
err
;
if
(
!
sk_X509_INFO_push
(
ret
,
xi
))
goto
err
;
...
...
crypto/rand/rand_win.c
浏览文件 @
f68854b4
...
@@ -558,7 +558,8 @@ int RAND_poll(void)
...
@@ -558,7 +558,8 @@ int RAND_poll(void)
if
(
module_first
(
handle
,
&
m
))
if
(
module_first
(
handle
,
&
m
))
do
do
RAND_add
(
&
m
,
m
.
dwSize
,
9
);
RAND_add
(
&
m
,
m
.
dwSize
,
9
);
while
(
module_next
(
handle
,
&
m
)
&&
GetTickCount
<
stoptime
);
while
(
module_next
(
handle
,
&
m
)
&&
(
GetTickCount
()
<
stoptime
));
if
(
close_snap
)
if
(
close_snap
)
close_snap
(
handle
);
close_snap
(
handle
);
else
else
...
...
crypto/stack/safestack.h
浏览文件 @
f68854b4
...
@@ -194,14 +194,14 @@ STACK_OF(type) \
...
@@ -194,14 +194,14 @@ STACK_OF(type) \
sk_is_sorted(st)
sk_is_sorted(st)
#define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
#define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
d2i_ASN1_SET(st,pp,length, (char *(*)())d2i_func, (void (*)(void *))free_func, ex_tag,ex_class)
d2i_ASN1_SET(st,pp,length, (char *(*)(
void ** ,const unsigned char ** ,long
))d2i_func, (void (*)(void *))free_func, ex_tag,ex_class)
#define SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \
#define SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \
i2d_ASN1_SET(st,pp,i2d_func,ex_tag,ex_class,is_set)
i2d_ASN1_SET(st,pp,i2d_func,ex_tag,ex_class,is_set)
#define SKM_ASN1_seq_pack(type, st, i2d_func, buf, len) \
#define SKM_ASN1_seq_pack(type, st, i2d_func, buf, len) \
ASN1_seq_pack(st, i2d_func, buf, len)
ASN1_seq_pack(st, i2d_func, buf, len)
#define SKM_ASN1_seq_unpack(type, buf, len, d2i_func, free_func) \
#define SKM_ASN1_seq_unpack(type, buf, len, d2i_func, free_func) \
ASN1_seq_unpack(buf,len,(char *(*)(void *,unsigned char **,long))d2i_func, (void(*)(void *))free_func)
ASN1_seq_unpack(buf,len,(char *(*)(void *,
const
unsigned char **,long))d2i_func, (void(*)(void *))free_func)
#define SKM_PKCS12_decrypt_d2i(type, algor, d2i_func, free_func, pass, passlen, oct, seq) \
#define SKM_PKCS12_decrypt_d2i(type, algor, d2i_func, free_func, pass, passlen, oct, seq) \
((STACK *)PKCS12_decrypt_d2i(algor,(char *(*)())d2i_func, (void(*)(void *))free_func,pass,passlen,oct,seq))
((STACK *)PKCS12_decrypt_d2i(algor,(char *(*)())d2i_func, (void(*)(void *))free_func,pass,passlen,oct,seq))
...
...
crypto/x509/x509_vfy.c
浏览文件 @
f68854b4
...
@@ -390,7 +390,8 @@ static int check_chain_extensions(X509_STORE_CTX *ctx)
...
@@ -390,7 +390,8 @@ static int check_chain_extensions(X509_STORE_CTX *ctx)
X509
*
x
;
X509
*
x
;
int
(
*
cb
)(
int
ok
,
X509_STORE_CTX
*
ctx
);
int
(
*
cb
)(
int
ok
,
X509_STORE_CTX
*
ctx
);
int
proxy_path_length
=
0
;
int
proxy_path_length
=
0
;
int
allow_proxy_certs
=
!!
(
ctx
->
flags
&
X509_V_FLAG_ALLOW_PROXY_CERTS
);
int
allow_proxy_certs
=
!!
(
ctx
->
param
->
flags
&
X509_V_FLAG_ALLOW_PROXY_CERTS
);
cb
=
ctx
->
verify_cb
;
cb
=
ctx
->
verify_cb
;
/* must_be_ca can have 1 of 3 values:
/* must_be_ca can have 1 of 3 values:
...
...
util/mk1mf.pl
浏览文件 @
f68854b4
...
@@ -10,7 +10,7 @@ $OPTIONS="";
...
@@ -10,7 +10,7 @@ $OPTIONS="";
$ssl_version
=
"";
$ssl_version
=
"";
$banner
=
"
\t\@
echo Building OpenSSL
";
$banner
=
"
\t\@
echo Building OpenSSL
";
open
(
IN
,"
<Makefile
.ssl
")
||
die
"
unable to open Makefile.ssl
!
\n
";
open
(
IN
,"
<Makefile
")
||
die
"
unable to open Makefile
!
\n
";
while
(
<
IN
>
)
{
while
(
<
IN
>
)
{
$ssl_version
=
$
1
if
(
/^VERSION=(.*)$/
);
$ssl_version
=
$
1
if
(
/^VERSION=(.*)$/
);
$OPTIONS
=
$
1
if
(
/^OPTIONS=(.*)$/
);
$OPTIONS
=
$
1
if
(
/^OPTIONS=(.*)$/
);
...
...
util/mkfiles.pl
浏览文件 @
f68854b4
...
@@ -62,7 +62,7 @@ my @dirs = (
...
@@ -62,7 +62,7 @@ my @dirs = (
);
);
foreach
(
@dirs
)
{
foreach
(
@dirs
)
{
&files_dir
(
$_
,
"
Makefile
.ssl
");
&files_dir
(
$_
,
"
Makefile
");
}
}
exit
(
0
);
exit
(
0
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录