Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
openssl
提交
68c12bfc
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,发现更多精彩内容 >>
提交
68c12bfc
编写于
8月 18, 2016
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add X509_get0_serialNumber() and constify OCSP_cert_to_id()
Reviewed-by:
N
Matt Caswell
<
matt@openssl.org
>
上级
11222483
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
29 addition
and
14 deletion
+29
-14
crypto/ocsp/ocsp_lib.c
crypto/ocsp/ocsp_lib.c
+7
-6
crypto/x509/x509_cmp.c
crypto/x509/x509_cmp.c
+5
-0
doc/crypto/X509_get_serialNumber.pod
doc/crypto/X509_get_serialNumber.pod
+11
-4
include/openssl/ocsp.h
include/openssl/ocsp.h
+5
-4
include/openssl/x509.h
include/openssl/x509.h
+1
-0
未找到文件。
crypto/ocsp/ocsp_lib.c
浏览文件 @
68c12bfc
...
...
@@ -19,16 +19,17 @@
/* Convert a certificate and its issuer to an OCSP_CERTID */
OCSP_CERTID
*
OCSP_cert_to_id
(
const
EVP_MD
*
dgst
,
X509
*
subject
,
X509
*
issuer
)
OCSP_CERTID
*
OCSP_cert_to_id
(
const
EVP_MD
*
dgst
,
const
X509
*
subject
,
const
X509
*
issuer
)
{
X509_NAME
*
iname
;
ASN1_INTEGER
*
serial
;
const
ASN1_INTEGER
*
serial
;
ASN1_BIT_STRING
*
ikey
;
if
(
!
dgst
)
dgst
=
EVP_sha1
();
if
(
subject
)
{
iname
=
X509_get_issuer_name
(
subject
);
serial
=
X509_get_serialNumber
(
subject
);
serial
=
X509_get
0
_serialNumber
(
subject
);
}
else
{
iname
=
X509_get_subject_name
(
issuer
);
serial
=
NULL
;
...
...
@@ -38,9 +39,9 @@ OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer)
}
OCSP_CERTID
*
OCSP_cert_id_new
(
const
EVP_MD
*
dgst
,
X509_NAME
*
issuerName
,
ASN1_BIT_STRING
*
issuerKey
,
ASN1_INTEGER
*
serialNumber
)
const
X509_NAME
*
issuerName
,
const
ASN1_BIT_STRING
*
issuerKey
,
const
ASN1_INTEGER
*
serialNumber
)
{
int
nid
;
unsigned
int
i
;
...
...
crypto/x509/x509_cmp.c
浏览文件 @
68c12bfc
...
...
@@ -107,6 +107,11 @@ ASN1_INTEGER *X509_get_serialNumber(X509 *a)
return
&
a
->
cert_info
.
serialNumber
;
}
const
ASN1_INTEGER
*
X509_get0_serialNumber
(
const
X509
*
a
)
{
return
&
a
->
cert_info
.
serialNumber
;
}
unsigned
long
X509_subject_name_hash
(
X509
*
x
)
{
return
(
X509_NAME_hash
(
x
->
cert_info
.
subject
));
...
...
doc/crypto/X509_get_serialNumber.pod
浏览文件 @
68c12bfc
...
...
@@ -2,14 +2,17 @@
=head1 NAME
X509_get_serialNumber, X509_set_serialNumber - get or set certificate serial
number
X509_get_serialNumber,
X509_get0_serialNumber,
X509_set_serialNumber
- get or set certificate serial number
=head1 SYNOPSIS
#include <openssl/x509.h>
ASN1_INTEGER *X509_get_serialNumber(X509 *x);
const ASN1_INTEGER *X509_get0_serialNumber(const X509 *x);
int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial);
=head1 DESCRIPTION
...
...
@@ -18,13 +21,17 @@ X509_get_serialNumber() returns the serial number of certificate B<x> as an
B<ASN1_INTEGER> structure which can be examined or initialised. The value
returned is an internal pointer which B<MUST NOT> be freed up after the call.
X509_get0_serialNumber() is the same as X509_get_serialNumber() except it
accepts a const parameter and returns a const result.
X509_set_serialNumber() sets the serial number of certificate B<x> to
B<serial>. A copy of the serial number is used internally so B<serial> should
be freed up after use.
=head1 RETURN VALUES
X509_get_serialNumber() returns an B<ASN1_INTEGER> structure.
X509_get_serialNumber() and X509_get0_serialNumber() return an B<ASN1_INTEGER>
structure.
X509_set_serialNumber() returns 1 for success and 0 for failure.
...
...
@@ -50,7 +57,7 @@ L<X509_verify_cert(3)>
=head1 HISTORY
X509_get_serialNumber() and X509_set_serialNumber() are available in
all versions of OpenSSL.
all versions of OpenSSL.
X509_get0_serialNumber() was added in OpenSSL 1.1.0.
=head1 COPYRIGHT
...
...
include/openssl/ocsp.h
浏览文件 @
68c12bfc
...
...
@@ -182,12 +182,13 @@ int OCSP_REQ_CTX_set1_req(OCSP_REQ_CTX *rctx, OCSP_REQUEST *req);
int
OCSP_REQ_CTX_add1_header
(
OCSP_REQ_CTX
*
rctx
,
const
char
*
name
,
const
char
*
value
);
OCSP_CERTID
*
OCSP_cert_to_id
(
const
EVP_MD
*
dgst
,
X509
*
subject
,
X509
*
issuer
);
OCSP_CERTID
*
OCSP_cert_to_id
(
const
EVP_MD
*
dgst
,
const
X509
*
subject
,
const
X509
*
issuer
);
OCSP_CERTID
*
OCSP_cert_id_new
(
const
EVP_MD
*
dgst
,
X509_NAME
*
issuerName
,
ASN1_BIT_STRING
*
issuerKey
,
ASN1_INTEGER
*
serialNumber
);
const
X509_NAME
*
issuerName
,
const
ASN1_BIT_STRING
*
issuerKey
,
const
ASN1_INTEGER
*
serialNumber
);
OCSP_ONEREQ
*
OCSP_request_add0_id
(
OCSP_REQUEST
*
req
,
OCSP_CERTID
*
cid
);
...
...
include/openssl/x509.h
浏览文件 @
68c12bfc
...
...
@@ -617,6 +617,7 @@ long X509_get_version(const X509 *x);
int
X509_set_version
(
X509
*
x
,
long
version
);
int
X509_set_serialNumber
(
X509
*
x
,
ASN1_INTEGER
*
serial
);
ASN1_INTEGER
*
X509_get_serialNumber
(
X509
*
x
);
const
ASN1_INTEGER
*
X509_get0_serialNumber
(
const
X509
*
x
);
int
X509_set_issuer_name
(
X509
*
x
,
X509_NAME
*
name
);
X509_NAME
*
X509_get_issuer_name
(
const
X509
*
a
);
int
X509_set_subject_name
(
X509
*
x
,
X509_NAME
*
name
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录