Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
5f8f94a6
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
1 年多 前同步成功
通知
10
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看板
提交
5f8f94a6
编写于
4月 28, 2009
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update from 1.0.0-stable.
上级
3c3f98dc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
41 addition
and
21 deletion
+41
-21
CHANGES
CHANGES
+4
-0
crypto/stack/safestack.h
crypto/stack/safestack.h
+29
-21
ssl/t1_lib.c
ssl/t1_lib.c
+8
-0
未找到文件。
CHANGES
浏览文件 @
5f8f94a6
...
...
@@ -4,6 +4,10 @@
Changes between 0.9.8k and 1.0 [xx XXX xxxx]
*) Add CHECKED_STACK_OF macro to safestack.h, otherwise safestack can't
be used on C++.
[Steve Henson]
*) Add "missing" function EVP_MD_flags() (without this the only way to
retrieve a digest flags is by accessing the structure directly. Update
EVP_MD_do_all*() and EVP_CIPHER_do_all*() to include the name a digest
...
...
crypto/stack/safestack.h
浏览文件 @
5f8f94a6
...
...
@@ -62,6 +62,14 @@
((void*) (1 ? p : (type*)0))
#endif
/* In C++ we get problems because an explicit cast is needed from (void *)
* we use CHECKED_STACK_OF to ensure the correct type is passed in the macros
* below.
*/
#define CHECKED_STACK_OF(type, p) \
((_STACK*) (1 ? p : (STACK_OF(type)*)0))
#define CHECKED_SK_FREE_FUNC(type, p) \
((void (*)(void *)) ((1 ? p : (void (*)(type *))0)))
...
...
@@ -130,55 +138,55 @@ DECLARE_SPECIAL_STACK_OF(BLOCK, void)
#define SKM_sk_new_null(type) \
((STACK_OF(type) *)sk_new_null())
#define SKM_sk_free(type, st) \
sk_free(CHECKED_
PTR_OF(STACK_OF(type)
, st))
sk_free(CHECKED_
STACK_OF(type
, st))
#define SKM_sk_num(type, st) \
sk_num(CHECKED_
PTR_OF(STACK_OF(type)
, st))
sk_num(CHECKED_
STACK_OF(type
, st))
#define SKM_sk_value(type, st,i) \
((type *)sk_value(CHECKED_
PTR_OF(STACK_OF(type)
, st), i))
((type *)sk_value(CHECKED_
STACK_OF(type
, st), i))
#define SKM_sk_set(type, st,i,val) \
sk_set(CHECKED_
PTR_OF(STACK_OF(type)
, st), i, CHECKED_PTR_OF(type, val))
sk_set(CHECKED_
STACK_OF(type
, st), i, CHECKED_PTR_OF(type, val))
#define SKM_sk_zero(type, st) \
sk_zero(CHECKED_
PTR_OF(STACK_OF(type)
, st))
sk_zero(CHECKED_
STACK_OF(type
, st))
#define SKM_sk_push(type, st, val) \
sk_push(CHECKED_
PTR_OF(STACK_OF(type)
, st), CHECKED_PTR_OF(type, val))
sk_push(CHECKED_
STACK_OF(type
, st), CHECKED_PTR_OF(type, val))
#define SKM_sk_unshift(type, st, val) \
sk_unshift(CHECKED_
PTR_OF(STACK_OF(type)
, st), CHECKED_PTR_OF(type, val))
sk_unshift(CHECKED_
STACK_OF(type
, st), CHECKED_PTR_OF(type, val))
#define SKM_sk_find(type, st, val) \
sk_find(CHECKED_
PTR_OF(STACK_OF(type)
, st), CHECKED_PTR_OF(type, val))
sk_find(CHECKED_
STACK_OF(type
, st), CHECKED_PTR_OF(type, val))
#define SKM_sk_find_ex(type, st, val) \
sk_find_ex(CHECKED_
PTR_OF(STACK_OF(type)
, st), \
sk_find_ex(CHECKED_
STACK_OF(type
, st), \
CHECKED_PTR_OF(type, val))
#define SKM_sk_delete(type, st, i) \
(type *)sk_delete(CHECKED_
PTR_OF(STACK_OF(type)
, st), i)
(type *)sk_delete(CHECKED_
STACK_OF(type
, st), i)
#define SKM_sk_delete_ptr(type, st, ptr) \
(type *)sk_delete_ptr(CHECKED_
PTR_OF(STACK_OF(type)
, st), CHECKED_PTR_OF(type, ptr))
(type *)sk_delete_ptr(CHECKED_
STACK_OF(type
, st), CHECKED_PTR_OF(type, ptr))
#define SKM_sk_insert(type, st,val, i) \
sk_insert(CHECKED_
PTR_OF(STACK_OF(type)
, st), CHECKED_PTR_OF(type, val), i)
sk_insert(CHECKED_
STACK_OF(type
, st), CHECKED_PTR_OF(type, val), i)
#define SKM_sk_set_cmp_func(type, st, cmp) \
((int (*)(const type * const *,const type * const *)) \
sk_set_cmp_func(CHECKED_
PTR_OF(STACK_OF(type)
, st), CHECKED_SK_CMP_FUNC(type, cmp)))
sk_set_cmp_func(CHECKED_
STACK_OF(type
, st), CHECKED_SK_CMP_FUNC(type, cmp)))
#define SKM_sk_dup(type, st) \
(STACK_OF(type) *)sk_dup(CHECKED_
PTR_OF(STACK_OF(type)
, st))
(STACK_OF(type) *)sk_dup(CHECKED_
STACK_OF(type
, st))
#define SKM_sk_pop_free(type, st, free_func) \
sk_pop_free(CHECKED_
PTR_OF(STACK_OF(type)
, st), CHECKED_SK_FREE_FUNC(type, free_func))
sk_pop_free(CHECKED_
STACK_OF(type
, st), CHECKED_SK_FREE_FUNC(type, free_func))
#define SKM_sk_shift(type, st) \
(type *)sk_shift(CHECKED_
PTR_OF(STACK_OF(type)
, st))
(type *)sk_shift(CHECKED_
STACK_OF(type
, st))
#define SKM_sk_pop(type, st) \
(type *)sk_pop(CHECKED_
PTR_OF(STACK_OF(type)
, st))
(type *)sk_pop(CHECKED_
STACK_OF(type
, st))
#define SKM_sk_sort(type, st) \
sk_sort(CHECKED_
PTR_OF(STACK_OF(type)
, st))
sk_sort(CHECKED_
STACK_OF(type
, st))
#define SKM_sk_is_sorted(type, st) \
sk_is_sorted(CHECKED_
PTR_OF(STACK_OF(type)
, st))
sk_is_sorted(CHECKED_
STACK_OF(type
, st))
#define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
(STACK_OF(type) *)d2i_ASN1_SET(CHECKED_
PTR_OF(STACK_OF(type)
, st), \
(STACK_OF(type) *)d2i_ASN1_SET(CHECKED_
STACK_OF(type
, st), \
pp, length, \
CHECKED_D2I_OF(type, d2i_func), \
CHECKED_SK_FREE_FUNC(type, free_func), \
ex_tag, ex_class)
#define SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \
i2d_ASN1_SET(CHECKED_
PTR_OF(STACK_OF(type)
, st), pp, \
i2d_ASN1_SET(CHECKED_
STACK_OF(type
, st), pp, \
CHECKED_I2D_OF(type, i2d_func), \
ex_tag, ex_class, is_set)
...
...
ssl/t1_lib.c
浏览文件 @
5f8f94a6
...
...
@@ -275,6 +275,10 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha
int
extdatalen
=
0
;
unsigned
char
*
ret
=
p
;
/* don't add extensions for SSLv3 */
if
(
s
->
client_version
==
SSL3_VERSION
)
return
p
;
ret
+=
2
;
if
(
ret
>=
limit
)
return
NULL
;
/* this really never occurs, but ... */
...
...
@@ -472,6 +476,10 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha
int
extdatalen
=
0
;
unsigned
char
*
ret
=
p
;
/* don't add extensions for SSLv3 */
if
(
s
->
version
==
SSL3_VERSION
)
return
p
;
ret
+=
2
;
if
(
ret
>=
limit
)
return
NULL
;
/* this really never occurs, but ... */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录