Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
a1d12dae
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
9 个月 前同步成功
通知
8
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,体验更适合开发者的 AI 搜索 >>
提交
a1d12dae
编写于
3月 20, 2003
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support for policyMappings
上级
6f528cac
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
195 addition
and
3 deletion
+195
-3
CHANGES
CHANGES
+3
-0
crypto/stack/safestack.h
crypto/stack/safestack.h
+20
-0
crypto/x509v3/Makefile.ssl
crypto/x509v3/Makefile.ssl
+2
-2
crypto/x509v3/ext_dat.h
crypto/x509v3/ext_dat.h
+3
-1
crypto/x509v3/v3_pmaps.c
crypto/x509v3/v3_pmaps.c
+153
-0
crypto/x509v3/v3err.c
crypto/x509v3/v3err.c
+1
-0
crypto/x509v3/x509v3.h
crypto/x509v3/x509v3.h
+13
-0
未找到文件。
CHANGES
浏览文件 @
a1d12dae
...
@@ -4,6 +4,9 @@
...
@@ -4,6 +4,9 @@
Changes between 0.9.7a and 0.9.8 [xx XXX xxxx]
Changes between 0.9.7a and 0.9.8 [xx XXX xxxx]
*) Support for policyMappings certificate extension.
[Steve Henson]
*) Fixed a typo bug that would cause ENGINE_set_default() to set an
*) Fixed a typo bug that would cause ENGINE_set_default() to set an
ENGINE as defaults for all supported algorithms irrespective of
ENGINE as defaults for all supported algorithms irrespective of
the 'flags' parameter. 'flags' is now honoured, so applications
the 'flags' parameter. 'flags' is now honoured, so applications
...
...
crypto/stack/safestack.h
浏览文件 @
a1d12dae
...
@@ -944,6 +944,26 @@ STACK_OF(type) \
...
@@ -944,6 +944,26 @@ STACK_OF(type) \
#define sk_POLICYQUALINFO_pop(st) SKM_sk_pop(POLICYQUALINFO, (st))
#define sk_POLICYQUALINFO_pop(st) SKM_sk_pop(POLICYQUALINFO, (st))
#define sk_POLICYQUALINFO_sort(st) SKM_sk_sort(POLICYQUALINFO, (st))
#define sk_POLICYQUALINFO_sort(st) SKM_sk_sort(POLICYQUALINFO, (st))
#define sk_POLICY_MAPPING_new(st) SKM_sk_new(POLICY_MAPPING, (st))
#define sk_POLICY_MAPPING_new_null() SKM_sk_new_null(POLICY_MAPPING)
#define sk_POLICY_MAPPING_free(st) SKM_sk_free(POLICY_MAPPING, (st))
#define sk_POLICY_MAPPING_num(st) SKM_sk_num(POLICY_MAPPING, (st))
#define sk_POLICY_MAPPING_value(st, i) SKM_sk_value(POLICY_MAPPING, (st), (i))
#define sk_POLICY_MAPPING_set(st, i, val) SKM_sk_set(POLICY_MAPPING, (st), (i), (val))
#define sk_POLICY_MAPPING_zero(st) SKM_sk_zero(POLICY_MAPPING, (st))
#define sk_POLICY_MAPPING_push(st, val) SKM_sk_push(POLICY_MAPPING, (st), (val))
#define sk_POLICY_MAPPING_unshift(st, val) SKM_sk_unshift(POLICY_MAPPING, (st), (val))
#define sk_POLICY_MAPPING_find(st, val) SKM_sk_find(POLICY_MAPPING, (st), (val))
#define sk_POLICY_MAPPING_delete(st, i) SKM_sk_delete(POLICY_MAPPING, (st), (i))
#define sk_POLICY_MAPPING_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICY_MAPPING, (st), (ptr))
#define sk_POLICY_MAPPING_insert(st, val, i) SKM_sk_insert(POLICY_MAPPING, (st), (val), (i))
#define sk_POLICY_MAPPING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICY_MAPPING, (st), (cmp))
#define sk_POLICY_MAPPING_dup(st) SKM_sk_dup(POLICY_MAPPING, st)
#define sk_POLICY_MAPPING_pop_free(st, free_func) SKM_sk_pop_free(POLICY_MAPPING, (st), (free_func))
#define sk_POLICY_MAPPING_shift(st) SKM_sk_shift(POLICY_MAPPING, (st))
#define sk_POLICY_MAPPING_pop(st) SKM_sk_pop(POLICY_MAPPING, (st))
#define sk_POLICY_MAPPING_sort(st) SKM_sk_sort(POLICY_MAPPING, (st))
#define sk_SSL_CIPHER_new(st) SKM_sk_new(SSL_CIPHER, (st))
#define sk_SSL_CIPHER_new(st) SKM_sk_new(SSL_CIPHER, (st))
#define sk_SSL_CIPHER_new_null() SKM_sk_new_null(SSL_CIPHER)
#define sk_SSL_CIPHER_new_null() SKM_sk_new_null(SSL_CIPHER)
#define sk_SSL_CIPHER_free(st) SKM_sk_free(SSL_CIPHER, (st))
#define sk_SSL_CIPHER_free(st) SKM_sk_free(SSL_CIPHER, (st))
...
...
crypto/x509v3/Makefile.ssl
浏览文件 @
a1d12dae
...
@@ -26,11 +26,11 @@ LIB=$(TOP)/libcrypto.a
...
@@ -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
\
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_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_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_ocsp.c v3_akeya.c
v3_pmaps.c
LIBOBJ
=
v3_bcons.o v3_bitst.o v3_conf.o v3_extku.o v3_ia5.o v3_lib.o
\
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_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_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_ocsp.o v3_akeya.o
v3_pmaps.o
SRC
=
$(LIBSRC)
SRC
=
$(LIBSRC)
...
...
crypto/x509v3/ext_dat.h
浏览文件 @
a1d12dae
...
@@ -64,6 +64,7 @@ extern X509V3_EXT_METHOD v3_crl_num, v3_crl_reason, v3_crl_invdate, v3_cpols, v3
...
@@ -64,6 +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_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_ocsp_crlid
,
v3_ocsp_nocheck
,
v3_ocsp_serviceloc
;
extern
X509V3_EXT_METHOD
v3_crl_hold
;
extern
X509V3_EXT_METHOD
v3_crl_hold
;
extern
X509V3_EXT_METHOD
v3_policy_mappings
;
/* This table will be searched using OBJ_bsearch so it *must* kept in
/* This table will be searched using OBJ_bsearch so it *must* kept in
* order of the ext_nid values.
* order of the ext_nid values.
...
@@ -105,8 +106,9 @@ static X509V3_EXT_METHOD *standard_exts[] = {
...
@@ -105,8 +106,9 @@ static X509V3_EXT_METHOD *standard_exts[] = {
#endif
#endif
&
v3_sinfo
,
&
v3_sinfo
,
#ifndef OPENSSL_NO_OCSP
#ifndef OPENSSL_NO_OCSP
&
v3_crl_hold
&
v3_crl_hold
,
#endif
#endif
&
v3_policy_mappings
};
};
/* Number of standard extensions */
/* Number of standard extensions */
...
...
crypto/x509v3/v3_pmaps.c
0 → 100644
浏览文件 @
a1d12dae
/* v3_pmaps.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/asn1t.h>
#include <openssl/conf.h>
#include <openssl/x509v3.h>
static
void
*
v2i_POLICY_MAPPINGS
(
X509V3_EXT_METHOD
*
method
,
X509V3_CTX
*
ctx
,
STACK_OF
(
CONF_VALUE
)
*
nval
);
static
STACK_OF
(
CONF_VALUE
)
*
i2v_POLICY_MAPPINGS
(
X509V3_EXT_METHOD
*
method
,
void
*
pmps
,
STACK_OF
(
CONF_VALUE
)
*
extlist
);
X509V3_EXT_METHOD
v3_policy_mappings
=
{
NID_policy_mappings
,
0
,
ASN1_ITEM_ref
(
POLICY_MAPPINGS
),
0
,
0
,
0
,
0
,
0
,
0
,
i2v_POLICY_MAPPINGS
,
v2i_POLICY_MAPPINGS
,
0
,
0
,
NULL
};
ASN1_SEQUENCE
(
POLICY_MAPPING
)
=
{
ASN1_SIMPLE
(
POLICY_MAPPING
,
issuerDomainPolicy
,
ASN1_OBJECT
),
ASN1_SIMPLE
(
POLICY_MAPPING
,
subjectDomainPolicy
,
ASN1_OBJECT
)
}
ASN1_SEQUENCE_END
(
POLICY_MAPPING
)
ASN1_ITEM_TEMPLATE
(
POLICY_MAPPINGS
)
=
ASN1_EX_TEMPLATE_TYPE
(
ASN1_TFLG_SEQUENCE_OF
,
0
,
POLICY_MAPPINGS
,
POLICY_MAPPING
)
ASN1_ITEM_TEMPLATE_END
(
POLICY_MAPPINGS
)
IMPLEMENT_ASN1_FUNCTIONS
(
POLICY_MAPPING
)
static
STACK_OF
(
CONF_VALUE
)
*
i2v_POLICY_MAPPINGS
(
X509V3_EXT_METHOD
*
method
,
void
*
a
,
STACK_OF
(
CONF_VALUE
)
*
ext_list
)
{
POLICY_MAPPINGS
*
pmaps
=
a
;
POLICY_MAPPING
*
pmap
;
int
i
;
char
obj_tmp1
[
80
];
char
obj_tmp2
[
80
];
for
(
i
=
0
;
i
<
sk_POLICY_MAPPING_num
(
pmaps
);
i
++
)
{
pmap
=
sk_POLICY_MAPPING_value
(
pmaps
,
i
);
i2t_ASN1_OBJECT
(
obj_tmp1
,
80
,
pmap
->
issuerDomainPolicy
);
i2t_ASN1_OBJECT
(
obj_tmp2
,
80
,
pmap
->
subjectDomainPolicy
);
X509V3_add_value
(
obj_tmp1
,
obj_tmp2
,
&
ext_list
);
}
return
ext_list
;
}
static
void
*
v2i_POLICY_MAPPINGS
(
X509V3_EXT_METHOD
*
method
,
X509V3_CTX
*
ctx
,
STACK_OF
(
CONF_VALUE
)
*
nval
)
{
POLICY_MAPPINGS
*
pmaps
;
POLICY_MAPPING
*
pmap
;
ASN1_OBJECT
*
obj1
,
*
obj2
;
CONF_VALUE
*
val
;
int
i
;
if
(
!
(
pmaps
=
sk_POLICY_MAPPING_new_null
()))
{
X509V3err
(
X509V3_F_V2I_POLICY_MAPPINGS
,
ERR_R_MALLOC_FAILURE
);
return
NULL
;
}
for
(
i
=
0
;
i
<
sk_CONF_VALUE_num
(
nval
);
i
++
)
{
val
=
sk_CONF_VALUE_value
(
nval
,
i
);
if
(
!
val
->
value
||
!
val
->
name
)
{
sk_POLICY_MAPPING_pop_free
(
pmaps
,
POLICY_MAPPING_free
);
X509V3err
(
X509V3_F_V2I_POLICY_MAPPINGS
,
X509V3_R_INVALID_OBJECT_IDENTIFIER
);
X509V3_conf_err
(
val
);
return
NULL
;
}
obj1
=
OBJ_txt2obj
(
val
->
name
,
0
);
obj2
=
OBJ_txt2obj
(
val
->
value
,
0
);
if
(
!
obj1
||
!
obj2
)
{
sk_POLICY_MAPPING_pop_free
(
pmaps
,
POLICY_MAPPING_free
);
X509V3err
(
X509V3_F_V2I_POLICY_MAPPINGS
,
X509V3_R_INVALID_OBJECT_IDENTIFIER
);
X509V3_conf_err
(
val
);
return
NULL
;
}
pmap
=
POLICY_MAPPING_new
();
if
(
!
pmap
)
{
sk_POLICY_MAPPING_pop_free
(
pmaps
,
POLICY_MAPPING_free
);
X509V3err
(
X509V3_F_V2I_POLICY_MAPPINGS
,
ERR_R_MALLOC_FAILURE
);
return
NULL
;
}
pmap
->
issuerDomainPolicy
=
obj1
;
pmap
->
subjectDomainPolicy
=
obj2
;
sk_POLICY_MAPPING_push
(
pmaps
,
pmap
);
}
return
pmaps
;
}
crypto/x509v3/v3err.c
浏览文件 @
a1d12dae
...
@@ -98,6 +98,7 @@ static ERR_STRING_DATA X509V3_str_functs[]=
...
@@ -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_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_NAME
,
0
),
"v2i_GENERAL_NAME"
},
{
ERR_PACK
(
0
,
X509V3_F_V2I_GENERAL_NAMES
,
0
),
"v2i_GENERAL_NAMES"
},
{
ERR_PACK
(
0
,
X509V3_F_V2I_GENERAL_NAMES
,
0
),
"v2i_GENERAL_NAMES"
},
{
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_V3_GENERIC_EXTENSION
,
0
),
"V3_GENERIC_EXTENSION"
},
{
ERR_PACK
(
0
,
X509V3_F_X509V3_ADD_I2D
,
0
),
"X509V3_ADD_I2D"
},
{
ERR_PACK
(
0
,
X509V3_F_X509V3_ADD_I2D
,
0
),
"X509V3_ADD_I2D"
},
{
ERR_PACK
(
0
,
X509V3_F_X509V3_ADD_VALUE
,
0
),
"X509V3_add_value"
},
{
ERR_PACK
(
0
,
X509V3_F_X509V3_ADD_VALUE
,
0
),
"X509V3_add_value"
},
...
...
crypto/x509v3/x509v3.h
浏览文件 @
a1d12dae
...
@@ -286,6 +286,15 @@ typedef STACK_OF(POLICYINFO) CERTIFICATEPOLICIES;
...
@@ -286,6 +286,15 @@ typedef STACK_OF(POLICYINFO) CERTIFICATEPOLICIES;
DECLARE_STACK_OF
(
POLICYINFO
)
DECLARE_STACK_OF
(
POLICYINFO
)
DECLARE_ASN1_SET_OF
(
POLICYINFO
)
DECLARE_ASN1_SET_OF
(
POLICYINFO
)
typedef
struct
POLICY_MAPPING_st
{
ASN1_OBJECT
*
issuerDomainPolicy
;
ASN1_OBJECT
*
subjectDomainPolicy
;
}
POLICY_MAPPING
;
DECLARE_STACK_OF
(
POLICY_MAPPING
)
typedef
STACK_OF
(
POLICY_MAPPING
)
POLICY_MAPPINGS
;
#define X509V3_conf_err(val) ERR_add_error_data(6, "section:", val->section, \
#define X509V3_conf_err(val) ERR_add_error_data(6, "section:", val->section, \
",name:", val->name, ",value:", val->value);
",name:", val->name, ",value:", val->value);
...
@@ -455,6 +464,9 @@ DECLARE_ASN1_FUNCTIONS(DIST_POINT_NAME)
...
@@ -455,6 +464,9 @@ DECLARE_ASN1_FUNCTIONS(DIST_POINT_NAME)
DECLARE_ASN1_FUNCTIONS
(
ACCESS_DESCRIPTION
)
DECLARE_ASN1_FUNCTIONS
(
ACCESS_DESCRIPTION
)
DECLARE_ASN1_FUNCTIONS
(
AUTHORITY_INFO_ACCESS
)
DECLARE_ASN1_FUNCTIONS
(
AUTHORITY_INFO_ACCESS
)
DECLARE_ASN1_ITEM
(
POLICY_MAPPING
)
DECLARE_ASN1_ITEM
(
POLICY_MAPPINGS
)
#ifdef HEADER_CONF_H
#ifdef HEADER_CONF_H
GENERAL_NAME
*
v2i_GENERAL_NAME
(
X509V3_EXT_METHOD
*
method
,
X509V3_CTX
*
ctx
,
CONF_VALUE
*
cnf
);
GENERAL_NAME
*
v2i_GENERAL_NAME
(
X509V3_EXT_METHOD
*
method
,
X509V3_CTX
*
ctx
,
CONF_VALUE
*
cnf
);
void
X509V3_conf_free
(
CONF_VALUE
*
val
);
void
X509V3_conf_free
(
CONF_VALUE
*
val
);
...
@@ -592,6 +604,7 @@ void ERR_load_X509V3_strings(void);
...
@@ -592,6 +604,7 @@ void ERR_load_X509V3_strings(void);
#define X509V3_F_V2I_EXT_KU 103
#define X509V3_F_V2I_EXT_KU 103
#define X509V3_F_V2I_GENERAL_NAME 117
#define X509V3_F_V2I_GENERAL_NAME 117
#define X509V3_F_V2I_GENERAL_NAMES 118
#define X509V3_F_V2I_GENERAL_NAMES 118
#define X509V3_F_V2I_POLICY_MAPPINGS 145
#define X509V3_F_V3_GENERIC_EXTENSION 116
#define X509V3_F_V3_GENERIC_EXTENSION 116
#define X509V3_F_X509V3_ADD_I2D 140
#define X509V3_F_X509V3_ADD_I2D 140
#define X509V3_F_X509V3_ADD_VALUE 105
#define X509V3_F_X509V3_ADD_VALUE 105
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录