Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
606f6c47
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,发现更多精彩内容 >>
提交
606f6c47
编写于
10月 20, 2008
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix a shed load or warnings:
Duplicate const. Use of ; outside function.
上级
1581f822
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
30 addition
and
29 deletion
+30
-29
crypto/asn1/ameth_lib.c
crypto/asn1/ameth_lib.c
+5
-5
crypto/evp/pmeth_lib.c
crypto/evp/pmeth_lib.c
+5
-5
crypto/objects/obj_dat.c
crypto/objects/obj_dat.c
+6
-6
crypto/objects/obj_xref.c
crypto/objects/obj_xref.c
+4
-4
crypto/objects/objects.h
crypto/objects/objects.h
+6
-5
crypto/x509/x509_vpm.c
crypto/x509/x509_vpm.c
+2
-2
ssl/s2_lib.c
ssl/s2_lib.c
+1
-1
ssl/ssl_locl.h
ssl/ssl_locl.h
+1
-1
未找到文件。
crypto/asn1/ameth_lib.c
浏览文件 @
606f6c47
...
...
@@ -112,7 +112,7 @@ void main()
}
#endif
DECLARE_OBJ_BSEARCH_CMP_FN
(
EVP_PKEY_ASN1_METHOD
*
,
DECLARE_OBJ_BSEARCH_CMP_FN
(
const
EVP_PKEY_ASN1_METHOD
*
,
const
EVP_PKEY_ASN1_METHOD
*
,
ameth_cmp
);
static
int
ameth_cmp
(
const
EVP_PKEY_ASN1_METHOD
*
const
*
a
,
...
...
@@ -121,7 +121,7 @@ static int ameth_cmp(const EVP_PKEY_ASN1_METHOD * const *a,
return
((
*
a
)
->
pkey_id
-
(
*
b
)
->
pkey_id
);
}
IMPLEMENT_OBJ_BSEARCH_CMP_FN
(
EVP_PKEY_ASN1_METHOD
*
,
IMPLEMENT_OBJ_BSEARCH_CMP_FN
(
const
EVP_PKEY_ASN1_METHOD
*
,
const
EVP_PKEY_ASN1_METHOD
*
,
ameth_cmp
);
int
EVP_PKEY_asn1_get_count
(
void
)
...
...
@@ -145,8 +145,8 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_get0(int idx)
static
const
EVP_PKEY_ASN1_METHOD
*
pkey_asn1_find
(
int
type
)
{
EVP_PKEY_ASN1_METHOD
tmp
,
*
t
=
&
tmp
;
const
EVP_PKEY_ASN1_METHOD
**
ret
;
EVP_PKEY_ASN1_METHOD
tmp
;
const
EVP_PKEY_ASN1_METHOD
*
t
=
&
tmp
,
*
*
ret
;
tmp
.
pkey_id
=
type
;
if
(
app_methods
)
{
...
...
@@ -155,7 +155,7 @@ static const EVP_PKEY_ASN1_METHOD *pkey_asn1_find(int type)
if
(
idx
>=
0
)
return
sk_EVP_PKEY_ASN1_METHOD_value
(
app_methods
,
idx
);
}
ret
=
OBJ_bsearch
(
EVP_PKEY_ASN1_METHOD
*
,
&
t
,
ret
=
OBJ_bsearch
(
const
EVP_PKEY_ASN1_METHOD
*
,
&
t
,
const
EVP_PKEY_ASN1_METHOD
*
,
standard_methods
,
sizeof
(
standard_methods
)
/
sizeof
(
EVP_PKEY_ASN1_METHOD
*
),
...
...
crypto/evp/pmeth_lib.c
浏览文件 @
606f6c47
...
...
@@ -84,7 +84,7 @@ static const EVP_PKEY_METHOD *standard_methods[] =
&
hmac_pkey_meth
,
};
DECLARE_OBJ_BSEARCH_CMP_FN
(
EVP_PKEY_METHOD
*
,
const
EVP_PKEY_METHOD
*
,
DECLARE_OBJ_BSEARCH_CMP_FN
(
const
EVP_PKEY_METHOD
*
,
const
EVP_PKEY_METHOD
*
,
pmeth_cmp
);
static
int
pmeth_cmp
(
const
EVP_PKEY_METHOD
*
const
*
a
,
...
...
@@ -93,13 +93,13 @@ static int pmeth_cmp(const EVP_PKEY_METHOD * const *a,
return
((
*
a
)
->
pkey_id
-
(
*
b
)
->
pkey_id
);
}
IMPLEMENT_OBJ_BSEARCH_CMP_FN
(
EVP_PKEY_METHOD
*
,
const
EVP_PKEY_METHOD
*
,
IMPLEMENT_OBJ_BSEARCH_CMP_FN
(
const
EVP_PKEY_METHOD
*
,
const
EVP_PKEY_METHOD
*
,
pmeth_cmp
);
const
EVP_PKEY_METHOD
*
EVP_PKEY_meth_find
(
int
type
)
{
EVP_PKEY_METHOD
tmp
,
*
t
=
&
tmp
;
const
EVP_PKEY_METHOD
**
ret
;
EVP_PKEY_METHOD
tmp
;
const
EVP_PKEY_METHOD
*
t
=
&
tmp
,
*
*
ret
;
tmp
.
pkey_id
=
type
;
if
(
app_pkey_methods
)
{
...
...
@@ -108,7 +108,7 @@ const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type)
if
(
idx
>=
0
)
return
sk_EVP_PKEY_METHOD_value
(
app_pkey_methods
,
idx
);
}
ret
=
OBJ_bsearch
(
EVP_PKEY_METHOD
*
,
&
t
,
ret
=
OBJ_bsearch
(
const
EVP_PKEY_METHOD
*
,
&
t
,
const
EVP_PKEY_METHOD
*
,
standard_methods
,
sizeof
(
standard_methods
)
/
sizeof
(
EVP_PKEY_METHOD
*
),
pmeth_cmp
);
...
...
crypto/objects/obj_dat.c
浏览文件 @
606f6c47
...
...
@@ -81,9 +81,9 @@ static const unsigned int ln_objs[1];
static
const
unsigned
int
obj_objs
[
1
];
#endif
DECLARE_OBJ_BSEARCH_CMP_FN
(
const
ASN1_OBJECT
*
,
const
unsigned
int
,
sn_cmp
);
DECLARE_OBJ_BSEARCH_CMP_FN
(
const
ASN1_OBJECT
*
,
const
unsigned
int
,
ln_cmp
);
DECLARE_OBJ_BSEARCH_CMP_FN
(
const
ASN1_OBJECT
*
,
const
unsigned
int
,
obj_cmp
);
DECLARE_OBJ_BSEARCH_CMP_FN
(
const
ASN1_OBJECT
*
,
unsigned
int
,
sn_cmp
);
DECLARE_OBJ_BSEARCH_CMP_FN
(
const
ASN1_OBJECT
*
,
unsigned
int
,
ln_cmp
);
DECLARE_OBJ_BSEARCH_CMP_FN
(
const
ASN1_OBJECT
*
,
unsigned
int
,
obj_cmp
);
#define ADDED_DATA 0
#define ADDED_SNAME 1
...
...
@@ -103,12 +103,12 @@ static LHASH_OF(ADDED_OBJ) *added=NULL;
static
int
sn_cmp
(
const
ASN1_OBJECT
*
const
*
a
,
const
unsigned
int
*
b
)
{
return
(
strcmp
((
*
a
)
->
sn
,
nid_objs
[
*
b
].
sn
));
}
IMPLEMENT_OBJ_BSEARCH_CMP_FN
(
const
ASN1_OBJECT
*
,
const
unsigned
int
,
sn_cmp
)
IMPLEMENT_OBJ_BSEARCH_CMP_FN
(
const
ASN1_OBJECT
*
,
unsigned
int
,
sn_cmp
);
static
int
ln_cmp
(
const
ASN1_OBJECT
*
const
*
a
,
const
unsigned
int
*
b
)
{
return
(
strcmp
((
*
a
)
->
ln
,
nid_objs
[
*
b
].
ln
));
}
IMPLEMENT_OBJ_BSEARCH_CMP_FN
(
const
ASN1_OBJECT
*
,
const
unsigned
int
,
ln_cmp
)
IMPLEMENT_OBJ_BSEARCH_CMP_FN
(
const
ASN1_OBJECT
*
,
unsigned
int
,
ln_cmp
);
static
unsigned
long
added_obj_hash
(
const
ADDED_OBJ
*
ca
)
{
...
...
@@ -393,7 +393,7 @@ static int obj_cmp(const ASN1_OBJECT * const *ap, const unsigned int *bp)
return
(
memcmp
(
a
->
data
,
b
->
data
,
a
->
length
));
}
IMPLEMENT_OBJ_BSEARCH_CMP_FN
(
const
ASN1_OBJECT
*
,
const
unsigned
int
,
obj_cmp
)
IMPLEMENT_OBJ_BSEARCH_CMP_FN
(
const
ASN1_OBJECT
*
,
unsigned
int
,
obj_cmp
);
int
OBJ_obj2nid
(
const
ASN1_OBJECT
*
a
)
{
...
...
crypto/objects/obj_xref.c
浏览文件 @
606f6c47
...
...
@@ -67,8 +67,8 @@ static int cmp_sig(const nid_triple *a, const nid_triple *b)
return
a
->
sign_id
-
b
->
sign_id
;
}
DECLARE_OBJ_BSEARCH_CMP_FN
(
const
nid_triple
,
const
nid_triple
,
cmp_sig
);
IMPLEMENT_OBJ_BSEARCH_CMP_FN
(
const
nid_triple
,
const
nid_triple
,
cmp_sig
)
DECLARE_OBJ_BSEARCH_CMP_FN
(
nid_triple
,
nid_triple
,
cmp_sig
);
IMPLEMENT_OBJ_BSEARCH_CMP_FN
(
nid_triple
,
nid_triple
,
cmp_sig
);
static
int
cmp_sig_sk
(
const
nid_triple
*
const
*
a
,
const
nid_triple
*
const
*
b
)
{
...
...
@@ -86,7 +86,7 @@ static int cmp_sigx(const nid_triple * const *a, const nid_triple * const *b)
return
(
*
a
)
->
pkey_id
-
(
*
b
)
->
pkey_id
;
}
IMPLEMENT_OBJ_BSEARCH_CMP_FN
(
const
nid_triple
*
,
const
nid_triple
*
,
cmp_sigx
)
IMPLEMENT_OBJ_BSEARCH_CMP_FN
(
const
nid_triple
*
,
const
nid_triple
*
,
cmp_sigx
)
;
int
OBJ_find_sigid_algs
(
int
signid
,
int
*
pdig_nid
,
int
*
ppkey_nid
)
{
...
...
@@ -120,7 +120,7 @@ int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid)
int
OBJ_find_sigid_by_algs
(
int
*
psignid
,
int
dig_nid
,
int
pkey_nid
)
{
nid_triple
tmp
;
const
nid_triple
const
*
t
=&
tmp
;
const
nid_triple
*
t
=&
tmp
;
const
nid_triple
**
rv
=
NULL
;
tmp
.
hash_id
=
dig_nid
;
...
...
crypto/objects/objects.h
浏览文件 @
606f6c47
...
...
@@ -1022,7 +1022,7 @@ const void * OBJ_bsearch_ex_(const void *key,const void *base,int num,
scope type1 *cmp##_type_1; \
scope type2 *cmp##_type_2; \
scope int cmp##_BSEARCH_CMP_FN(const void *, const void *); \
scope int cmp(
const type1 const *, const
type2 const *)
scope int cmp(
type1 const *,
type2 const *)
#define DECLARE_OBJ_BSEARCH_CMP_FN(type1, type2, cmp) \
_DECLARE_OBJ_BSEARCH_CMP_FN(static, type1, type2, cmp)
...
...
@@ -1058,10 +1058,11 @@ const void * OBJ_bsearch_ex_(const void *key,const void *base,int num,
#define _IMPLEMENT_OBJ_BSEARCH_CMP_FN(scope, type1, type2, cmp) \
scope int cmp##_BSEARCH_CMP_FN(const void *a_, const void *b_) \
{ \
const
type1 const *a = a_; \
const
type2 const *b = b_; \
type1 const *a = a_; \
type2 const *b = b_; \
return cmp(a,b); \
}
} \
extern void dummy_prototype(void)
#define IMPLEMENT_OBJ_BSEARCH_CMP_FN(type1, type2, cmp) \
_IMPLEMENT_OBJ_BSEARCH_CMP_FN(static, type1, type2, cmp)
...
...
@@ -1076,7 +1077,7 @@ const void * OBJ_bsearch_ex_(const void *key,const void *base,int num,
cmp##_BSEARCH_CMP_FN)))
#define OBJ_bsearch_ex(type1,key,type2,base,num,cmp,flags) \
((type2 *)OBJ_bsearch_(CHECKED_PTR_OF(type1,key),CHECKED_PTR_OF(type2,base), \
((type2 *)OBJ_bsearch_
ex_
(CHECKED_PTR_OF(type1,key),CHECKED_PTR_OF(type2,base), \
num,sizeof(type2), \
((void)CHECKED_PTR_OF(type1,cmp##_type_1), \
(void)type_2=CHECKED_PTR_OF(type2,cmp##_type_2), \
...
...
crypto/x509/x509_vpm.c
浏览文件 @
606f6c47
...
...
@@ -362,9 +362,9 @@ static int table_cmp(const X509_VERIFY_PARAM *a, const X509_VERIFY_PARAM *b)
return
strcmp
(
a
->
name
,
b
->
name
);
}
DECLARE_OBJ_BSEARCH_CMP_FN
(
const
X509_VERIFY_PARAM
,
const
X509_VERIFY_PARAM
,
DECLARE_OBJ_BSEARCH_CMP_FN
(
X509_VERIFY_PARAM
,
X509_VERIFY_PARAM
,
table_cmp
);
IMPLEMENT_OBJ_BSEARCH_CMP_FN
(
const
X509_VERIFY_PARAM
,
const
X509_VERIFY_PARAM
,
IMPLEMENT_OBJ_BSEARCH_CMP_FN
(
X509_VERIFY_PARAM
,
X509_VERIFY_PARAM
,
table_cmp
);
static
int
param_cmp
(
const
X509_VERIFY_PARAM
*
const
*
a
,
...
...
ssl/s2_lib.c
浏览文件 @
606f6c47
...
...
@@ -412,7 +412,7 @@ long ssl2_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void))
return
(
0
);
}
IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN
(
const
SSL_CIPHER
,
const
SSL_CIPHER
,
IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN
(
SSL_CIPHER
,
SSL_CIPHER
,
ssl_cipher_id_cmp
);
/* This function needs to check if the ciphers required are actually
...
...
ssl/ssl_locl.h
浏览文件 @
606f6c47
...
...
@@ -784,7 +784,7 @@ int ssl_set_peer_cert_type(SESS_CERT *c, int type);
int
ssl_get_new_session
(
SSL
*
s
,
int
session
);
int
ssl_get_prev_session
(
SSL
*
s
,
unsigned
char
*
session
,
int
len
,
const
unsigned
char
*
limit
);
int
ssl_cipher_id_cmp
(
const
SSL_CIPHER
*
a
,
const
SSL_CIPHER
*
b
);
DECLARE_OBJ_BSEARCH_GLOBAL_CMP_FN
(
const
SSL_CIPHER
,
const
SSL_CIPHER
,
DECLARE_OBJ_BSEARCH_GLOBAL_CMP_FN
(
SSL_CIPHER
,
SSL_CIPHER
,
ssl_cipher_id_cmp
);
int
ssl_cipher_ptr_id_cmp
(
const
SSL_CIPHER
*
const
*
ap
,
const
SSL_CIPHER
*
const
*
bp
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录