Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
openssl
提交
f80153e2
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,发现更多精彩内容 >>
提交
f80153e2
编写于
3月 21, 2003
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support for policy constraints.
上级
33b34a9d
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
156 addition
and
4 deletion
+156
-4
CHANGES
CHANGES
+3
-0
crypto/x509v3/Makefile.ssl
crypto/x509v3/Makefile.ssl
+2
-2
crypto/x509v3/ext_dat.h
crypto/x509v3/ext_dat.h
+2
-1
crypto/x509v3/v3_conf.c
crypto/x509v3/v3_conf.c
+1
-1
crypto/x509v3/v3_pcons.c
crypto/x509v3/v3_pcons.c
+136
-0
crypto/x509v3/v3err.c
crypto/x509v3/v3err.c
+2
-0
crypto/x509v3/x509v3.h
crypto/x509v3/x509v3.h
+10
-0
未找到文件。
CHANGES
浏览文件 @
f80153e2
...
...
@@ -4,6 +4,9 @@
Changes between 0.9.7a and 0.9.8 [xx XXX xxxx]
*) Support for policyConstraints certificate extension.
[Steve Henson]
*) Support for policyMappings certificate extension.
[Steve Henson]
...
...
crypto/x509v3/Makefile.ssl
浏览文件 @
f80153e2
...
...
@@ -26,11 +26,11 @@ LIB=$(TOP)/libcrypto.a
LIBSRC
=
v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c
\
v3_prn.c v3_utl.c v3err.c v3_genn.c v3_alt.c v3_skey.c v3_akey.c v3_pku.c
\
v3_int.c v3_enum.c v3_sxnet.c v3_cpols.c v3_crld.c v3_purp.c v3_info.c
\
v3_ocsp.c v3_akeya.c v3_pmaps.c
v3_ocsp.c v3_akeya.c v3_pmaps.c
v3_pcons.c
LIBOBJ
=
v3_bcons.o v3_bitst.o v3_conf.o v3_extku.o v3_ia5.o v3_lib.o
\
v3_prn.o v3_utl.o v3err.o v3_genn.o v3_alt.o v3_skey.o v3_akey.o v3_pku.o
\
v3_int.o v3_enum.o v3_sxnet.o v3_cpols.o v3_crld.o v3_purp.o v3_info.o
\
v3_ocsp.o v3_akeya.o v3_pmaps.o
v3_ocsp.o v3_akeya.o v3_pmaps.o
v3_pcons.o
SRC
=
$(LIBSRC)
...
...
crypto/x509v3/ext_dat.h
浏览文件 @
f80153e2
...
...
@@ -64,7 +64,7 @@ extern X509V3_EXT_METHOD v3_crl_num, v3_crl_reason, v3_crl_invdate, v3_cpols, v3
extern
X509V3_EXT_METHOD
v3_ocsp_nonce
,
v3_ocsp_accresp
,
v3_ocsp_acutoff
;
extern
X509V3_EXT_METHOD
v3_ocsp_crlid
,
v3_ocsp_nocheck
,
v3_ocsp_serviceloc
;
extern
X509V3_EXT_METHOD
v3_crl_hold
;
extern
X509V3_EXT_METHOD
v3_policy_mappings
;
extern
X509V3_EXT_METHOD
v3_policy_mappings
,
v3_policy_constraints
;
/* This table will be searched using OBJ_bsearch so it *must* kept in
* order of the ext_nid values.
...
...
@@ -105,6 +105,7 @@ static X509V3_EXT_METHOD *standard_exts[] = {
&
v3_ocsp_serviceloc
,
#endif
&
v3_sinfo
,
&
v3_policy_constraints
,
#ifndef OPENSSL_NO_OCSP
&
v3_crl_hold
,
#endif
...
...
crypto/x509v3/v3_conf.c
浏览文件 @
f80153e2
...
...
@@ -134,7 +134,7 @@ static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid,
{
if
(
*
value
==
'@'
)
nval
=
NCONF_get_section
(
conf
,
value
+
1
);
else
nval
=
X509V3_parse_list
(
value
);
if
(
!
nval
)
if
(
sk_CONF_VALUE_num
(
nval
)
<=
0
)
{
X509V3err
(
X509V3_F_X509V3_EXT_CONF
,
X509V3_R_INVALID_EXTENSION_STRING
);
ERR_add_error_data
(
4
,
"name="
,
OBJ_nid2sn
(
ext_nid
),
",section="
,
value
);
...
...
crypto/x509v3/v3_pcons.c
0 → 100644
浏览文件 @
f80153e2
/* v3_pcons.c */
/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
* project.
*/
/* ====================================================================
* Copyright (c) 2003 The OpenSSL Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. All advertising materials mentioning features or use of this
* software must display the following acknowledgment:
* "This product includes software developed by the OpenSSL Project
* for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
*
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
* endorse or promote products derived from this software without
* prior written permission. For written permission, please contact
* licensing@OpenSSL.org.
*
* 5. Products derived from this software may not be called "OpenSSL"
* nor may "OpenSSL" appear in their names without prior written
* permission of the OpenSSL Project.
*
* 6. Redistributions of any form whatsoever must retain the following
* acknowledgment:
* "This product includes software developed by the OpenSSL Project
* for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
*
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
* ====================================================================
*
* This product includes cryptographic software written by Eric Young
* (eay@cryptsoft.com). This product includes software written by Tim
* Hudson (tjh@cryptsoft.com).
*
*/
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/asn1.h>
#include <openssl/asn1t.h>
#include <openssl/conf.h>
#include <openssl/x509v3.h>
static
STACK_OF
(
CONF_VALUE
)
*
i2v_POLICY_CONSTRAINTS
(
X509V3_EXT_METHOD
*
method
,
void
*
bcons
,
STACK_OF
(
CONF_VALUE
)
*
extlist
);
static
void
*
v2i_POLICY_CONSTRAINTS
(
X509V3_EXT_METHOD
*
method
,
X509V3_CTX
*
ctx
,
STACK_OF
(
CONF_VALUE
)
*
values
);
X509V3_EXT_METHOD
v3_policy_constraints
=
{
NID_policy_constraints
,
0
,
ASN1_ITEM_ref
(
POLICY_CONSTRAINTS
),
0
,
0
,
0
,
0
,
0
,
0
,
i2v_POLICY_CONSTRAINTS
,
v2i_POLICY_CONSTRAINTS
,
NULL
,
NULL
,
NULL
};
ASN1_SEQUENCE
(
POLICY_CONSTRAINTS
)
=
{
ASN1_OPT
(
POLICY_CONSTRAINTS
,
requireExplicitPolicy
,
ASN1_INTEGER
),
ASN1_OPT
(
POLICY_CONSTRAINTS
,
inhibitPolicyMapping
,
ASN1_INTEGER
)
}
ASN1_SEQUENCE_END
(
POLICY_CONSTRAINTS
)
IMPLEMENT_ASN1_ALLOC_FUNCTIONS
(
POLICY_CONSTRAINTS
)
static
STACK_OF
(
CONF_VALUE
)
*
i2v_POLICY_CONSTRAINTS
(
X509V3_EXT_METHOD
*
method
,
void
*
a
,
STACK_OF
(
CONF_VALUE
)
*
extlist
)
{
POLICY_CONSTRAINTS
*
pcons
=
a
;
X509V3_add_value_int
(
"Require Explicit Policy"
,
pcons
->
requireExplicitPolicy
,
&
extlist
);
X509V3_add_value_int
(
"Inhibit Policy Mapping"
,
pcons
->
inhibitPolicyMapping
,
&
extlist
);
return
extlist
;
}
static
void
*
v2i_POLICY_CONSTRAINTS
(
X509V3_EXT_METHOD
*
method
,
X509V3_CTX
*
ctx
,
STACK_OF
(
CONF_VALUE
)
*
values
)
{
POLICY_CONSTRAINTS
*
pcons
=
NULL
;
CONF_VALUE
*
val
;
int
i
;
if
(
!
(
pcons
=
POLICY_CONSTRAINTS_new
()))
{
X509V3err
(
X509V3_F_V2I_POLICY_CONSTRAINTS
,
ERR_R_MALLOC_FAILURE
);
return
NULL
;
}
for
(
i
=
0
;
i
<
sk_CONF_VALUE_num
(
values
);
i
++
)
{
val
=
sk_CONF_VALUE_value
(
values
,
i
);
if
(
!
strcmp
(
val
->
name
,
"requireExplicitPolicy"
))
{
if
(
!
X509V3_get_value_int
(
val
,
&
pcons
->
requireExplicitPolicy
))
goto
err
;
}
else
if
(
!
strcmp
(
val
->
name
,
"inhibitPolicyMapping"
))
{
if
(
!
X509V3_get_value_int
(
val
,
&
pcons
->
inhibitPolicyMapping
))
goto
err
;
}
else
{
X509V3err
(
X509V3_F_V2I_POLICY_CONSTRAINTS
,
X509V3_R_INVALID_NAME
);
X509V3_conf_err
(
val
);
goto
err
;
}
}
if
(
!
pcons
->
inhibitPolicyMapping
&&
!
pcons
->
requireExplicitPolicy
)
{
X509V3err
(
X509V3_F_V2I_POLICY_CONSTRAINTS
,
X509V3_R_ILLEGAL_EMPTY_EXTENSION
);
goto
err
;
}
return
pcons
;
err:
POLICY_CONSTRAINTS_free
(
pcons
);
return
NULL
;
}
crypto/x509v3/v3err.c
浏览文件 @
f80153e2
...
...
@@ -98,6 +98,7 @@ static ERR_STRING_DATA X509V3_str_functs[]=
{
ERR_PACK
(
0
,
X509V3_F_V2I_EXT_KU
,
0
),
"V2I_EXT_KU"
},
{
ERR_PACK
(
0
,
X509V3_F_V2I_GENERAL_NAME
,
0
),
"v2i_GENERAL_NAME"
},
{
ERR_PACK
(
0
,
X509V3_F_V2I_GENERAL_NAMES
,
0
),
"v2i_GENERAL_NAMES"
},
{
ERR_PACK
(
0
,
X509V3_F_V2I_POLICY_CONSTRAINTS
,
0
),
"V2I_POLICY_CONSTRAINTS"
},
{
ERR_PACK
(
0
,
X509V3_F_V2I_POLICY_MAPPINGS
,
0
),
"V2I_POLICY_MAPPINGS"
},
{
ERR_PACK
(
0
,
X509V3_F_V3_GENERIC_EXTENSION
,
0
),
"V3_GENERIC_EXTENSION"
},
{
ERR_PACK
(
0
,
X509V3_F_X509V3_ADD_I2D
,
0
),
"X509V3_ADD_I2D"
},
...
...
@@ -132,6 +133,7 @@ static ERR_STRING_DATA X509V3_str_reasons[]=
{
X509V3_R_EXTENSION_NOT_FOUND
,
"extension not found"
},
{
X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED
,
"extension setting not supported"
},
{
X509V3_R_EXTENSION_VALUE_ERROR
,
"extension value error"
},
{
X509V3_R_ILLEGAL_EMPTY_EXTENSION
,
"illegal empty extension"
},
{
X509V3_R_ILLEGAL_HEX_DIGIT
,
"illegal hex digit"
},
{
X509V3_R_INVALID_BOOLEAN_STRING
,
"invalid boolean string"
},
{
X509V3_R_INVALID_EXTENSION_STRING
,
"invalid extension string"
},
...
...
crypto/x509v3/x509v3.h
浏览文件 @
f80153e2
...
...
@@ -295,6 +295,11 @@ DECLARE_STACK_OF(POLICY_MAPPING)
typedef
STACK_OF
(
POLICY_MAPPING
)
POLICY_MAPPINGS
;
typedef
struct
POLICY_CONSTRAINTS_st
{
ASN1_INTEGER
*
requireExplicitPolicy
;
ASN1_INTEGER
*
inhibitPolicyMapping
;
}
POLICY_CONSTRAINTS
;
#define X509V3_conf_err(val) ERR_add_error_data(6, "section:", val->section, \
",name:", val->name, ",value:", val->value);
...
...
@@ -468,6 +473,9 @@ DECLARE_ASN1_ITEM(POLICY_MAPPING)
DECLARE_ASN1_ALLOC_FUNCTIONS
(
POLICY_MAPPING
)
DECLARE_ASN1_ITEM
(
POLICY_MAPPINGS
)
DECLARE_ASN1_ALLOC_FUNCTIONS
(
POLICY_CONSTRAINTS
)
DECLARE_ASN1_ITEM
(
POLICY_CONSTRAINTS
)
#ifdef HEADER_CONF_H
GENERAL_NAME
*
v2i_GENERAL_NAME
(
X509V3_EXT_METHOD
*
method
,
X509V3_CTX
*
ctx
,
CONF_VALUE
*
cnf
);
void
X509V3_conf_free
(
CONF_VALUE
*
val
);
...
...
@@ -605,6 +613,7 @@ void ERR_load_X509V3_strings(void);
#define X509V3_F_V2I_EXT_KU 103
#define X509V3_F_V2I_GENERAL_NAME 117
#define X509V3_F_V2I_GENERAL_NAMES 118
#define X509V3_F_V2I_POLICY_CONSTRAINTS 146
#define X509V3_F_V2I_POLICY_MAPPINGS 145
#define X509V3_F_V3_GENERIC_EXTENSION 116
#define X509V3_F_X509V3_ADD_I2D 140
...
...
@@ -636,6 +645,7 @@ void ERR_load_X509V3_strings(void);
#define X509V3_R_EXTENSION_NOT_FOUND 102
#define X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED 103
#define X509V3_R_EXTENSION_VALUE_ERROR 116
#define X509V3_R_ILLEGAL_EMPTY_EXTENSION 151
#define X509V3_R_ILLEGAL_HEX_DIGIT 113
#define X509V3_R_INVALID_BOOLEAN_STRING 104
#define X509V3_R_INVALID_EXTENSION_STRING 105
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录