Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
aa4ce731
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,发现更多精彩内容 >>
提交
aa4ce731
编写于
4月 26, 2005
作者:
B
Bodo Möller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix various incorrect error function codes.
("perl util/ck_errf.pl */*.c */*/*.c" still reports many more.)
上级
c741b837
变更
49
隐藏空白更改
内联
并排
Showing
49 changed file
with
111 addition
and
85 deletion
+111
-85
crypto/asn1/a_bitstr.c
crypto/asn1/a_bitstr.c
+1
-1
crypto/asn1/asn1.h
crypto/asn1/asn1.h
+1
-0
crypto/asn1/asn1_err.c
crypto/asn1/asn1_err.c
+1
-0
crypto/bio/bio.h
crypto/bio/bio.h
+1
-0
crypto/bio/bio_err.c
crypto/bio/bio_err.c
+1
-0
crypto/bio/bio_lib.c
crypto/bio/bio_lib.c
+1
-1
crypto/bn/bn.h
crypto/bn/bn.h
+4
-1
crypto/bn/bn_ctx.c
crypto/bn/bn_ctx.c
+1
-2
crypto/bn/bn_err.c
crypto/bn/bn_err.c
+4
-1
crypto/bn/bn_gf2m.c
crypto/bn/bn_gf2m.c
+1
-1
crypto/bn/bn_rand.c
crypto/bn/bn_rand.c
+1
-1
crypto/bn/bn_recp.c
crypto/bn/bn_recp.c
+1
-1
crypto/buffer/buf_err.c
crypto/buffer/buf_err.c
+1
-0
crypto/buffer/buffer.c
crypto/buffer/buffer.c
+1
-1
crypto/buffer/buffer.h
crypto/buffer/buffer.h
+1
-0
crypto/conf/conf.h
crypto/conf/conf.h
+3
-0
crypto/conf/conf_def.c
crypto/conf/conf_def.c
+15
-15
crypto/conf/conf_err.c
crypto/conf/conf_err.c
+3
-0
crypto/conf/conf_mod.c
crypto/conf/conf_mod.c
+1
-1
crypto/dh/dh.h
crypto/dh/dh.h
+4
-3
crypto/dh/dh_err.c
crypto/dh/dh_err.c
+4
-3
crypto/dh/dh_gen.c
crypto/dh/dh_gen.c
+2
-2
crypto/dh/dh_key.c
crypto/dh/dh_key.c
+3
-3
crypto/dso/dso.h
crypto/dso/dso.h
+1
-1
crypto/dso/dso_err.c
crypto/dso/dso_err.c
+1
-1
crypto/dso/dso_vms.c
crypto/dso/dso_vms.c
+5
-5
crypto/ec/ec.h
crypto/ec/ec.h
+7
-4
crypto/ec/ec2_mult.c
crypto/ec/ec2_mult.c
+1
-1
crypto/ec/ec_asn1.c
crypto/ec/ec_asn1.c
+2
-2
crypto/ec/ec_err.c
crypto/ec/ec_err.c
+7
-4
crypto/ec/ec_key.c
crypto/ec/ec_key.c
+1
-1
crypto/ec/ec_lib.c
crypto/ec/ec_lib.c
+2
-2
crypto/ec/ecp_mont.c
crypto/ec/ecp_mont.c
+2
-2
crypto/ec/ecp_nist.c
crypto/ec/ecp_nist.c
+4
-4
crypto/ecdh/ecdh.h
crypto/ecdh/ecdh.h
+1
-1
crypto/ecdh/ech_err.c
crypto/ecdh/ech_err.c
+1
-1
crypto/ecdh/ech_lib.c
crypto/ecdh/ech_lib.c
+2
-2
crypto/ecdsa/ecdsa.h
crypto/ecdsa/ecdsa.h
+1
-1
crypto/ecdsa/ecs_err.c
crypto/ecdsa/ecs_err.c
+1
-1
crypto/ecdsa/ecs_lib.c
crypto/ecdsa/ecs_lib.c
+2
-2
crypto/ecdsa/ecs_ossl.c
crypto/ecdsa/ecs_ossl.c
+2
-2
ssl/bio_ssl.c
ssl/bio_ssl.c
+1
-1
ssl/s3_clnt.c
ssl/s3_clnt.c
+2
-3
ssl/s3_lib.c
ssl/s3_lib.c
+1
-1
ssl/s3_srvr.c
ssl/s3_srvr.c
+4
-4
ssl/ssl.h
ssl/ssl.h
+1
-0
ssl/ssl_err.c
ssl/ssl_err.c
+1
-0
ssl/ssl_lib.c
ssl/ssl_lib.c
+1
-1
util/ck_errf.pl
util/ck_errf.pl
+1
-1
未找到文件。
crypto/asn1/a_bitstr.c
浏览文件 @
aa4ce731
...
...
@@ -165,7 +165,7 @@ ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
*
pp
=
p
;
return
(
ret
);
err:
ASN1err
(
ASN1_F_
D
2I_ASN1_BIT_STRING
,
i
);
ASN1err
(
ASN1_F_
C
2I_ASN1_BIT_STRING
,
i
);
if
((
ret
!=
NULL
)
&&
((
a
==
NULL
)
||
(
*
a
!=
ret
)))
M_ASN1_BIT_STRING_free
(
ret
);
return
(
NULL
);
...
...
crypto/asn1/asn1.h
浏览文件 @
aa4ce731
...
...
@@ -1068,6 +1068,7 @@ void ERR_load_ASN1_strings(void);
#define ASN1_F_BITSTR_CB 180
#define ASN1_F_BN_TO_ASN1_ENUMERATED 138
#define ASN1_F_BN_TO_ASN1_INTEGER 139
#define ASN1_F_C2I_ASN1_BIT_STRING 189
#define ASN1_F_COLLECT_DATA 140
#define ASN1_F_D2I_ASN1_BIT_STRING 141
#define ASN1_F_D2I_ASN1_BOOLEAN 142
...
...
crypto/asn1/asn1_err.c
浏览文件 @
aa4ce731
...
...
@@ -121,6 +121,7 @@ static ERR_STRING_DATA ASN1_str_functs[]=
{
ERR_FUNC
(
ASN1_F_BITSTR_CB
),
"BITSTR_CB"
},
{
ERR_FUNC
(
ASN1_F_BN_TO_ASN1_ENUMERATED
),
"BN_to_ASN1_ENUMERATED"
},
{
ERR_FUNC
(
ASN1_F_BN_TO_ASN1_INTEGER
),
"BN_to_ASN1_INTEGER"
},
{
ERR_FUNC
(
ASN1_F_C2I_ASN1_BIT_STRING
),
"c2i_ASN1_BIT_STRING"
},
{
ERR_FUNC
(
ASN1_F_COLLECT_DATA
),
"COLLECT_DATA"
},
{
ERR_FUNC
(
ASN1_F_D2I_ASN1_BIT_STRING
),
"D2I_ASN1_BIT_STRING"
},
{
ERR_FUNC
(
ASN1_F_D2I_ASN1_BOOLEAN
),
"d2i_ASN1_BOOLEAN"
},
...
...
crypto/bio/bio.h
浏览文件 @
aa4ce731
...
...
@@ -695,6 +695,7 @@ void ERR_load_BIO_strings(void);
#define BIO_F_ACPT_STATE 100
#define BIO_F_BIO_ACCEPT 101
#define BIO_F_BIO_BER_GET_HEADER 102
#define BIO_F_BIO_CALLBACK_CTRL 131
#define BIO_F_BIO_CTRL 103
#define BIO_F_BIO_GETHOSTBYNAME 120
#define BIO_F_BIO_GETS 104
...
...
crypto/bio/bio_err.c
浏览文件 @
aa4ce731
...
...
@@ -73,6 +73,7 @@ static ERR_STRING_DATA BIO_str_functs[]=
{
ERR_FUNC
(
BIO_F_ACPT_STATE
),
"ACPT_STATE"
},
{
ERR_FUNC
(
BIO_F_BIO_ACCEPT
),
"BIO_accept"
},
{
ERR_FUNC
(
BIO_F_BIO_BER_GET_HEADER
),
"BIO_BER_GET_HEADER"
},
{
ERR_FUNC
(
BIO_F_BIO_CALLBACK_CTRL
),
"BIO_callback_ctrl"
},
{
ERR_FUNC
(
BIO_F_BIO_CTRL
),
"BIO_ctrl"
},
{
ERR_FUNC
(
BIO_F_BIO_GETHOSTBYNAME
),
"BIO_gethostbyname"
},
{
ERR_FUNC
(
BIO_F_BIO_GETS
),
"BIO_gets"
},
...
...
crypto/bio/bio_lib.c
浏览文件 @
aa4ce731
...
...
@@ -338,7 +338,7 @@ long BIO_callback_ctrl(BIO *b, int cmd, void (*fp)(struct bio_st *, int, const c
if
((
b
->
method
==
NULL
)
||
(
b
->
method
->
callback_ctrl
==
NULL
))
{
BIOerr
(
BIO_F_BIO_CTRL
,
BIO_R_UNSUPPORTED_METHOD
);
BIOerr
(
BIO_F_BIO_C
ALLBACK_C
TRL
,
BIO_R_UNSUPPORTED_METHOD
);
return
(
-
2
);
}
...
...
crypto/bn/bn.h
浏览文件 @
aa4ce731
...
...
@@ -725,6 +725,7 @@ void ERR_load_BN_strings(void);
/* Error codes for the BN functions. */
/* Function codes. */
#define BN_F_BNRAND 114
#define BN_F_BN_BLINDING_CONVERT 100
#define BN_F_BN_BLINDING_INVERT 101
#define BN_F_BN_BLINDING_NEW 102
...
...
@@ -733,7 +734,9 @@ void ERR_load_BN_strings(void);
#define BN_F_BN_BN2HEX 105
#define BN_F_BN_CTX_GET 116
#define BN_F_BN_CTX_NEW 106
#define BN_F_BN_CTX_START 130
#define BN_F_BN_DIV 107
#define BN_F_BN_DIV_RECP 131
#define BN_F_BN_EXPAND2 108
#define BN_F_BN_EXPAND_INTERNAL 120
#define BN_F_BN_GF2M_MOD 126
...
...
@@ -743,6 +746,7 @@ void ERR_load_BN_strings(void);
#define BN_F_BN_GF2M_MOD_SOLVE_QUAD 128
#define BN_F_BN_GF2M_MOD_SOLVE_QUAD_ARR 129
#define BN_F_BN_GF2M_MOD_SQR 125
#define BN_F_BN_GF2M_MOD_SQRT 132
#define BN_F_BN_MOD_EXP2_MONT 118
#define BN_F_BN_MOD_EXP_MONT 109
#define BN_F_BN_MOD_EXP_MONT_WORD 117
...
...
@@ -752,7 +756,6 @@ void ERR_load_BN_strings(void);
#define BN_F_BN_MOD_SQRT 121
#define BN_F_BN_MPI2BN 112
#define BN_F_BN_NEW 113
#define BN_F_BN_RAND 114
#define BN_F_BN_RAND_RANGE 122
#define BN_F_BN_USUB 115
...
...
crypto/bn/bn_ctx.c
浏览文件 @
aa4ce731
...
...
@@ -257,8 +257,7 @@ void BN_CTX_start(BN_CTX *ctx)
/* (Try to) get a new frame pointer */
else
if
(
!
BN_STACK_push
(
&
ctx
->
stack
,
ctx
->
used
))
{
/* I know this isn't BN_CTX_get, but ... */
BNerr
(
BN_F_BN_CTX_GET
,
BN_R_TOO_MANY_TEMPORARY_VARIABLES
);
BNerr
(
BN_F_BN_CTX_START
,
BN_R_TOO_MANY_TEMPORARY_VARIABLES
);
ctx
->
err_stack
++
;
}
CTXDBG_EXIT
(
ctx
);
...
...
crypto/bn/bn_err.c
浏览文件 @
aa4ce731
...
...
@@ -70,6 +70,7 @@
static
ERR_STRING_DATA
BN_str_functs
[]
=
{
{
ERR_FUNC
(
BN_F_BNRAND
),
"BNRAND"
},
{
ERR_FUNC
(
BN_F_BN_BLINDING_CONVERT
),
"BN_BLINDING_convert"
},
{
ERR_FUNC
(
BN_F_BN_BLINDING_INVERT
),
"BN_BLINDING_invert"
},
{
ERR_FUNC
(
BN_F_BN_BLINDING_NEW
),
"BN_BLINDING_new"
},
...
...
@@ -78,7 +79,9 @@ static ERR_STRING_DATA BN_str_functs[]=
{
ERR_FUNC
(
BN_F_BN_BN2HEX
),
"BN_bn2hex"
},
{
ERR_FUNC
(
BN_F_BN_CTX_GET
),
"BN_CTX_get"
},
{
ERR_FUNC
(
BN_F_BN_CTX_NEW
),
"BN_CTX_new"
},
{
ERR_FUNC
(
BN_F_BN_CTX_START
),
"BN_CTX_start"
},
{
ERR_FUNC
(
BN_F_BN_DIV
),
"BN_div"
},
{
ERR_FUNC
(
BN_F_BN_DIV_RECP
),
"BN_div_recp"
},
{
ERR_FUNC
(
BN_F_BN_EXPAND2
),
"bn_expand2"
},
{
ERR_FUNC
(
BN_F_BN_EXPAND_INTERNAL
),
"BN_EXPAND_INTERNAL"
},
{
ERR_FUNC
(
BN_F_BN_GF2M_MOD
),
"BN_GF2m_mod"
},
...
...
@@ -88,6 +91,7 @@ static ERR_STRING_DATA BN_str_functs[]=
{
ERR_FUNC
(
BN_F_BN_GF2M_MOD_SOLVE_QUAD
),
"BN_GF2m_mod_solve_quad"
},
{
ERR_FUNC
(
BN_F_BN_GF2M_MOD_SOLVE_QUAD_ARR
),
"BN_GF2m_mod_solve_quad_arr"
},
{
ERR_FUNC
(
BN_F_BN_GF2M_MOD_SQR
),
"BN_GF2m_mod_sqr"
},
{
ERR_FUNC
(
BN_F_BN_GF2M_MOD_SQRT
),
"BN_GF2m_mod_sqrt"
},
{
ERR_FUNC
(
BN_F_BN_MOD_EXP2_MONT
),
"BN_mod_exp2_mont"
},
{
ERR_FUNC
(
BN_F_BN_MOD_EXP_MONT
),
"BN_mod_exp_mont"
},
{
ERR_FUNC
(
BN_F_BN_MOD_EXP_MONT_WORD
),
"BN_mod_exp_mont_word"
},
...
...
@@ -97,7 +101,6 @@ static ERR_STRING_DATA BN_str_functs[]=
{
ERR_FUNC
(
BN_F_BN_MOD_SQRT
),
"BN_mod_sqrt"
},
{
ERR_FUNC
(
BN_F_BN_MPI2BN
),
"BN_mpi2bn"
},
{
ERR_FUNC
(
BN_F_BN_NEW
),
"BN_new"
},
{
ERR_FUNC
(
BN_F_BN_RAND
),
"BN_rand"
},
{
ERR_FUNC
(
BN_F_BN_RAND_RANGE
),
"BN_rand_range"
},
{
ERR_FUNC
(
BN_F_BN_USUB
),
"BN_usub"
},
{
0
,
NULL
}
...
...
crypto/bn/bn_gf2m.c
浏览文件 @
aa4ce731
...
...
@@ -902,7 +902,7 @@ int BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
ret
=
BN_GF2m_poly2arr
(
p
,
arr
,
max
);
if
(
!
ret
||
ret
>
max
)
{
BNerr
(
BN_F_BN_GF2M_MOD_
EXP
,
BN_R_INVALID_LENGTH
);
BNerr
(
BN_F_BN_GF2M_MOD_
SQRT
,
BN_R_INVALID_LENGTH
);
goto
err
;
}
ret
=
BN_GF2m_mod_sqrt_arr
(
r
,
a
,
arr
,
ctx
);
...
...
crypto/bn/bn_rand.c
浏览文件 @
aa4ce731
...
...
@@ -134,7 +134,7 @@ static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom)
buf
=
(
unsigned
char
*
)
OPENSSL_malloc
(
bytes
);
if
(
buf
==
NULL
)
{
BNerr
(
BN_F_BN
_
RAND
,
ERR_R_MALLOC_FAILURE
);
BNerr
(
BN_F_BNRAND
,
ERR_R_MALLOC_FAILURE
);
goto
err
;
}
...
...
crypto/bn/bn_recp.c
浏览文件 @
aa4ce731
...
...
@@ -191,7 +191,7 @@ int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
{
if
(
j
++
>
2
)
{
BNerr
(
BN_F_BN_
MOD_MUL_RECIPROCAL
,
BN_R_BAD_RECIPROCAL
);
BNerr
(
BN_F_BN_
DIV_RECP
,
BN_R_BAD_RECIPROCAL
);
goto
err
;
}
if
(
!
BN_usub
(
r
,
r
,
&
(
recp
->
N
)))
goto
err
;
...
...
crypto/buffer/buf_err.c
浏览文件 @
aa4ce731
...
...
@@ -72,6 +72,7 @@ static ERR_STRING_DATA BUF_str_functs[]=
{
{
ERR_FUNC
(
BUF_F_BUF_MEMDUP
),
"BUF_memdup"
},
{
ERR_FUNC
(
BUF_F_BUF_MEM_GROW
),
"BUF_MEM_grow"
},
{
ERR_FUNC
(
BUF_F_BUF_MEM_GROW_CLEAN
),
"BUF_MEM_grow_clean"
},
{
ERR_FUNC
(
BUF_F_BUF_MEM_NEW
),
"BUF_MEM_new"
},
{
ERR_FUNC
(
BUF_F_BUF_STRDUP
),
"BUF_strdup"
},
{
ERR_FUNC
(
BUF_F_BUF_STRNDUP
),
"BUF_strndup"
},
...
...
crypto/buffer/buffer.c
浏览文件 @
aa4ce731
...
...
@@ -149,7 +149,7 @@ int BUF_MEM_grow_clean(BUF_MEM *str, int len)
ret
=
OPENSSL_realloc_clean
(
str
->
data
,
str
->
max
,
n
);
if
(
ret
==
NULL
)
{
BUFerr
(
BUF_F_BUF_MEM_GROW
,
ERR_R_MALLOC_FAILURE
);
BUFerr
(
BUF_F_BUF_MEM_GROW
_CLEAN
,
ERR_R_MALLOC_FAILURE
);
len
=
0
;
}
else
...
...
crypto/buffer/buffer.h
浏览文件 @
aa4ce731
...
...
@@ -105,6 +105,7 @@ void ERR_load_BUF_strings(void);
/* Function codes. */
#define BUF_F_BUF_MEMDUP 103
#define BUF_F_BUF_MEM_GROW 100
#define BUF_F_BUF_MEM_GROW_CLEAN 105
#define BUF_F_BUF_MEM_NEW 101
#define BUF_F_BUF_STRDUP 102
#define BUF_F_BUF_STRNDUP 104
...
...
crypto/conf/conf.h
浏览文件 @
aa4ce731
...
...
@@ -213,6 +213,9 @@ void ERR_load_CONF_strings(void);
#define CONF_F_CONF_LOAD_BIO 102
#define CONF_F_CONF_LOAD_FP 103
#define CONF_F_CONF_MODULES_LOAD 116
#define CONF_F_CONF_MODULE_RUN 119
#define CONF_F_DEF_LOAD 120
#define CONF_F_DEF_LOAD_BIO 121
#define CONF_F_MODULE_INIT 115
#define CONF_F_MODULE_LOAD_DSO 117
#define CONF_F_MODULE_RUN 118
...
...
crypto/conf/conf_def.c
浏览文件 @
aa4ce731
...
...
@@ -194,9 +194,9 @@ static int def_load(CONF *conf, const char *name, long *line)
if
(
in
==
NULL
)
{
if
(
ERR_GET_REASON
(
ERR_peek_last_error
())
==
BIO_R_NO_SUCH_FILE
)
CONFerr
(
CONF_F_
CON
F_LOAD
,
CONF_R_NO_SUCH_FILE
);
CONFerr
(
CONF_F_
DE
F_LOAD
,
CONF_R_NO_SUCH_FILE
);
else
CONFerr
(
CONF_F_
CON
F_LOAD
,
ERR_R_SYS_LIB
);
CONFerr
(
CONF_F_
DE
F_LOAD
,
ERR_R_SYS_LIB
);
return
0
;
}
...
...
@@ -225,28 +225,28 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
if
((
buff
=
BUF_MEM_new
())
==
NULL
)
{
CONFerr
(
CONF_F_
CON
F_LOAD_BIO
,
ERR_R_BUF_LIB
);
CONFerr
(
CONF_F_
DE
F_LOAD_BIO
,
ERR_R_BUF_LIB
);
goto
err
;
}
section
=
(
char
*
)
OPENSSL_malloc
(
10
);
if
(
section
==
NULL
)
{
CONFerr
(
CONF_F_
CON
F_LOAD_BIO
,
ERR_R_MALLOC_FAILURE
);
CONFerr
(
CONF_F_
DE
F_LOAD_BIO
,
ERR_R_MALLOC_FAILURE
);
goto
err
;
}
BUF_strlcpy
(
section
,
"default"
,
10
);
if
(
_CONF_new_data
(
conf
)
==
0
)
{
CONFerr
(
CONF_F_
CON
F_LOAD_BIO
,
ERR_R_MALLOC_FAILURE
);
CONFerr
(
CONF_F_
DE
F_LOAD_BIO
,
ERR_R_MALLOC_FAILURE
);
goto
err
;
}
sv
=
_CONF_new_section
(
conf
,
section
);
if
(
sv
==
NULL
)
{
CONFerr
(
CONF_F_
CON
F_LOAD_BIO
,
CONFerr
(
CONF_F_
DE
F_LOAD_BIO
,
CONF_R_UNABLE_TO_CREATE_NEW_SECTION
);
goto
err
;
}
...
...
@@ -258,7 +258,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
{
if
(
!
BUF_MEM_grow
(
buff
,
bufnum
+
CONFBUFSIZE
))
{
CONFerr
(
CONF_F_
CON
F_LOAD_BIO
,
ERR_R_BUF_LIB
);
CONFerr
(
CONF_F_
DE
F_LOAD_BIO
,
ERR_R_BUF_LIB
);
goto
err
;
}
p
=
&
(
buff
->
data
[
bufnum
]);
...
...
@@ -329,7 +329,7 @@ again:
ss
=
p
;
goto
again
;
}
CONFerr
(
CONF_F_
CON
F_LOAD_BIO
,
CONFerr
(
CONF_F_
DE
F_LOAD_BIO
,
CONF_R_MISSING_CLOSE_SQUARE_BRACKET
);
goto
err
;
}
...
...
@@ -339,7 +339,7 @@ again:
sv
=
_CONF_new_section
(
conf
,
section
);
if
(
sv
==
NULL
)
{
CONFerr
(
CONF_F_
CON
F_LOAD_BIO
,
CONFerr
(
CONF_F_
DE
F_LOAD_BIO
,
CONF_R_UNABLE_TO_CREATE_NEW_SECTION
);
goto
err
;
}
...
...
@@ -362,7 +362,7 @@ again:
p
=
eat_ws
(
conf
,
end
);
if
(
*
p
!=
'='
)
{
CONFerr
(
CONF_F_
CON
F_LOAD_BIO
,
CONFerr
(
CONF_F_
DE
F_LOAD_BIO
,
CONF_R_MISSING_EQUAL_SIGN
);
goto
err
;
}
...
...
@@ -379,7 +379,7 @@ again:
if
(
!
(
v
=
(
CONF_VALUE
*
)
OPENSSL_malloc
(
sizeof
(
CONF_VALUE
))))
{
CONFerr
(
CONF_F_
CON
F_LOAD_BIO
,
CONFerr
(
CONF_F_
DE
F_LOAD_BIO
,
ERR_R_MALLOC_FAILURE
);
goto
err
;
}
...
...
@@ -388,7 +388,7 @@ again:
v
->
value
=
NULL
;
if
(
v
->
name
==
NULL
)
{
CONFerr
(
CONF_F_
CON
F_LOAD_BIO
,
CONFerr
(
CONF_F_
DE
F_LOAD_BIO
,
ERR_R_MALLOC_FAILURE
);
goto
err
;
}
...
...
@@ -402,7 +402,7 @@ again:
tv
=
_CONF_new_section
(
conf
,
psection
);
if
(
tv
==
NULL
)
{
CONFerr
(
CONF_F_
CON
F_LOAD_BIO
,
CONFerr
(
CONF_F_
DE
F_LOAD_BIO
,
CONF_R_UNABLE_TO_CREATE_NEW_SECTION
);
goto
err
;
}
...
...
@@ -416,7 +416,7 @@ again:
#if 1
if
(
_CONF_add_string
(
conf
,
tv
,
v
)
==
0
)
{
CONFerr
(
CONF_F_
CON
F_LOAD_BIO
,
CONFerr
(
CONF_F_
DE
F_LOAD_BIO
,
ERR_R_MALLOC_FAILURE
);
goto
err
;
}
...
...
@@ -424,7 +424,7 @@ again:
v
->
section
=
tv
->
section
;
if
(
!
sk_CONF_VALUE_push
(
ts
,
v
))
{
CONFerr
(
CONF_F_
CON
F_LOAD_BIO
,
CONFerr
(
CONF_F_
DE
F_LOAD_BIO
,
ERR_R_MALLOC_FAILURE
);
goto
err
;
}
...
...
crypto/conf/conf_err.c
浏览文件 @
aa4ce731
...
...
@@ -75,6 +75,9 @@ static ERR_STRING_DATA CONF_str_functs[]=
{
ERR_FUNC
(
CONF_F_CONF_LOAD_BIO
),
"CONF_load_bio"
},
{
ERR_FUNC
(
CONF_F_CONF_LOAD_FP
),
"CONF_load_fp"
},
{
ERR_FUNC
(
CONF_F_CONF_MODULES_LOAD
),
"CONF_modules_load"
},
{
ERR_FUNC
(
CONF_F_CONF_MODULE_RUN
),
"CONF_MODULE_RUN"
},
{
ERR_FUNC
(
CONF_F_DEF_LOAD
),
"DEF_LOAD"
},
{
ERR_FUNC
(
CONF_F_DEF_LOAD_BIO
),
"DEF_LOAD_BIO"
},
{
ERR_FUNC
(
CONF_F_MODULE_INIT
),
"MODULE_INIT"
},
{
ERR_FUNC
(
CONF_F_MODULE_LOAD_DSO
),
"MODULE_LOAD_DSO"
},
{
ERR_FUNC
(
CONF_F_MODULE_RUN
),
"MODULE_RUN"
},
...
...
crypto/conf/conf_mod.c
浏览文件 @
aa4ce731
...
...
@@ -231,7 +231,7 @@ static int module_run(const CONF *cnf, char *name, char *value,
if
(
!
(
flags
&
CONF_MFLAGS_SILENT
))
{
char
rcode
[
DECIMAL_SIZE
(
ret
)
+
1
];
CONFerr
(
CONF_F_CONF_MODULE
S_LOAD
,
CONF_R_MODULE_INITIALIZATION_ERROR
);
CONFerr
(
CONF_F_CONF_MODULE
_RUN
,
CONF_R_MODULE_INITIALIZATION_ERROR
);
BIO_snprintf
(
rcode
,
sizeof
rcode
,
"%-8d"
,
ret
);
ERR_add_error_data
(
6
,
"module="
,
name
,
", value="
,
value
,
", retcode="
,
rcode
);
}
...
...
crypto/dh/dh.h
浏览文件 @
aa4ce731
...
...
@@ -198,12 +198,13 @@ void ERR_load_DH_strings(void);
/* Error codes for the DH functions. */
/* Function codes. */
#define DH_F_COMPUTE_KEY 102
#define DH_F_DHPARAMS_PRINT 100
#define DH_F_DHPARAMS_PRINT_FP 101
#define DH_F_DH_COMPUTE_KEY 102
#define DH_F_DH_GENERATE_KEY 103
#define DH_F_DH_GENERATE_PARAMETERS 104
#define DH_F_DH_BUILTIN_GENPARAMS 106
#define DH_F_DH_NEW_METHOD 105
#define DH_F_GENERATE_KEY 103
#define DH_F_GENERATE_PARAMETERS 104
/* Reason codes. */
#define DH_R_BAD_GENERATOR 101
...
...
crypto/dh/dh_err.c
浏览文件 @
aa4ce731
...
...
@@ -70,12 +70,13 @@
static
ERR_STRING_DATA
DH_str_functs
[]
=
{
{
ERR_FUNC
(
DH_F_COMPUTE_KEY
),
"COMPUTE_KEY"
},
{
ERR_FUNC
(
DH_F_DHPARAMS_PRINT
),
"DHparams_print"
},
{
ERR_FUNC
(
DH_F_DHPARAMS_PRINT_FP
),
"DHparams_print_fp"
},
{
ERR_FUNC
(
DH_F_DH_COMPUTE_KEY
),
"DH_compute_key"
},
{
ERR_FUNC
(
DH_F_DH_GENERATE_KEY
),
"DH_generate_key"
},
{
ERR_FUNC
(
DH_F_DH_GENERATE_PARAMETERS
),
"DH_generate_parameters"
},
{
ERR_FUNC
(
DH_F_DH_BUILTIN_GENPARAMS
),
"DH_BUILTIN_GENPARAMS"
},
{
ERR_FUNC
(
DH_F_DH_NEW_METHOD
),
"DH_new_method"
},
{
ERR_FUNC
(
DH_F_GENERATE_KEY
),
"GENERATE_KEY"
},
{
ERR_FUNC
(
DH_F_GENERATE_PARAMETERS
),
"GENERATE_PARAMETERS"
},
{
0
,
NULL
}
};
...
...
crypto/dh/dh_gen.c
浏览文件 @
aa4ce731
...
...
@@ -119,7 +119,7 @@ static int dh_builtin_genparams(DH *ret, int prime_len, int generator, BN_GENCB
if
(
generator
<=
1
)
{
DHerr
(
DH_F_DH_
GENERATE_PARAMETER
S
,
DH_R_BAD_GENERATOR
);
DHerr
(
DH_F_DH_
BUILTIN_GENPARAM
S
,
DH_R_BAD_GENERATOR
);
goto
err
;
}
if
(
generator
==
DH_GENERATOR_2
)
...
...
@@ -162,7 +162,7 @@ static int dh_builtin_genparams(DH *ret, int prime_len, int generator, BN_GENCB
err:
if
(
ok
==
-
1
)
{
DHerr
(
DH_F_DH_
GENERATE_PARAMETER
S
,
ERR_R_BN_LIB
);
DHerr
(
DH_F_DH_
BUILTIN_GENPARAM
S
,
ERR_R_BN_LIB
);
ok
=
0
;
}
...
...
crypto/dh/dh_key.c
浏览文件 @
aa4ce731
...
...
@@ -148,7 +148,7 @@ static int generate_key(DH *dh)
ok
=
1
;
err:
if
(
ok
!=
1
)
DHerr
(
DH_F_
DH_
GENERATE_KEY
,
ERR_R_BN_LIB
);
DHerr
(
DH_F_GENERATE_KEY
,
ERR_R_BN_LIB
);
if
((
pub_key
!=
NULL
)
&&
(
dh
->
pub_key
==
NULL
))
BN_free
(
pub_key
);
if
((
priv_key
!=
NULL
)
&&
(
dh
->
priv_key
==
NULL
))
BN_free
(
priv_key
);
...
...
@@ -170,7 +170,7 @@ static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
if
(
dh
->
priv_key
==
NULL
)
{
DHerr
(
DH_F_
DH_
COMPUTE_KEY
,
DH_R_NO_PRIVATE_VALUE
);
DHerr
(
DH_F_COMPUTE_KEY
,
DH_R_NO_PRIVATE_VALUE
);
goto
err
;
}
if
((
dh
->
method_mont_p
==
NULL
)
&&
(
dh
->
flags
&
DH_FLAG_CACHE_MONT_P
))
...
...
@@ -183,7 +183,7 @@ static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
mont
=
(
BN_MONT_CTX
*
)
dh
->
method_mont_p
;
if
(
!
dh
->
meth
->
bn_mod_exp
(
dh
,
tmp
,
pub_key
,
dh
->
priv_key
,
dh
->
p
,
ctx
,
mont
))
{
DHerr
(
DH_F_
DH_
COMPUTE_KEY
,
ERR_R_BN_LIB
);
DHerr
(
DH_F_COMPUTE_KEY
,
ERR_R_BN_LIB
);
goto
err
;
}
...
...
crypto/dso/dso.h
浏览文件 @
aa4ce731
...
...
@@ -330,7 +330,7 @@ void ERR_load_DSO_strings(void);
#define DSO_F_DSO_SET_FILENAME 129
#define DSO_F_DSO_SET_NAME_CONVERTER 122
#define DSO_F_DSO_UP_REF 114
#define DSO_F_VMS_BIND_
VAR
115
#define DSO_F_VMS_BIND_
SYM
115
#define DSO_F_VMS_LOAD 116
#define DSO_F_VMS_MERGER 133
#define DSO_F_VMS_UNLOAD 117
...
...
crypto/dso/dso_err.c
浏览文件 @
aa4ce731
...
...
@@ -95,7 +95,7 @@ static ERR_STRING_DATA DSO_str_functs[]=
{
ERR_FUNC
(
DSO_F_DSO_SET_FILENAME
),
"DSO_set_filename"
},
{
ERR_FUNC
(
DSO_F_DSO_SET_NAME_CONVERTER
),
"DSO_set_name_converter"
},
{
ERR_FUNC
(
DSO_F_DSO_UP_REF
),
"DSO_up_ref"
},
{
ERR_FUNC
(
DSO_F_VMS_BIND_
VAR
),
"VMS_BIND_VAR
"
},
{
ERR_FUNC
(
DSO_F_VMS_BIND_
SYM
),
"VMS_BIND_SYM
"
},
{
ERR_FUNC
(
DSO_F_VMS_LOAD
),
"VMS_LOAD"
},
{
ERR_FUNC
(
DSO_F_VMS_MERGER
),
"VMS_MERGER"
},
{
ERR_FUNC
(
DSO_F_VMS_UNLOAD
),
"VMS_UNLOAD"
},
...
...
crypto/dso/dso_vms.c
浏览文件 @
aa4ce731
...
...
@@ -144,7 +144,7 @@ static int vms_load(DSO *dso)
if
(
filename
==
NULL
)
{
DSOerr
(
DSO_F_
DLFCN
_LOAD
,
DSO_R_NO_FILENAME
);
DSOerr
(
DSO_F_
VMS
_LOAD
,
DSO_R_NO_FILENAME
);
goto
err
;
}
...
...
@@ -299,19 +299,19 @@ void vms_bind_sym(DSO *dso, const char *symname, void **sym)
if
((
dso
==
NULL
)
||
(
symname
==
NULL
))
{
DSOerr
(
DSO_F_VMS_BIND_
VAR
,
ERR_R_PASSED_NULL_PARAMETER
);
DSOerr
(
DSO_F_VMS_BIND_
SYM
,
ERR_R_PASSED_NULL_PARAMETER
);
return
;
}
if
(
sk_num
(
dso
->
meth_data
)
<
1
)
{
DSOerr
(
DSO_F_VMS_BIND_
VAR
,
DSO_R_STACK_ERROR
);
DSOerr
(
DSO_F_VMS_BIND_
SYM
,
DSO_R_STACK_ERROR
);
return
;
}
ptr
=
(
DSO_VMS_INTERNAL
*
)
sk_value
(
dso
->
meth_data
,
sk_num
(
dso
->
meth_data
)
-
1
);
if
(
ptr
==
NULL
)
{
DSOerr
(
DSO_F_VMS_BIND_
VAR
,
DSO_R_NULL_HANDLE
);
DSOerr
(
DSO_F_VMS_BIND_
SYM
,
DSO_R_NULL_HANDLE
);
return
;
}
...
...
@@ -340,7 +340,7 @@ void vms_bind_sym(DSO *dso, const char *symname, void **sym)
{
errstring
[
length
]
=
'\0'
;
DSOerr
(
DSO_F_VMS_BIND_
VAR
,
DSO_R_SYM_FAILURE
);
DSOerr
(
DSO_F_VMS_BIND_
SYM
,
DSO_R_SYM_FAILURE
);
if
(
ptr
->
imagename_dsc
.
dsc
$
w_length
)
ERR_add_error_data
(
9
,
"Symbol "
,
symname
,
...
...
crypto/ec/ec.h
浏览文件 @
aa4ce731
...
...
@@ -383,6 +383,7 @@ void ERR_load_EC_strings(void);
#define EC_F_EC_ASN1_GROUP2PKPARAMETERS 156
#define EC_F_EC_ASN1_PARAMETERS2GROUP 157
#define EC_F_EC_ASN1_PKPARAMETERS2GROUP 158
#define EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY 208
#define EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT 159
#define EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE 195
#define EC_F_EC_GF2M_SIMPLE_OCT2POINT 160
...
...
@@ -393,10 +394,13 @@ void ERR_load_EC_strings(void);
#define EC_F_EC_GFP_MONT_FIELD_DECODE 133
#define EC_F_EC_GFP_MONT_FIELD_ENCODE 134
#define EC_F_EC_GFP_MONT_FIELD_MUL 131
#define EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE 209
#define EC_F_EC_GFP_MONT_FIELD_SQR 132
#define EC_F_EC_GFP_MONT_GROUP_SET_CURVE 189
#define EC_F_EC_GFP_MONT_GROUP_SET_CURVE_GFP 135
#define EC_F_EC_GFP_NIST_FIELD_MUL 200
#define EC_F_EC_GFP_NIST_FIELD_SQR 201
#define EC_F_EC_GFP_NIST_GROUP_SET_CURVE
_GFP
202
#define EC_F_EC_GFP_NIST_GROUP_SET_CURVE 202
#define EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT 165
#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE 166
#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP 100
...
...
@@ -434,9 +438,9 @@ void ERR_load_EC_strings(void);
#define EC_F_EC_KEY_CHECK_KEY 177
#define EC_F_EC_KEY_COPY 178
#define EC_F_EC_KEY_GENERATE_KEY 179
#define EC_F_EC_KEY_NEW 182
#define EC_F_EC_KEY_PRINT 180
#define EC_F_EC_KEY_PRINT_FP 181
#define EC_F_EC_NEW 182
#define EC_F_EC_POINTS_MAKE_AFFINE 136
#define EC_F_EC_POINTS_MUL 138
#define EC_F_EC_POINT_ADD 112
...
...
@@ -446,6 +450,7 @@ void ERR_load_EC_strings(void);
#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M 183
#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP 116
#define EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP 117
#define EC_F_EC_POINT_INVERT 210
#define EC_F_EC_POINT_IS_AT_INFINITY 118
#define EC_F_EC_POINT_IS_ON_CURVE 119
#define EC_F_EC_POINT_MAKE_AFFINE 120
...
...
@@ -462,8 +467,6 @@ void ERR_load_EC_strings(void);
#define EC_F_EC_PRE_COMP_DUP 207
#define EC_F_EC_WNAF_MUL 187
#define EC_F_EC_WNAF_PRECOMPUTE_MULT 188
#define EC_F_GFP_MONT_GROUP_SET_CURVE 189
#define EC_F_GFP_MONT_GROUP_SET_CURVE_GFP 135
#define EC_F_I2D_ECPARAMETERS 190
#define EC_F_I2D_ECPKPARAMETERS 191
#define EC_F_I2D_ECPRIVATEKEY 192
...
...
crypto/ec/ec2_mult.c
浏览文件 @
aa4ce731
...
...
@@ -221,7 +221,7 @@ static int ec_GF2m_montgomery_point_multiply(const EC_GROUP *group, EC_POINT *r,
if
(
r
==
point
)
{
ECerr
(
EC_F_EC_
POINT_MUL
,
EC_R_INVALID_ARGUMENT
);
ECerr
(
EC_F_EC_
GF2M_MONTGOMERY_POINT_MULTIPLY
,
EC_R_INVALID_ARGUMENT
);
return
0
;
}
...
...
crypto/ec/ec_asn1.c
浏览文件 @
aa4ce731
...
...
@@ -384,7 +384,7 @@ static int ec_asn1_group2fieldid(const EC_GROUP *group, X9_62_FIELDID *field)
}
if
(
!
ASN1_INTEGER_set
(
char_two
->
p
.
tpBasis
,
(
long
)
k
))
{
ECerr
(
EC_F_EC_ASN1_GROUP2
PARAMETERS
,
ECerr
(
EC_F_EC_ASN1_GROUP2
FIELDID
,
ERR_R_ASN1_LIB
);
goto
err
;
}
...
...
@@ -992,7 +992,7 @@ EC_GROUP *ec_asn1_pkparameters2group(const ECPKPARAMETERS *params)
}
else
{
ECerr
(
EC_F_EC_ASN1_PARAMETERS2GROUP
,
EC_R_ASN1_ERROR
);
ECerr
(
EC_F_EC_ASN1_P
KP
ARAMETERS2GROUP
,
EC_R_ASN1_ERROR
);
return
NULL
;
}
...
...
crypto/ec/ec_err.c
浏览文件 @
aa4ce731
...
...
@@ -88,6 +88,7 @@ static ERR_STRING_DATA EC_str_functs[]=
{
ERR_FUNC
(
EC_F_EC_ASN1_GROUP2PKPARAMETERS
),
"EC_ASN1_GROUP2PKPARAMETERS"
},
{
ERR_FUNC
(
EC_F_EC_ASN1_PARAMETERS2GROUP
),
"EC_ASN1_PARAMETERS2GROUP"
},
{
ERR_FUNC
(
EC_F_EC_ASN1_PKPARAMETERS2GROUP
),
"EC_ASN1_PKPARAMETERS2GROUP"
},
{
ERR_FUNC
(
EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY
),
"EC_GF2M_MONTGOMERY_POINT_MULTIPLY"
},
{
ERR_FUNC
(
EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT
),
"ec_GF2m_simple_group_check_discriminant"
},
{
ERR_FUNC
(
EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE
),
"ec_GF2m_simple_group_set_curve"
},
{
ERR_FUNC
(
EC_F_EC_GF2M_SIMPLE_OCT2POINT
),
"ec_GF2m_simple_oct2point"
},
...
...
@@ -98,10 +99,13 @@ static ERR_STRING_DATA EC_str_functs[]=
{
ERR_FUNC
(
EC_F_EC_GFP_MONT_FIELD_DECODE
),
"ec_GFp_mont_field_decode"
},
{
ERR_FUNC
(
EC_F_EC_GFP_MONT_FIELD_ENCODE
),
"ec_GFp_mont_field_encode"
},
{
ERR_FUNC
(
EC_F_EC_GFP_MONT_FIELD_MUL
),
"ec_GFp_mont_field_mul"
},
{
ERR_FUNC
(
EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE
),
"ec_GFp_mont_field_set_to_one"
},
{
ERR_FUNC
(
EC_F_EC_GFP_MONT_FIELD_SQR
),
"ec_GFp_mont_field_sqr"
},
{
ERR_FUNC
(
EC_F_EC_GFP_MONT_GROUP_SET_CURVE
),
"ec_GFp_mont_group_set_curve"
},
{
ERR_FUNC
(
EC_F_EC_GFP_MONT_GROUP_SET_CURVE_GFP
),
"EC_GFP_MONT_GROUP_SET_CURVE_GFP"
},
{
ERR_FUNC
(
EC_F_EC_GFP_NIST_FIELD_MUL
),
"ec_GFp_nist_field_mul"
},
{
ERR_FUNC
(
EC_F_EC_GFP_NIST_FIELD_SQR
),
"ec_GFp_nist_field_sqr"
},
{
ERR_FUNC
(
EC_F_EC_GFP_NIST_GROUP_SET_CURVE
_GFP
),
"EC_GFP_NIST_GROUP_SET_CURVE_GFP
"
},
{
ERR_FUNC
(
EC_F_EC_GFP_NIST_GROUP_SET_CURVE
),
"ec_GFp_nist_group_set_curve
"
},
{
ERR_FUNC
(
EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT
),
"ec_GFp_simple_group_check_discriminant"
},
{
ERR_FUNC
(
EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE
),
"ec_GFp_simple_group_set_curve"
},
{
ERR_FUNC
(
EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP
),
"EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP"
},
...
...
@@ -139,9 +143,9 @@ static ERR_STRING_DATA EC_str_functs[]=
{
ERR_FUNC
(
EC_F_EC_KEY_CHECK_KEY
),
"EC_KEY_check_key"
},
{
ERR_FUNC
(
EC_F_EC_KEY_COPY
),
"EC_KEY_copy"
},
{
ERR_FUNC
(
EC_F_EC_KEY_GENERATE_KEY
),
"EC_KEY_generate_key"
},
{
ERR_FUNC
(
EC_F_EC_KEY_NEW
),
"EC_KEY_new"
},
{
ERR_FUNC
(
EC_F_EC_KEY_PRINT
),
"EC_KEY_print"
},
{
ERR_FUNC
(
EC_F_EC_KEY_PRINT_FP
),
"EC_KEY_print_fp"
},
{
ERR_FUNC
(
EC_F_EC_NEW
),
"EC_NEW"
},
{
ERR_FUNC
(
EC_F_EC_POINTS_MAKE_AFFINE
),
"EC_POINTs_make_affine"
},
{
ERR_FUNC
(
EC_F_EC_POINTS_MUL
),
"EC_POINTs_mul"
},
{
ERR_FUNC
(
EC_F_EC_POINT_ADD
),
"EC_POINT_add"
},
...
...
@@ -151,6 +155,7 @@ static ERR_STRING_DATA EC_str_functs[]=
{
ERR_FUNC
(
EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M
),
"EC_POINT_get_affine_coordinates_GF2m"
},
{
ERR_FUNC
(
EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP
),
"EC_POINT_get_affine_coordinates_GFp"
},
{
ERR_FUNC
(
EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP
),
"EC_POINT_get_Jprojective_coordinates_GFp"
},
{
ERR_FUNC
(
EC_F_EC_POINT_INVERT
),
"EC_POINT_invert"
},
{
ERR_FUNC
(
EC_F_EC_POINT_IS_AT_INFINITY
),
"EC_POINT_is_at_infinity"
},
{
ERR_FUNC
(
EC_F_EC_POINT_IS_ON_CURVE
),
"EC_POINT_is_on_curve"
},
{
ERR_FUNC
(
EC_F_EC_POINT_MAKE_AFFINE
),
"EC_POINT_make_affine"
},
...
...
@@ -167,8 +172,6 @@ static ERR_STRING_DATA EC_str_functs[]=
{
ERR_FUNC
(
EC_F_EC_PRE_COMP_DUP
),
"EC_PRE_COMP_DUP"
},
{
ERR_FUNC
(
EC_F_EC_WNAF_MUL
),
"ec_wNAF_mul"
},
{
ERR_FUNC
(
EC_F_EC_WNAF_PRECOMPUTE_MULT
),
"ec_wNAF_precompute_mult"
},
{
ERR_FUNC
(
EC_F_GFP_MONT_GROUP_SET_CURVE
),
"GFP_MONT_GROUP_SET_CURVE"
},
{
ERR_FUNC
(
EC_F_GFP_MONT_GROUP_SET_CURVE_GFP
),
"GFP_MONT_GROUP_SET_CURVE_GFP"
},
{
ERR_FUNC
(
EC_F_I2D_ECPARAMETERS
),
"i2d_ECParameters"
},
{
ERR_FUNC
(
EC_F_I2D_ECPKPARAMETERS
),
"i2d_ECPKParameters"
},
{
ERR_FUNC
(
EC_F_I2D_ECPRIVATEKEY
),
"i2d_ECPrivateKey"
},
...
...
crypto/ec/ec_key.c
浏览文件 @
aa4ce731
...
...
@@ -73,7 +73,7 @@ EC_KEY *EC_KEY_new(void)
ret
=
(
EC_KEY
*
)
OPENSSL_malloc
(
sizeof
(
EC_KEY
));
if
(
ret
==
NULL
)
{
ECerr
(
EC_F_EC_NEW
,
ERR_R_MALLOC_FAILURE
);
ECerr
(
EC_F_EC_
KEY_
NEW
,
ERR_R_MALLOC_FAILURE
);
return
(
NULL
);
}
...
...
crypto/ec/ec_lib.c
浏览文件 @
aa4ce731
...
...
@@ -1015,12 +1015,12 @@ int EC_POINT_invert(const EC_GROUP *group, EC_POINT *a, BN_CTX *ctx)
{
if
(
group
->
meth
->
dbl
==
0
)
{
ECerr
(
EC_F_EC_POINT_
DBL
,
ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED
);
ECerr
(
EC_F_EC_POINT_
INVERT
,
ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED
);
return
0
;
}
if
(
group
->
meth
!=
a
->
meth
)
{
ECerr
(
EC_F_EC_POINT_
DBL
,
EC_R_INCOMPATIBLE_OBJECTS
);
ECerr
(
EC_F_EC_POINT_
INVERT
,
EC_R_INCOMPATIBLE_OBJECTS
);
return
0
;
}
return
group
->
meth
->
invert
(
group
,
a
,
ctx
);
...
...
crypto/ec/ecp_mont.c
浏览文件 @
aa4ce731
...
...
@@ -223,7 +223,7 @@ int ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *
if
(
mont
==
NULL
)
goto
err
;
if
(
!
BN_MONT_CTX_set
(
mont
,
p
,
ctx
))
{
ECerr
(
EC_F_GFP_MONT_GROUP_SET_CURVE
,
ERR_R_BN_LIB
);
ECerr
(
EC_F_
EC_
GFP_MONT_GROUP_SET_CURVE
,
ERR_R_BN_LIB
);
goto
err
;
}
one
=
BN_new
();
...
...
@@ -306,7 +306,7 @@ int ec_GFp_mont_field_set_to_one(const EC_GROUP *group, BIGNUM *r, BN_CTX *ctx)
{
if
(
group
->
field_data2
==
NULL
)
{
ECerr
(
EC_F_EC_GFP_MONT_FIELD_
DECOD
E
,
EC_R_NOT_INITIALIZED
);
ECerr
(
EC_F_EC_GFP_MONT_FIELD_
SET_TO_ON
E
,
EC_R_NOT_INITIALIZED
);
return
0
;
}
...
...
crypto/ec/ecp_nist.c
浏览文件 @
aa4ce731
...
...
@@ -143,7 +143,7 @@ int ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
#if !defined(NO_32_BIT_TYPE) || defined(OPENSSL_NO_ASM)
group
->
field_mod_func
=
BN_nist_mod_224
;
#else
ECerr
(
EC_F_EC_GFP_NIST_GROUP_SET_CURVE
_GFP
,
EC_R_NOT_A_SUPPORTED_NIST_PRIME
);
ECerr
(
EC_F_EC_GFP_NIST_GROUP_SET_CURVE
,
EC_R_NOT_A_SUPPORTED_NIST_PRIME
);
goto
err
;
#endif
}
...
...
@@ -152,7 +152,7 @@ int ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
#if !defined(NO_32_BIT_TYPE) || defined(OPENSSL_NO_ASM)
group
->
field_mod_func
=
BN_nist_mod_256
;
#else
ECerr
(
EC_F_EC_GFP_NIST_GROUP_SET_CURVE
_GFP
,
EC_R_NOT_A_SUPPORTED_NIST_PRIME
);
ECerr
(
EC_F_EC_GFP_NIST_GROUP_SET_CURVE
,
EC_R_NOT_A_SUPPORTED_NIST_PRIME
);
goto
err
;
#endif
}
...
...
@@ -161,7 +161,7 @@ int ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
#if !defined(NO_32_BIT_TYPE) || defined(OPENSSL_NO_ASM)
group
->
field_mod_func
=
BN_nist_mod_384
;
#else
ECerr
(
EC_F_EC_GFP_NIST_GROUP_SET_CURVE
_GFP
,
EC_R_NOT_A_SUPPORTED_NIST_PRIME
);
ECerr
(
EC_F_EC_GFP_NIST_GROUP_SET_CURVE
,
EC_R_NOT_A_SUPPORTED_NIST_PRIME
);
goto
err
;
#endif
}
...
...
@@ -170,7 +170,7 @@ int ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
group
->
field_mod_func
=
BN_nist_mod_521
;
else
{
ECerr
(
EC_F_EC_GFP_NIST_GROUP_SET_CURVE
_GFP
,
EC_R_NOT_A_NIST_PRIME
);
ECerr
(
EC_F_EC_GFP_NIST_GROUP_SET_CURVE
,
EC_R_NOT_A_NIST_PRIME
);
goto
err
;
}
...
...
crypto/ecdh/ecdh.h
浏览文件 @
aa4ce731
...
...
@@ -145,7 +145,7 @@ void ERR_load_ECDH_strings(void);
/* Function codes. */
#define ECDH_F_ECDH_COMPUTE_KEY 100
#define ECDH_F_ECDH_DATA_NEW
101
#define ECDH_F_ECDH_DATA_NEW
_METHOD
101
/* Reason codes. */
#define ECDH_R_KDF_FAILED 102
...
...
crypto/ecdh/ech_err.c
浏览文件 @
aa4ce731
...
...
@@ -71,7 +71,7 @@
static
ERR_STRING_DATA
ECDH_str_functs
[]
=
{
{
ERR_FUNC
(
ECDH_F_ECDH_COMPUTE_KEY
),
"ECDH_compute_key"
},
{
ERR_FUNC
(
ECDH_F_ECDH_DATA_NEW
),
"ECDH_DATA_new
"
},
{
ERR_FUNC
(
ECDH_F_ECDH_DATA_NEW
_METHOD
),
"ECDH_DATA_new_method
"
},
{
0
,
NULL
}
};
...
...
crypto/ecdh/ech_lib.c
浏览文件 @
aa4ce731
...
...
@@ -134,7 +134,7 @@ ECDH_DATA *ECDH_DATA_new_method(ENGINE *engine)
ret
=
(
ECDH_DATA
*
)
OPENSSL_malloc
(
sizeof
(
ECDH_DATA
));
if
(
ret
==
NULL
)
{
ECDHerr
(
ECDH_F_ECDH_DATA_NEW
,
ERR_R_MALLOC_FAILURE
);
ECDHerr
(
ECDH_F_ECDH_DATA_NEW
_METHOD
,
ERR_R_MALLOC_FAILURE
);
return
(
NULL
);
}
...
...
@@ -151,7 +151,7 @@ ECDH_DATA *ECDH_DATA_new_method(ENGINE *engine)
ret
->
meth
=
ENGINE_get_ECDH
(
ret
->
engine
);
if
(
!
ret
->
meth
)
{
ECDHerr
(
ECDH_F_ECDH_DATA_NEW
,
ERR_R_ENGINE_LIB
);
ECDHerr
(
ECDH_F_ECDH_DATA_NEW
_METHOD
,
ERR_R_ENGINE_LIB
);
ENGINE_finish
(
ret
->
engine
);
OPENSSL_free
(
ret
);
return
NULL
;
...
...
crypto/ecdsa/ecdsa.h
浏览文件 @
aa4ce731
...
...
@@ -280,7 +280,7 @@ void ERR_load_ECDSA_strings(void);
/* Error codes for the ECDSA functions. */
/* Function codes. */
#define ECDSA_F_ECDSA_DATA_NEW
100
#define ECDSA_F_ECDSA_DATA_NEW
_METHOD
100
#define ECDSA_F_ECDSA_DO_SIGN 101
#define ECDSA_F_ECDSA_DO_VERIFY 102
#define ECDSA_F_ECDSA_SIGN_SETUP 103
...
...
crypto/ecdsa/ecs_err.c
浏览文件 @
aa4ce731
...
...
@@ -70,7 +70,7 @@
static
ERR_STRING_DATA
ECDSA_str_functs
[]
=
{
{
ERR_FUNC
(
ECDSA_F_ECDSA_DATA_NEW
),
"ECDSA_DATA_new
"
},
{
ERR_FUNC
(
ECDSA_F_ECDSA_DATA_NEW
_METHOD
),
"ECDSA_DATA_new_method
"
},
{
ERR_FUNC
(
ECDSA_F_ECDSA_DO_SIGN
),
"ECDSA_do_sign"
},
{
ERR_FUNC
(
ECDSA_F_ECDSA_DO_VERIFY
),
"ECDSA_do_verify"
},
{
ERR_FUNC
(
ECDSA_F_ECDSA_SIGN_SETUP
),
"ECDSA_sign_setup"
},
...
...
crypto/ecdsa/ecs_lib.c
浏览文件 @
aa4ce731
...
...
@@ -121,7 +121,7 @@ ECDSA_DATA *ECDSA_DATA_new_method(ENGINE *engine)
ret
=
(
ECDSA_DATA
*
)
OPENSSL_malloc
(
sizeof
(
ECDSA_DATA
));
if
(
ret
==
NULL
)
{
ECDSAerr
(
ECDSA_F_ECDSA_DATA_NEW
,
ERR_R_MALLOC_FAILURE
);
ECDSAerr
(
ECDSA_F_ECDSA_DATA_NEW
_METHOD
,
ERR_R_MALLOC_FAILURE
);
return
(
NULL
);
}
...
...
@@ -141,7 +141,7 @@ ECDSA_DATA *ECDSA_DATA_new_method(ENGINE *engine)
ret
->
meth
=
ENGINE_get_ECDSA
(
ret
->
engine
);
if
(
!
ret
->
meth
)
{
ECDSAerr
(
ECDSA_F_ECDSA_DATA_NEW
,
ERR_R_ENGINE_LIB
);
ECDSAerr
(
ECDSA_F_ECDSA_DATA_NEW
_METHOD
,
ERR_R_ENGINE_LIB
);
ENGINE_finish
(
ret
->
engine
);
OPENSSL_free
(
ret
);
return
NULL
;
...
...
crypto/ecdsa/ecs_ossl.c
浏览文件 @
aa4ce731
...
...
@@ -408,7 +408,7 @@ static int ecdsa_do_verify(const unsigned char *dgst, int dgst_len,
if
(
!
EC_POINT_get_affine_coordinates_GFp
(
group
,
point
,
X
,
NULL
,
ctx
))
{
ECDSAerr
(
ECDSA_F_ECDSA_
SIGN_SETUP
,
ERR_R_EC_LIB
);
ECDSAerr
(
ECDSA_F_ECDSA_
DO_VERIFY
,
ERR_R_EC_LIB
);
goto
err
;
}
}
...
...
@@ -417,7 +417,7 @@ static int ecdsa_do_verify(const unsigned char *dgst, int dgst_len,
if
(
!
EC_POINT_get_affine_coordinates_GF2m
(
group
,
point
,
X
,
NULL
,
ctx
))
{
ECDSAerr
(
ECDSA_F_ECDSA_
SIGN_SETUP
,
ERR_R_EC_LIB
);
ECDSAerr
(
ECDSA_F_ECDSA_
DO_VERIFY
,
ERR_R_EC_LIB
);
goto
err
;
}
}
...
...
ssl/bio_ssl.c
浏览文件 @
aa4ce731
...
...
@@ -456,7 +456,7 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
case
BIO_CTRL_SET_CALLBACK
:
{
#if 0 /* FIXME: Should this be used? -- Richard Levitte */
BIO
err(SSL_F_SSL_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
SSL
err(SSL_F_SSL_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
ret = -1;
#else
ret
=
0
;
...
...
ssl/s3_clnt.c
浏览文件 @
aa4ce731
...
...
@@ -653,8 +653,7 @@ int ssl3_get_server_hello(SSL *s)
else
/* already sent a cookie */
{
al
=
SSL_AD_UNEXPECTED_MESSAGE
;
SSLerr
(
SSL_F_SSL3_GET_SERVER_CERTIFICATE
,
SSL_R_BAD_MESSAGE_TYPE
);
SSLerr
(
SSL_F_SSL3_GET_SERVER_HELLO
,
SSL_R_BAD_MESSAGE_TYPE
);
goto
f_err
;
}
}
...
...
@@ -663,7 +662,7 @@ int ssl3_get_server_hello(SSL *s)
if
(
s
->
s3
->
tmp
.
message_type
!=
SSL3_MT_SERVER_HELLO
)
{
al
=
SSL_AD_UNEXPECTED_MESSAGE
;
SSLerr
(
SSL_F_SSL3_GET_SERVER_
CERTIFICATE
,
SSL_R_BAD_MESSAGE_TYPE
);
SSLerr
(
SSL_F_SSL3_GET_SERVER_
HELLO
,
SSL_R_BAD_MESSAGE_TYPE
);
goto
f_err
;
}
...
...
ssl/s3_lib.c
浏览文件 @
aa4ce731
...
...
@@ -1833,7 +1833,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
}
if
(
!
EC_KEY_up_ref
((
EC_KEY
*
)
parg
))
{
SSLerr
(
SSL_F_SSL3_CTRL
,
ERR_R_ECDH_LIB
);
SSLerr
(
SSL_F_SSL3_CT
X_CT
RL
,
ERR_R_ECDH_LIB
);
return
0
;
}
ecdh
=
(
EC_KEY
*
)
parg
;
...
...
ssl/s3_srvr.c
浏览文件 @
aa4ce731
...
...
@@ -1289,7 +1289,7 @@ int ssl3_send_server_key_exchange(SSL *s)
}
if
(
!
EC_KEY_up_ref
(
ecdhp
))
{
SSLerr
(
SSL_F_SSL3_
CTRL
,
ERR_R_ECDH_LIB
);
SSLerr
(
SSL_F_SSL3_
SEND_SERVER_KEY_EXCHANGE
,
ERR_R_ECDH_LIB
);
goto
err
;
}
ecdh
=
ecdhp
;
...
...
@@ -1921,7 +1921,7 @@ int ssl3_get_client_key_exchange(SSL *s)
if
(
kssl_err
.
text
)
printf
(
"kssl_err text= %s
\n
"
,
kssl_err
.
text
);
#endif
/* KSSL_DEBUG */
SSLerr
(
SSL_F_SSL3_
SEND
_CLIENT_KEY_EXCHANGE
,
SSLerr
(
SSL_F_SSL3_
GET
_CLIENT_KEY_EXCHANGE
,
kssl_err
.
reason
);
goto
err
;
}
...
...
@@ -1938,14 +1938,14 @@ int ssl3_get_client_key_exchange(SSL *s)
if
(
kssl_err
.
text
)
printf
(
"kssl_err text= %s
\n
"
,
kssl_err
.
text
);
#endif
/* KSSL_DEBUG */
SSLerr
(
SSL_F_SSL3_
SEND
_CLIENT_KEY_EXCHANGE
,
SSLerr
(
SSL_F_SSL3_
GET
_CLIENT_KEY_EXCHANGE
,
kssl_err
.
reason
);
goto
err
;
}
if
((
krb5rc
=
kssl_validate_times
(
authtime
,
&
ttimes
))
!=
0
)
{
SSLerr
(
SSL_F_SSL3_
SEND
_CLIENT_KEY_EXCHANGE
,
krb5rc
);
SSLerr
(
SSL_F_SSL3_
GET
_CLIENT_KEY_EXCHANGE
,
krb5rc
);
goto
err
;
}
...
...
ssl/ssl.h
浏览文件 @
aa4ce731
...
...
@@ -1677,6 +1677,7 @@ void ERR_load_SSL_strings(void);
#define SSL_F_SSL_INIT_WBIO_BUFFER 184
#define SSL_F_SSL_LOAD_CLIENT_CA_FILE 185
#define SSL_F_SSL_NEW 186
#define SSL_F_SSL_PEEK 1025
#define SSL_F_SSL_READ 223
#define SSL_F_SSL_RSA_PRIVATE_DECRYPT 187
#define SSL_F_SSL_RSA_PUBLIC_ENCRYPT 188
...
...
ssl/ssl_err.c
浏览文件 @
aa4ce731
...
...
@@ -205,6 +205,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
{
ERR_FUNC
(
SSL_F_SSL_INIT_WBIO_BUFFER
),
"SSL_INIT_WBIO_BUFFER"
},
{
ERR_FUNC
(
SSL_F_SSL_LOAD_CLIENT_CA_FILE
),
"SSL_load_client_CA_file"
},
{
ERR_FUNC
(
SSL_F_SSL_NEW
),
"SSL_new"
},
{
ERR_FUNC
(
SSL_F_SSL_PEEK
),
"SSL_peek"
},
{
ERR_FUNC
(
SSL_F_SSL_READ
),
"SSL_read"
},
{
ERR_FUNC
(
SSL_F_SSL_RSA_PRIVATE_DECRYPT
),
"SSL_RSA_PRIVATE_DECRYPT"
},
{
ERR_FUNC
(
SSL_F_SSL_RSA_PUBLIC_ENCRYPT
),
"SSL_RSA_PUBLIC_ENCRYPT"
},
...
...
ssl/ssl_lib.c
浏览文件 @
aa4ce731
...
...
@@ -866,7 +866,7 @@ int SSL_peek(SSL *s,void *buf,int num)
{
if
(
s
->
handshake_func
==
0
)
{
SSLerr
(
SSL_F_SSL_
READ
,
SSL_R_UNINITIALIZED
);
SSLerr
(
SSL_F_SSL_
PEEK
,
SSL_R_UNINITIALIZED
);
return
-
1
;
}
...
...
util/ck_errf.pl
浏览文件 @
aa4ce731
...
...
@@ -13,7 +13,7 @@ foreach $file (@ARGV)
$func
=
"";
while
(
<
IN
>
)
{
if
(
!
/;$/
&&
/^([a-zA-Z].+[\s*])?([A-Za-z_0-9]+)\(.*
\)
/
)
if
(
!
/;$/
&&
/^([a-zA-Z].+[\s*])?([A-Za-z_0-9]+)\(.*
[\),]
/
)
{
$func
=
$
2
;
$func
=~
tr/A-Z/a-z/
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录