Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
c05353c5
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
大约 1 年 前同步成功
通知
9
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,发现更多精彩内容 >>
提交
c05353c5
编写于
6月 17, 2009
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename asc2uni and uni2asc functions to avoid clashes.
上级
73ea4160
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
14 addition
and
9 deletion
+14
-9
CHANGES
CHANGES
+5
-0
apps/pkcs12.c
apps/pkcs12.c
+1
-1
crypto/pkcs12/p12_attr.c
crypto/pkcs12/p12_attr.c
+1
-1
crypto/pkcs12/p12_key.c
crypto/pkcs12/p12_key.c
+1
-1
crypto/pkcs12/p12_utl.c
crypto/pkcs12/p12_utl.c
+2
-2
crypto/pkcs12/pkcs12.h
crypto/pkcs12/pkcs12.h
+2
-2
util/libeay.num
util/libeay.num
+2
-2
未找到文件。
CHANGES
浏览文件 @
c05353c5
...
...
@@ -4,6 +4,11 @@
Changes between 0.9.8k and 1.0 [xx XXX xxxx]
*) Rename uni2asc and asc2uni functions to OPENSSL_uni2asc and
OPENSSL_asc2uni the original names were too generic and cause name
clashes on Netware.
[Guenter <lists@gknw.net>]
*) Add ECDHE and PSK support to DTLS.
[Michael Tuexen <tuexen@fh-muenster.de>]
...
...
apps/pkcs12.c
浏览文件 @
c05353c5
...
...
@@ -923,7 +923,7 @@ int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name)
av
=
sk_ASN1_TYPE_value
(
attr
->
value
.
set
,
0
);
switch
(
av
->
type
)
{
case
V_ASN1_BMPSTRING
:
value
=
uni2asc
(
av
->
value
.
bmpstring
->
data
,
value
=
OPENSSL_
uni2asc
(
av
->
value
.
bmpstring
->
data
,
av
->
value
.
bmpstring
->
length
);
BIO_printf
(
out
,
"%s
\n
"
,
value
);
OPENSSL_free
(
value
);
...
...
crypto/pkcs12/p12_attr.c
浏览文件 @
c05353c5
...
...
@@ -139,7 +139,7 @@ char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag)
ASN1_TYPE
*
atype
;
if
(
!
(
atype
=
PKCS12_get_attr
(
bag
,
NID_friendlyName
)))
return
NULL
;
if
(
atype
->
type
!=
V_ASN1_BMPSTRING
)
return
NULL
;
return
uni2asc
(
atype
->
value
.
bmpstring
->
data
,
return
OPENSSL_
uni2asc
(
atype
->
value
.
bmpstring
->
data
,
atype
->
value
.
bmpstring
->
length
);
}
crypto/pkcs12/p12_key.c
浏览文件 @
c05353c5
...
...
@@ -85,7 +85,7 @@ int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt,
if
(
!
pass
)
{
unipass
=
NULL
;
uniplen
=
0
;
}
else
if
(
!
asc2uni
(
pass
,
passlen
,
&
unipass
,
&
uniplen
))
{
}
else
if
(
!
OPENSSL_
asc2uni
(
pass
,
passlen
,
&
unipass
,
&
uniplen
))
{
PKCS12err
(
PKCS12_F_PKCS12_KEY_GEN_ASC
,
ERR_R_MALLOC_FAILURE
);
return
0
;
}
...
...
crypto/pkcs12/p12_utl.c
浏览文件 @
c05353c5
...
...
@@ -62,7 +62,7 @@
/* Cheap and nasty Unicode stuff */
unsigned
char
*
asc2uni
(
const
char
*
asc
,
int
asclen
,
unsigned
char
**
uni
,
int
*
unilen
)
unsigned
char
*
OPENSSL_
asc2uni
(
const
char
*
asc
,
int
asclen
,
unsigned
char
**
uni
,
int
*
unilen
)
{
int
ulen
,
i
;
unsigned
char
*
unitmp
;
...
...
@@ -81,7 +81,7 @@ unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *un
return
unitmp
;
}
char
*
uni2asc
(
unsigned
char
*
uni
,
int
unilen
)
char
*
OPENSSL_
uni2asc
(
unsigned
char
*
uni
,
int
unilen
)
{
int
asclen
,
i
;
char
*
asctmp
;
...
...
crypto/pkcs12/pkcs12.h
浏览文件 @
c05353c5
...
...
@@ -230,8 +230,8 @@ int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
const
EVP_MD
*
md_type
);
int
PKCS12_setup_mac
(
PKCS12
*
p12
,
int
iter
,
unsigned
char
*
salt
,
int
saltlen
,
const
EVP_MD
*
md_type
);
unsigned
char
*
asc2uni
(
const
char
*
asc
,
int
asclen
,
unsigned
char
**
uni
,
int
*
unilen
);
char
*
uni2asc
(
unsigned
char
*
uni
,
int
unilen
);
unsigned
char
*
OPENSSL_
asc2uni
(
const
char
*
asc
,
int
asclen
,
unsigned
char
**
uni
,
int
*
unilen
);
char
*
OPENSSL_
uni2asc
(
unsigned
char
*
uni
,
int
unilen
);
DECLARE_ASN1_FUNCTIONS
(
PKCS12
)
DECLARE_ASN1_FUNCTIONS
(
PKCS12_MAC_DATA
)
...
...
util/libeay.num
浏览文件 @
c05353c5
...
...
@@ -1255,8 +1255,8 @@ PKCS12_gen_mac 1278 EXIST::FUNCTION:
PKCS12_verify_mac 1279 EXIST::FUNCTION:
PKCS12_set_mac 1280 EXIST::FUNCTION:
PKCS12_setup_mac 1281 EXIST::FUNCTION:
asc2uni
1282 EXIST::FUNCTION:
uni2asc
1283 EXIST::FUNCTION:
OPENSSL_asc2uni
1282 EXIST::FUNCTION:
OPENSSL_uni2asc
1283 EXIST::FUNCTION:
i2d_PKCS12_BAGS 1284 EXIST::FUNCTION:
PKCS12_BAGS_new 1285 EXIST::FUNCTION:
d2i_PKCS12_BAGS 1286 EXIST::FUNCTION:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录