Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
e77dbf32
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,发现更多精彩内容 >>
提交
e77dbf32
编写于
5月 17, 2007
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Prepend signature name in dgst output.
上级
f03620ea
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
36 addition
and
19 deletion
+36
-19
apps/dgst.c
apps/dgst.c
+30
-19
crypto/asn1/ameth_lib.c
crypto/asn1/ameth_lib.c
+5
-0
crypto/evp/evp.h
crypto/evp/evp.h
+1
-0
未找到文件。
apps/dgst.c
浏览文件 @
e77dbf32
...
@@ -75,7 +75,8 @@
...
@@ -75,7 +75,8 @@
#define PROG dgst_main
#define PROG dgst_main
int
do_fp
(
BIO
*
out
,
unsigned
char
*
buf
,
BIO
*
bp
,
int
sep
,
int
binout
,
int
do_fp
(
BIO
*
out
,
unsigned
char
*
buf
,
BIO
*
bp
,
int
sep
,
int
binout
,
EVP_PKEY
*
key
,
unsigned
char
*
sigin
,
int
siglen
,
const
char
*
title
,
EVP_PKEY
*
key
,
unsigned
char
*
sigin
,
int
siglen
,
const
char
*
sig_name
,
const
char
*
md_name
,
const
char
*
file
,
BIO
*
bmd
);
const
char
*
file
,
BIO
*
bmd
);
int
MAIN
(
int
,
char
**
);
int
MAIN
(
int
,
char
**
);
...
@@ -89,7 +90,6 @@ int MAIN(int argc, char **argv)
...
@@ -89,7 +90,6 @@ int MAIN(int argc, char **argv)
BIO
*
in
=
NULL
,
*
inp
;
BIO
*
in
=
NULL
,
*
inp
;
BIO
*
bmd
=
NULL
;
BIO
*
bmd
=
NULL
;
BIO
*
out
=
NULL
;
BIO
*
out
=
NULL
;
const
char
*
name
;
#define PROG_NAME_SIZE 39
#define PROG_NAME_SIZE 39
char
pname
[
PROG_NAME_SIZE
+
1
];
char
pname
[
PROG_NAME_SIZE
+
1
];
int
separator
=
0
;
int
separator
=
0
;
...
@@ -490,37 +490,42 @@ int MAIN(int argc, char **argv)
...
@@ -490,37 +490,42 @@ int MAIN(int argc, char **argv)
{
{
BIO_set_fp
(
in
,
stdin
,
BIO_NOCLOSE
);
BIO_set_fp
(
in
,
stdin
,
BIO_NOCLOSE
);
err
=
do_fp
(
out
,
buf
,
inp
,
separator
,
out_bin
,
sigkey
,
sigbuf
,
err
=
do_fp
(
out
,
buf
,
inp
,
separator
,
out_bin
,
sigkey
,
sigbuf
,
siglen
,
""
,
"(stdin)
"
,
bmd
);
siglen
,
NULL
,
NULL
,
"stdin
"
,
bmd
);
}
}
else
else
{
{
name
=
OBJ_nid2sn
(
md
->
type
);
const
char
*
md_name
,
*
sig_name
;
if
(
out_bin
)
{
md_name
=
NULL
;
sig_name
=
NULL
;
}
else
{
if
(
sigkey
)
{
const
EVP_PKEY_ASN1_METHOD
*
ameth
;
ameth
=
EVP_PKEY_get0_asn1
(
sigkey
);
if
(
ameth
)
EVP_PKEY_asn1_get0_info
(
NULL
,
NULL
,
NULL
,
NULL
,
&
sig_name
,
ameth
);
}
md_name
=
EVP_MD_name
(
md
);
}
for
(
i
=
0
;
i
<
argc
;
i
++
)
for
(
i
=
0
;
i
<
argc
;
i
++
)
{
{
char
*
tmp
,
*
tofree
=
NULL
;
int
r
;
int
r
;
if
(
BIO_read_filename
(
in
,
argv
[
i
])
<=
0
)
if
(
BIO_read_filename
(
in
,
argv
[
i
])
<=
0
)
{
{
perror
(
argv
[
i
]);
perror
(
argv
[
i
]);
err
++
;
err
++
;
continue
;
continue
;
}
}
if
(
!
out_bin
)
{
size_t
len
=
strlen
(
name
)
+
strlen
(
argv
[
i
])
+
(
hmac_key
?
5
:
0
)
+
5
;
tmp
=
tofree
=
OPENSSL_malloc
(
len
);
BIO_snprintf
(
tmp
,
len
,
"%s%s(%s)= "
,
hmac_key
?
"HMAC-"
:
""
,
name
,
argv
[
i
]);
}
else
else
tmp
=
""
;
r
=
do_fp
(
out
,
buf
,
inp
,
separator
,
out_bin
,
sigkey
,
sigbuf
,
r
=
do_fp
(
out
,
buf
,
inp
,
separator
,
out_bin
,
sigkey
,
sigbuf
,
siglen
,
tmp
,
argv
[
i
],
bmd
);
siglen
,
sig_name
,
md_name
,
argv
[
i
],
bmd
);
if
(
r
)
if
(
r
)
err
=
r
;
err
=
r
;
if
(
tofree
)
OPENSSL_free
(
tofree
);
(
void
)
BIO_reset
(
bmd
);
(
void
)
BIO_reset
(
bmd
);
}
}
}
}
...
@@ -546,7 +551,8 @@ end:
...
@@ -546,7 +551,8 @@ end:
}
}
int
do_fp
(
BIO
*
out
,
unsigned
char
*
buf
,
BIO
*
bp
,
int
sep
,
int
binout
,
int
do_fp
(
BIO
*
out
,
unsigned
char
*
buf
,
BIO
*
bp
,
int
sep
,
int
binout
,
EVP_PKEY
*
key
,
unsigned
char
*
sigin
,
int
siglen
,
const
char
*
title
,
EVP_PKEY
*
key
,
unsigned
char
*
sigin
,
int
siglen
,
const
char
*
sig_name
,
const
char
*
md_name
,
const
char
*
file
,
BIO
*
bmd
)
const
char
*
file
,
BIO
*
bmd
)
{
{
size_t
len
;
size_t
len
;
...
@@ -600,7 +606,12 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
...
@@ -600,7 +606,12 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
if
(
binout
)
BIO_write
(
out
,
buf
,
len
);
if
(
binout
)
BIO_write
(
out
,
buf
,
len
);
else
else
{
{
BIO_write
(
out
,
title
,
strlen
(
title
));
if
(
sig_name
)
BIO_printf
(
out
,
"%s-%s(%s)="
,
sig_name
,
md_name
,
file
);
else
if
(
md_name
)
BIO_printf
(
out
,
"%s(%s)="
,
md_name
,
file
);
else
BIO_printf
(
out
,
"(%s)="
,
file
);
for
(
i
=
0
;
i
<
(
int
)
len
;
i
++
)
for
(
i
=
0
;
i
<
(
int
)
len
;
i
++
)
{
{
if
(
sep
&&
(
i
!=
0
))
if
(
sep
&&
(
i
!=
0
))
...
...
crypto/asn1/ameth_lib.c
浏览文件 @
e77dbf32
...
@@ -276,6 +276,11 @@ int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags,
...
@@ -276,6 +276,11 @@ int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags,
return
1
;
return
1
;
}
}
const
EVP_PKEY_ASN1_METHOD
*
EVP_PKEY_get0_asn1
(
EVP_PKEY
*
pkey
)
{
return
pkey
->
ameth
;
}
EVP_PKEY_ASN1_METHOD
*
EVP_PKEY_asn1_new
(
int
id
,
int
flags
,
EVP_PKEY_ASN1_METHOD
*
EVP_PKEY_asn1_new
(
int
id
,
int
flags
,
const
char
*
pem_str
,
const
char
*
info
)
const
char
*
pem_str
,
const
char
*
info
)
{
{
...
...
crypto/evp/evp.h
浏览文件 @
e77dbf32
...
@@ -939,6 +939,7 @@ int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *pkey_base_id, int *ppkey_flags,
...
@@ -939,6 +939,7 @@ int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *pkey_base_id, int *ppkey_flags,
const
char
**
pinfo
,
const
char
**
ppem_str
,
const
char
**
pinfo
,
const
char
**
ppem_str
,
const
EVP_PKEY_ASN1_METHOD
*
ameth
);
const
EVP_PKEY_ASN1_METHOD
*
ameth
);
const
EVP_PKEY_ASN1_METHOD
*
EVP_PKEY_get0_asn1
(
EVP_PKEY
*
pkey
);
EVP_PKEY_ASN1_METHOD
*
EVP_PKEY_asn1_new
(
int
id
,
int
flags
,
EVP_PKEY_ASN1_METHOD
*
EVP_PKEY_asn1_new
(
int
id
,
int
flags
,
const
char
*
pem_str
,
const
char
*
info
);
const
char
*
pem_str
,
const
char
*
info
);
void
EVP_PKEY_asn1_copy
(
EVP_PKEY_ASN1_METHOD
*
dst
,
void
EVP_PKEY_asn1_copy
(
EVP_PKEY_ASN1_METHOD
*
dst
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录