Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
297e6f19
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看板
提交
297e6f19
编写于
17年前
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Avoid use of function pointer casts in pem library. Modify safestack to
always use inline functions.
上级
b948e2c5
变更
6
展开全部
隐藏空白更改
内联
并排
Showing
6 changed file
with
23 addition
and
1960 deletion
+23
-1960
CHANGES
CHANGES
+4
-4
Makefile.org
Makefile.org
+1
-4
crypto/pem/pem.h
crypto/pem/pem.h
+12
-12
crypto/pem/pem_lib.c
crypto/pem/pem_lib.c
+2
-2
crypto/pem/pem_pkey.c
crypto/pem/pem_pkey.c
+4
-4
crypto/stack/safestack.h
crypto/stack/safestack.h
+0
-1934
未找到文件。
CHANGES
浏览文件 @
297e6f19
...
...
@@ -93,10 +93,10 @@
[Nils Larsch]
*) Initial incomplete changes to avoid need for function casts in OpenSSL
when OPENSSL_NO_FCAST is set: some compilers (gcc 4.2 and later) reject
their use. Safestack is reimplemented using inline functions: tests show
t
hat these calls are typically optimized away by compilers so they have
no additional overhead.
Update ASN1 to avoid use of legacy functions.
some compilers (gcc 4.2 and later) reject their use. Safestack is
reimplemented using inline functions: tests show that these calls are
t
ypically optimized away by compilers so they have no additional overhead.
Update ASN1 to avoid use of legacy functions.
[Steve Henson]
*) Win32/64 targets are linked with Winsock2.
...
...
This diff is collapsed.
Click to expand it.
Makefile.org
浏览文件 @
297e6f19
...
...
@@ -421,9 +421,6 @@ errors:
(
cd
engines
;
$(MAKE)
PERL
=
$(PERL)
errors
)
$(PERL)
util/ck_errf.pl
*
/
*
.c
*
/
*
/
*
.c
stacks
:
$(PERL)
util/mkstack.pl
-write
util/libeay.num
::
$(PERL)
util/mkdef.pl crypto update
...
...
@@ -448,7 +445,7 @@ TABLE: Configure
(
echo
'Output of `Configure TABLE'
"':"
;
\
$(PERL)
Configure TABLE
)
>
TABLE
update
:
errors
stacks
util/libeay.num util/ssleay.num crypto/objects/obj_dat.h crypto/objects/obj_xref.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend
update
:
errors util/libeay.num util/ssleay.num crypto/objects/obj_dat.h crypto/objects/obj_xref.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend
# Build distribution tar-file. As the list of files returned by "find" is
# pretty long, on several platforms a "too many arguments" error or similar
...
...
This diff is collapsed.
Click to expand it.
crypto/pem/pem.h
浏览文件 @
297e6f19
...
...
@@ -221,19 +221,19 @@ typedef struct pem_ctx_st
#define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\
{ \
return
(((type *(*)(D2I_OF(type),char *,FILE *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read))(d2i_##asn1, str,fp,x,cb,u)
); \
return
PEM_ASN1_read((d2i_of_void *)d2i_##asn1, str,fp,(void **)x,cb,u
); \
}
#define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
int PEM_write_##name(FILE *fp, type *x) \
{ \
return
(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)
); \
return
PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL
); \
}
#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
int PEM_write_##name(FILE *fp, const type *x) \
{ \
return
(((int (*)(I2D_OF_const(type),const char *,FILE *, const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)
); \
return
PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(void *)x,NULL,NULL,0,NULL,NULL
); \
}
#define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
...
...
@@ -241,7 +241,7 @@ int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
unsigned char *kstr, int klen, pem_password_cb *cb, \
void *u) \
{ \
return
(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)
); \
return
PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u
); \
}
#define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \
...
...
@@ -249,7 +249,7 @@ int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
unsigned char *kstr, int klen, pem_password_cb *cb, \
void *u) \
{ \
return
(((int (*)(I2D_OF_const(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)
); \
return
PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u
); \
}
#endif
...
...
@@ -257,33 +257,33 @@ int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
#define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
{ \
return
(((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i_##asn1, str,bp,x,cb,u)
); \
return
PEM_ASN1_read_bio((d2i_of_void *)d2i_##asn1, str,bp,(void **)x,cb,u
); \
}
#define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
int PEM_write_bio_##name(BIO *bp, type *x) \
{ \
return
(((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)
); \
return
PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL
); \
}
#define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
int PEM_write_bio_##name(BIO *bp, const type *x) \
{ \
return
(((int (*)(I2D_OF_const(type),const char *,BIO *,const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)
); \
return
PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(void *)x,NULL,NULL,0,NULL,NULL
); \
}
#define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
{ \
return
(((int (*)(I2D_OF(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)
); \
return
PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u
); \
}
#define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
{ \
return
(((int (*)(I2D_OF_const(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)
); \
return
PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(void *)x,enc,kstr,klen,cb,u
); \
}
#define IMPLEMENT_PEM_write(name, type, str, asn1) \
...
...
@@ -416,7 +416,7 @@ void * PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp,
void
**
x
,
pem_password_cb
*
cb
,
void
*
u
);
#define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \
((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i,name,bp,x,cb,u)
int
PEM_ASN1_write_bio
(
i2d_of_void
*
i2d
,
const
char
*
name
,
BIO
*
bp
,
char
*
x
,
int
PEM_ASN1_write_bio
(
i2d_of_void
*
i2d
,
const
char
*
name
,
BIO
*
bp
,
void
*
x
,
const
EVP_CIPHER
*
enc
,
unsigned
char
*
kstr
,
int
klen
,
pem_password_cb
*
cb
,
void
*
u
);
#define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \
...
...
@@ -433,7 +433,7 @@ int PEM_write(FILE *fp,char *name,char *hdr,unsigned char *data,long len);
void
*
PEM_ASN1_read
(
d2i_of_void
*
d2i
,
const
char
*
name
,
FILE
*
fp
,
void
**
x
,
pem_password_cb
*
cb
,
void
*
u
);
int
PEM_ASN1_write
(
i2d_of_void
*
i2d
,
const
char
*
name
,
FILE
*
fp
,
char
*
x
,
const
EVP_CIPHER
*
enc
,
unsigned
char
*
kstr
,
void
*
x
,
const
EVP_CIPHER
*
enc
,
unsigned
char
*
kstr
,
int
klen
,
pem_password_cb
*
callback
,
void
*
u
);
STACK_OF
(
X509_INFO
)
*
PEM_X509_INFO_read
(
FILE
*
fp
,
STACK_OF
(
X509_INFO
)
*
sk
,
pem_password_cb
*
cb
,
void
*
u
);
...
...
This diff is collapsed.
Click to expand it.
crypto/pem/pem_lib.c
浏览文件 @
297e6f19
...
...
@@ -301,7 +301,7 @@ err:
#ifndef OPENSSL_NO_FP_API
int
PEM_ASN1_write
(
i2d_of_void
*
i2d
,
const
char
*
name
,
FILE
*
fp
,
char
*
x
,
const
EVP_CIPHER
*
enc
,
unsigned
char
*
kstr
,
void
*
x
,
const
EVP_CIPHER
*
enc
,
unsigned
char
*
kstr
,
int
klen
,
pem_password_cb
*
callback
,
void
*
u
)
{
BIO
*
b
;
...
...
@@ -320,7 +320,7 @@ int PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp,
#endif
int
PEM_ASN1_write_bio
(
i2d_of_void
*
i2d
,
const
char
*
name
,
BIO
*
bp
,
char
*
x
,
const
EVP_CIPHER
*
enc
,
unsigned
char
*
kstr
,
void
*
x
,
const
EVP_CIPHER
*
enc
,
unsigned
char
*
kstr
,
int
klen
,
pem_password_cb
*
callback
,
void
*
u
)
{
EVP_CIPHER_CTX
ctx
;
...
...
This diff is collapsed.
Click to expand it.
crypto/pem/pem_pkey.c
浏览文件 @
297e6f19
...
...
@@ -148,8 +148,8 @@ int PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
cb
,
u
);
BIO_snprintf
(
pem_str
,
80
,
"%s PRIVATE KEY"
,
x
->
ameth
->
pem_str
);
return
PEM_ASN1_write_bio
((
i2d_of_void
*
)
openssl_fcast
(
i2d_PrivateKey
)
,
pem_str
,
bp
,
(
char
*
)
x
,
enc
,
kstr
,
klen
,
cb
,
u
);
return
PEM_ASN1_write_bio
((
i2d_of_void
*
)
i2d_PrivateKey
,
pem_str
,
bp
,
x
,
enc
,
kstr
,
klen
,
cb
,
u
);
}
EVP_PKEY
*
PEM_read_bio_Parameters
(
BIO
*
bp
,
EVP_PKEY
**
x
)
...
...
@@ -201,8 +201,8 @@ int PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x)
BIO_snprintf
(
pem_str
,
80
,
"%s PARAMETERS"
,
x
->
ameth
->
pem_str
);
return
PEM_ASN1_write_bio
(
(
i2d_of_void
*
)
openssl_fcast
(
x
->
ameth
->
param_encode
)
,
pem_str
,
bp
,
(
char
*
)
x
,
NULL
,
NULL
,
0
,
0
,
NULL
);
(
i2d_of_void
*
)
x
->
ameth
->
param_encode
,
pem_str
,
bp
,
x
,
NULL
,
NULL
,
0
,
0
,
NULL
);
}
#ifndef OPENSSL_NO_FP_API
...
...
This diff is collapsed.
Click to expand it.
crypto/stack/safestack.h
浏览文件 @
297e6f19
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部