Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
openssl
提交
cfdcfede
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,发现更多精彩内容 >>
提交
cfdcfede
编写于
4月 17, 1999
作者:
B
Ben Laurie
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Another STACK bites the dust.
上级
1d48dd00
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
41 addition
and
25 deletion
+41
-25
crypto/asn1/asn1_mac.h
crypto/asn1/asn1_mac.h
+14
-2
crypto/evp/evp.h
crypto/evp/evp.h
+1
-5
crypto/x509/x509.h
crypto/x509/x509.h
+3
-1
crypto/x509v3/v3_sxnet.c
crypto/x509v3/v3_sxnet.c
+15
-12
crypto/x509v3/x509v3.h
crypto/x509v3/x509v3.h
+8
-5
未找到文件。
crypto/asn1/asn1_mac.h
浏览文件 @
cfdcfede
...
...
@@ -193,6 +193,10 @@ err:\
M_ASN1_D2I_get_imp_set(r,func,free_func,\
V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
#define M_ASN1_D2I_get_seq_type(type,r,func,free_func) \
M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,\
V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL)
#define M_ASN1_D2I_get_seq_opt(r,func,free_func) \
if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
V_ASN1_CONSTRUCTED|V_ASN1_SEQUENCE)))\
...
...
@@ -211,8 +215,8 @@ err:\
#define M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,a,b) \
c.q=c.p; \
if (d2i_ASN1_SET_OF_##type(&(r),&c.p,c.slen,func,
free_func,a,b)
\
== NULL) \
if (d2i_ASN1_SET_OF_##type(&(r),&c.p,c.slen,func,\
free_func,a,b)
== NULL) \
{ c.line=__LINE__; goto err; } \
c.slen-=(c.p-c.q);
...
...
@@ -309,6 +313,10 @@ err:\
ret+=i2d_ASN1_SET(a,NULL,f,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL, \
IS_SEQUENCE);
#define M_ASN1_I2D_len_SEQUENCE_type(type,a,f) \
ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,V_ASN1_SEQUENCE, \
V_ASN1_UNIVERSAL,IS_SEQUENCE)
#define M_ASN1_I2D_len_SEQUENCE_opt(a,f) \
if ((a != NULL) && (sk_num(a) != 0)) \
M_ASN1_I2D_len_SEQUENCE(a,f);
...
...
@@ -379,6 +387,10 @@ err:\
#define M_ASN1_I2D_put_SEQUENCE(a,f) i2d_ASN1_SET(a,&p,f,V_ASN1_SEQUENCE,\
V_ASN1_UNIVERSAL,IS_SEQUENCE)
#define M_ASN1_I2D_put_SEQUENCE_type(type,a,f) \
i2d_ASN1_SET_OF_##type(a,&p,f,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL, \
IS_SEQUENCE)
#define M_ASN1_I2D_put_SEQUENCE_opt(a,f) \
if ((a != NULL) && (sk_num(a) != 0)) \
M_ASN1_I2D_put_SEQUENCE(a,f);
...
...
crypto/evp/evp.h
浏览文件 @
cfdcfede
...
...
@@ -164,11 +164,7 @@ typedef struct evp_pkey_st
struct
dh_st
*
dh
;
/* DH */
}
pkey
;
int
save_parameters
;
#ifdef HEADER_STACK_H
STACK
/* X509_ATTRIBUTE */
*
attributes
;
/* [ 0 ] */
#else
char
/* X509_ATTRIBUTE */
*
attributes
;
/* [ 0 ] */
#endif
STACK
/*X509_ATTRIBUTE*/
*
attributes
;
/* [ 0 ] */
}
EVP_PKEY
;
#define EVP_PKEY_MO_SIGN 0x0001
...
...
crypto/x509/x509.h
浏览文件 @
cfdcfede
...
...
@@ -126,7 +126,7 @@ typedef struct X509_pubkey_st
{
X509_ALGOR
*
algor
;
ASN1_BIT_STRING
*
public_key
;
struct
evp_pkey_st
/* EVP_PKEY*/
*
pkey
;
EVP_PKEY
*
pkey
;
}
X509_PUBKEY
;
typedef
struct
X509_sig_st
...
...
@@ -256,6 +256,8 @@ typedef struct x509_attributes_st
}
value
;
}
X509_ATTRIBUTE
;
DECLARE_STACK_OF
(
X509_ATTRIBUTE
);
typedef
struct
private_key_st
{
int
version
;
...
...
crypto/x509v3/v3_sxnet.c
浏览文件 @
cfdcfede
...
...
@@ -109,12 +109,12 @@ unsigned char **pp;
M_ASN1_I2D_vars
(
a
);
M_ASN1_I2D_len
(
a
->
version
,
i2d_ASN1_INTEGER
);
M_ASN1_I2D_len_SEQUENCE
(
a
->
ids
,
i2d_SXNETID
);
M_ASN1_I2D_len_SEQUENCE
_type
(
SXNETID
,
a
->
ids
,
i2d_SXNETID
);
M_ASN1_I2D_seq_total
();
M_ASN1_I2D_put
(
a
->
version
,
i2d_ASN1_INTEGER
);
M_ASN1_I2D_put_SEQUENCE
(
a
->
ids
,
i2d_SXNETID
);
M_ASN1_I2D_put_SEQUENCE
_type
(
SXNETID
,
a
->
ids
,
i2d_SXNETID
);
M_ASN1_I2D_finish
();
}
...
...
@@ -125,7 +125,7 @@ SXNET *SXNET_new()
ASN1_CTX
c
;
M_ASN1_New_Malloc
(
ret
,
SXNET
);
M_ASN1_New
(
ret
->
version
,
ASN1_INTEGER_new
);
M_ASN1_New
(
ret
->
ids
,
sk_new_null
);
M_ASN1_New
(
ret
->
ids
,
sk_
SXNETID_
new_null
);
return
(
ret
);
M_ASN1_New_Error
(
ASN1_F_SXNET_NEW
);
}
...
...
@@ -139,7 +139,7 @@ long length;
M_ASN1_D2I_Init
();
M_ASN1_D2I_start_sequence
();
M_ASN1_D2I_get
(
ret
->
version
,
d2i_ASN1_INTEGER
);
M_ASN1_D2I_get_seq
(
ret
->
ids
,
d2i_SXNETID
,
SXNETID_free
);
M_ASN1_D2I_get_seq
_type
(
SXNETID
,
ret
->
ids
,
d2i_SXNETID
,
SXNETID_free
);
M_ASN1_D2I_Finish
(
a
,
SXNET_free
,
ASN1_F_D2I_SXNET
);
}
...
...
@@ -148,8 +148,8 @@ SXNET *a;
{
if
(
a
==
NULL
)
return
;
ASN1_INTEGER_free
(
a
->
version
);
sk_pop_free
(
a
->
ids
,
SXNETID_free
);
Free
(
(
char
*
)
a
);
sk_
SXNETID_
pop_free
(
a
->
ids
,
SXNETID_free
);
Free
(
a
);
}
int
i2d_SXNETID
(
a
,
pp
)
...
...
@@ -199,7 +199,7 @@ SXNETID *a;
if
(
a
==
NULL
)
return
;
ASN1_INTEGER_free
(
a
->
zone
);
ASN1_OCTET_STRING_free
(
a
->
user
);
Free
(
(
char
*
)
a
);
Free
(
a
);
}
static
int
sxnet_i2r
(
method
,
sx
,
out
,
indent
)
...
...
@@ -214,8 +214,8 @@ int indent;
int
i
;
v
=
ASN1_INTEGER_get
(
sx
->
version
);
BIO_printf
(
out
,
"%*sVersion: %d (0x%X)"
,
indent
,
""
,
v
+
1
,
v
);
for
(
i
=
0
;
i
<
sk_num
(
sx
->
ids
);
i
++
)
{
id
=
(
SXNETID
*
)
sk
_value
(
sx
->
ids
,
i
);
for
(
i
=
0
;
i
<
sk_
SXNETID_
num
(
sx
->
ids
);
i
++
)
{
id
=
sk_SXNETID
_value
(
sx
->
ids
,
i
);
tmp
=
i2s_ASN1_INTEGER
(
NULL
,
id
->
zone
);
BIO_printf
(
out
,
"
\n
%*sZone: %s, User: "
,
indent
,
""
,
tmp
);
Free
(
tmp
);
...
...
@@ -323,7 +323,7 @@ int userlen;
if
(
userlen
==
-
1
)
userlen
=
strlen
(
user
);
if
(
!
ASN1_OCTET_STRING_set
(
id
->
user
,
user
,
userlen
))
goto
err
;
if
(
!
sk_
push
(
sx
->
ids
,
(
char
*
)
id
))
goto
err
;
if
(
!
sk_
SXNETID_push
(
sx
->
ids
,
id
))
goto
err
;
id
->
zone
=
zone
;
return
1
;
...
...
@@ -372,9 +372,12 @@ ASN1_INTEGER *zone;
{
SXNETID
*
id
;
int
i
;
for
(
i
=
0
;
i
<
sk_num
(
sx
->
ids
);
i
++
)
{
id
=
(
SXNETID
*
)
sk
_value
(
sx
->
ids
,
i
);
for
(
i
=
0
;
i
<
sk_
SXNETID_
num
(
sx
->
ids
);
i
++
)
{
id
=
sk_SXNETID
_value
(
sx
->
ids
,
i
);
if
(
!
ASN1_INTEGER_cmp
(
id
->
zone
,
zone
))
return
id
->
user
;
}
return
NULL
;
}
IMPLEMENT_STACK_OF
(
SXNETID
)
IMPLEMENT_ASN1_SET_OF
(
SXNETID
)
crypto/x509v3/x509v3.h
浏览文件 @
cfdcfede
...
...
@@ -184,16 +184,19 @@ union {
/* Strong extranet structures */
typedef
struct
SXNET_st
{
ASN1_INTEGER
*
version
;
STACK
/* SXNETID */
*
ids
;
}
SXNET
;
typedef
struct
SXNET_ID_st
{
ASN1_INTEGER
*
zone
;
ASN1_OCTET_STRING
*
user
;
}
SXNETID
;
DECLARE_STACK_OF
(
SXNETID
)
DECLARE_ASN1_SET_OF
(
SXNETID
)
typedef
struct
SXNET_st
{
ASN1_INTEGER
*
version
;
STACK_OF
(
SXNETID
)
*
ids
;
}
SXNET
;
#define X509V3_conf_err(val) ERR_add_error_data(6, "section:", val->section, \
",name:", val->name, ",value:", val->value);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录