Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
openssl
提交
5784a521
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,发现更多精彩内容 >>
提交
5784a521
编写于
10月 28, 2014
作者:
M
Matt Caswell
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Implement internally opaque bn access from ec
Reviewed-by:
N
Tim Hudson
<
tjh@openssl.org
>
上级
c0d43901
变更
14
显示空白变更内容
内联
并排
Showing
14 changed file
with
410 addition
and
509 deletion
+410
-509
crypto/ec/Makefile
crypto/ec/Makefile
+7
-4
crypto/ec/ec2_mult.c
crypto/ec/ec2_mult.c
+22
-21
crypto/ec/ec2_oct.c
crypto/ec/ec2_oct.c
+5
-5
crypto/ec/ec2_smpl.c
crypto/ec/ec2_smpl.c
+88
-72
crypto/ec/ec_key.c
crypto/ec/ec_key.c
+3
-3
crypto/ec/ec_lcl.h
crypto/ec/ec_lcl.h
+6
-6
crypto/ec/ec_lib.c
crypto/ec/ec_lib.c
+25
-21
crypto/ec/ec_mult.c
crypto/ec/ec_mult.c
+3
-142
crypto/ec/ec_pmeth.c
crypto/ec/ec_pmeth.c
+1
-1
crypto/ec/ecp_nist.c
crypto/ec/ecp_nist.c
+2
-2
crypto/ec/ecp_nistz256.c
crypto/ec/ecp_nistz256.c
+53
-52
crypto/ec/ecp_oct.c
crypto/ec/ecp_oct.c
+20
-20
crypto/ec/ecp_smpl.c
crypto/ec/ecp_smpl.c
+169
-155
crypto/ec/ectest.c
crypto/ec/ectest.c
+6
-5
未找到文件。
crypto/ec/Makefile
浏览文件 @
5784a521
...
...
@@ -5,7 +5,7 @@
DIR
=
ec
TOP
=
../..
CC
=
cc
INCLUDES
=
-I
..
-I
$(TOP)
-I
../../include
INCLUDES
=
-I
..
-I
$(TOP)
-I
../
include
-I
../
../include
CFLAG
=
-g
MAKEFILE
=
Makefile
AR
=
ar r
...
...
@@ -98,7 +98,8 @@ ec2_mult.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
ec2_mult.o
:
../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
ec2_mult.o
:
../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
ec2_mult.o
:
../../include/openssl/safestack.h ../../include/openssl/stack.h
ec2_mult.o
:
../../include/openssl/symhacks.h ec2_mult.c ec_lcl.h
ec2_mult.o
:
../../include/openssl/symhacks.h ../include/internal/bn_int.h
ec2_mult.o
:
ec2_mult.c ec_lcl.h
ec2_oct.o
:
../../include/openssl/asn1.h ../../include/openssl/bio.h
ec2_oct.o
:
../../include/openssl/bn.h ../../include/openssl/crypto.h
ec2_oct.o
:
../../include/openssl/e_os2.h ../../include/openssl/ec.h
...
...
@@ -114,7 +115,8 @@ ec2_smpl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
ec2_smpl.o
:
../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
ec2_smpl.o
:
../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
ec2_smpl.o
:
../../include/openssl/safestack.h ../../include/openssl/stack.h
ec2_smpl.o
:
../../include/openssl/symhacks.h ec2_smpl.c ec_lcl.h
ec2_smpl.o
:
../../include/openssl/symhacks.h ../include/internal/bn_int.h
ec2_smpl.o
:
ec2_smpl.c ec_lcl.h
ec_ameth.o
:
../../e_os.h ../../include/openssl/asn1.h
ec_ameth.o
:
../../include/openssl/asn1t.h ../../include/openssl/bio.h
ec_ameth.o
:
../../include/openssl/bn.h ../../include/openssl/buffer.h
...
...
@@ -193,7 +195,8 @@ ec_mult.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
ec_mult.o
:
../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
ec_mult.o
:
../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
ec_mult.o
:
../../include/openssl/safestack.h ../../include/openssl/stack.h
ec_mult.o
:
../../include/openssl/symhacks.h ec_lcl.h ec_mult.c
ec_mult.o
:
../../include/openssl/symhacks.h ../include/internal/bn_int.h
ec_mult.o
:
ec_lcl.h ec_mult.c
ec_oct.o
:
../../include/openssl/asn1.h ../../include/openssl/bio.h
ec_oct.o
:
../../include/openssl/bn.h ../../include/openssl/crypto.h
ec_oct.o
:
../../include/openssl/e_os2.h ../../include/openssl/ec.h
...
...
crypto/ec/ec2_mult.c
浏览文件 @
5784a521
...
...
@@ -71,6 +71,7 @@
#include <openssl/err.h>
#include "internal/bn_int.h"
#include "ec_lcl.h"
#ifndef OPENSSL_NO_EC2M
...
...
@@ -98,7 +99,7 @@ static int gf2m_Mdouble(const EC_GROUP *group, BIGNUM *x, BIGNUM *z, BN_CTX *ctx
if
(
!
group
->
meth
->
field_mul
(
group
,
z
,
x
,
t1
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_sqr
(
group
,
x
,
x
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_sqr
(
group
,
t1
,
t1
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_mul
(
group
,
t1
,
&
group
->
b
,
t1
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_mul
(
group
,
t1
,
group
->
b
,
t1
,
ctx
))
goto
err
;
if
(
!
BN_GF2m_add
(
x
,
x
,
t1
))
goto
err
;
ret
=
1
;
...
...
@@ -249,24 +250,24 @@ static int ec_GF2m_montgomery_point_multiply(const EC_GROUP *group, EC_POINT *r,
z1
=
BN_CTX_get
(
ctx
);
if
(
z1
==
NULL
)
goto
err
;
x2
=
&
r
->
X
;
z2
=
&
r
->
Y
;
x2
=
r
->
X
;
z2
=
r
->
Y
;
bn_wexpand
(
x1
,
group
->
field
.
top
);
bn_wexpand
(
z1
,
group
->
field
.
top
);
bn_wexpand
(
x2
,
group
->
field
.
top
);
bn_wexpand
(
z2
,
group
->
field
.
top
);
bn_wexpand
(
x1
,
bn_get_top
(
group
->
field
)
);
bn_wexpand
(
z1
,
bn_get_top
(
group
->
field
)
);
bn_wexpand
(
x2
,
bn_get_top
(
group
->
field
)
);
bn_wexpand
(
z2
,
bn_get_top
(
group
->
field
)
);
if
(
!
BN_GF2m_mod_arr
(
x1
,
&
point
->
X
,
group
->
poly
))
goto
err
;
/* x1 = x */
if
(
!
BN_GF2m_mod_arr
(
x1
,
point
->
X
,
group
->
poly
))
goto
err
;
/* x1 = x */
if
(
!
BN_one
(
z1
))
goto
err
;
/* z1 = 1 */
if
(
!
group
->
meth
->
field_sqr
(
group
,
z2
,
x1
,
ctx
))
goto
err
;
/* z2 = x1^2 = x^2 */
if
(
!
group
->
meth
->
field_sqr
(
group
,
x2
,
z2
,
ctx
))
goto
err
;
if
(
!
BN_GF2m_add
(
x2
,
x2
,
&
group
->
b
))
goto
err
;
/* x2 = x^4 + b */
if
(
!
BN_GF2m_add
(
x2
,
x2
,
group
->
b
))
goto
err
;
/* x2 = x^4 + b */
/* find top most bit and go one past it */
i
=
scalar
->
top
-
1
;
i
=
bn_get_top
(
scalar
)
-
1
;
mask
=
BN_TBIT
;
word
=
scalar
->
d
[
i
];
word
=
bn_get_words
(
scalar
)
[
i
];
while
(
!
(
word
&
mask
))
mask
>>=
1
;
mask
>>=
1
;
/* if top most bit was at word break, go to next word */
...
...
@@ -278,22 +279,22 @@ static int ec_GF2m_montgomery_point_multiply(const EC_GROUP *group, EC_POINT *r,
for
(;
i
>=
0
;
i
--
)
{
word
=
scalar
->
d
[
i
];
word
=
bn_get_words
(
scalar
)
[
i
];
while
(
mask
)
{
BN_consttime_swap
(
word
&
mask
,
x1
,
x2
,
group
->
field
.
top
);
BN_consttime_swap
(
word
&
mask
,
z1
,
z2
,
group
->
field
.
top
);
if
(
!
gf2m_Madd
(
group
,
&
point
->
X
,
x2
,
z2
,
x1
,
z1
,
ctx
))
goto
err
;
BN_consttime_swap
(
word
&
mask
,
x1
,
x2
,
bn_get_top
(
group
->
field
)
);
BN_consttime_swap
(
word
&
mask
,
z1
,
z2
,
bn_get_top
(
group
->
field
)
);
if
(
!
gf2m_Madd
(
group
,
point
->
X
,
x2
,
z2
,
x1
,
z1
,
ctx
))
goto
err
;
if
(
!
gf2m_Mdouble
(
group
,
x1
,
z1
,
ctx
))
goto
err
;
BN_consttime_swap
(
word
&
mask
,
x1
,
x2
,
group
->
field
.
top
);
BN_consttime_swap
(
word
&
mask
,
z1
,
z2
,
group
->
field
.
top
);
BN_consttime_swap
(
word
&
mask
,
x1
,
x2
,
bn_get_top
(
group
->
field
)
);
BN_consttime_swap
(
word
&
mask
,
z1
,
z2
,
bn_get_top
(
group
->
field
)
);
mask
>>=
1
;
}
mask
=
BN_TBIT
;
}
/* convert out of "projective" coordinates */
i
=
gf2m_Mxy
(
group
,
&
point
->
X
,
&
point
->
Y
,
x1
,
z1
,
x2
,
z2
,
ctx
);
i
=
gf2m_Mxy
(
group
,
point
->
X
,
point
->
Y
,
x1
,
z1
,
x2
,
z2
,
ctx
);
if
(
i
==
0
)
goto
err
;
else
if
(
i
==
1
)
{
...
...
@@ -301,13 +302,13 @@ static int ec_GF2m_montgomery_point_multiply(const EC_GROUP *group, EC_POINT *r,
}
else
{
if
(
!
BN_one
(
&
r
->
Z
))
goto
err
;
if
(
!
BN_one
(
r
->
Z
))
goto
err
;
r
->
Z_is_one
=
1
;
}
/* GF(2^m) field elements should always have BIGNUM::neg = 0 */
BN_set_negative
(
&
r
->
X
,
0
);
BN_set_negative
(
&
r
->
Y
,
0
);
BN_set_negative
(
r
->
X
,
0
);
BN_set_negative
(
r
->
Y
,
0
);
ret
=
1
;
...
...
crypto/ec/ec2_oct.c
浏览文件 @
5784a521
...
...
@@ -117,13 +117,13 @@ int ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *p
if
(
!
BN_GF2m_mod_arr
(
x
,
x_
,
group
->
poly
))
goto
err
;
if
(
BN_is_zero
(
x
))
{
if
(
!
BN_GF2m_mod_sqrt_arr
(
y
,
&
group
->
b
,
group
->
poly
,
ctx
))
goto
err
;
if
(
!
BN_GF2m_mod_sqrt_arr
(
y
,
group
->
b
,
group
->
poly
,
ctx
))
goto
err
;
}
else
{
if
(
!
group
->
meth
->
field_sqr
(
group
,
tmp
,
x
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_div
(
group
,
tmp
,
&
group
->
b
,
tmp
,
ctx
))
goto
err
;
if
(
!
BN_GF2m_add
(
tmp
,
&
group
->
a
,
tmp
))
goto
err
;
if
(
!
group
->
meth
->
field_div
(
group
,
tmp
,
group
->
b
,
tmp
,
ctx
))
goto
err
;
if
(
!
BN_GF2m_add
(
tmp
,
group
->
a
,
tmp
))
goto
err
;
if
(
!
BN_GF2m_add
(
tmp
,
x
,
tmp
))
goto
err
;
if
(
!
BN_GF2m_mod_solve_quad_arr
(
z
,
tmp
,
group
->
poly
,
ctx
))
{
...
...
@@ -359,7 +359,7 @@ int ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
if
(
yxi
==
NULL
)
goto
err
;
if
(
!
BN_bin2bn
(
buf
+
1
,
field_len
,
x
))
goto
err
;
if
(
BN_ucmp
(
x
,
&
group
->
field
)
>=
0
)
if
(
BN_ucmp
(
x
,
group
->
field
)
>=
0
)
{
ECerr
(
EC_F_EC_GF2M_SIMPLE_OCT2POINT
,
EC_R_INVALID_ENCODING
);
goto
err
;
...
...
@@ -372,7 +372,7 @@ int ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
else
{
if
(
!
BN_bin2bn
(
buf
+
1
+
field_len
,
field_len
,
y
))
goto
err
;
if
(
BN_ucmp
(
y
,
&
group
->
field
)
>=
0
)
if
(
BN_ucmp
(
y
,
group
->
field
)
>=
0
)
{
ECerr
(
EC_F_EC_GF2M_SIMPLE_OCT2POINT
,
EC_R_INVALID_ENCODING
);
goto
err
;
...
...
crypto/ec/ec2_smpl.c
浏览文件 @
5784a521
...
...
@@ -71,6 +71,7 @@
#include <openssl/err.h>
#include "internal/bn_int.h"
#include "ec_lcl.h"
#ifndef OPENSSL_NO_EC2M
...
...
@@ -129,9 +130,17 @@ const EC_METHOD *EC_GF2m_simple_method(void)
*/
int
ec_GF2m_simple_group_init
(
EC_GROUP
*
group
)
{
BN_init
(
&
group
->
field
);
BN_init
(
&
group
->
a
);
BN_init
(
&
group
->
b
);
group
->
field
=
BN_new
();
group
->
a
=
BN_new
();
group
->
b
=
BN_new
();
if
(
!
group
->
field
||
!
group
->
a
||
!
group
->
b
)
{
if
(
group
->
field
)
BN_free
(
group
->
field
);
if
(
group
->
a
)
BN_free
(
group
->
a
);
if
(
group
->
b
)
BN_free
(
group
->
b
);
return
0
;
}
return
1
;
}
...
...
@@ -141,9 +150,9 @@ int ec_GF2m_simple_group_init(EC_GROUP *group)
*/
void
ec_GF2m_simple_group_finish
(
EC_GROUP
*
group
)
{
BN_free
(
&
group
->
field
);
BN_free
(
&
group
->
a
);
BN_free
(
&
group
->
b
);
BN_free
(
group
->
field
);
BN_free
(
group
->
a
);
BN_free
(
group
->
b
);
}
...
...
@@ -152,9 +161,9 @@ void ec_GF2m_simple_group_finish(EC_GROUP *group)
*/
void
ec_GF2m_simple_group_clear_finish
(
EC_GROUP
*
group
)
{
BN_clear_free
(
&
group
->
field
);
BN_clear_free
(
&
group
->
a
);
BN_clear_free
(
&
group
->
b
);
BN_clear_free
(
group
->
field
);
BN_clear_free
(
group
->
a
);
BN_clear_free
(
group
->
b
);
group
->
poly
[
0
]
=
0
;
group
->
poly
[
1
]
=
0
;
group
->
poly
[
2
]
=
0
;
...
...
@@ -169,20 +178,19 @@ void ec_GF2m_simple_group_clear_finish(EC_GROUP *group)
*/
int
ec_GF2m_simple_group_copy
(
EC_GROUP
*
dest
,
const
EC_GROUP
*
src
)
{
int
i
;
if
(
!
BN_copy
(
&
dest
->
field
,
&
src
->
field
))
return
0
;
if
(
!
BN_copy
(
&
dest
->
a
,
&
src
->
a
))
return
0
;
if
(
!
BN_copy
(
&
dest
->
b
,
&
src
->
b
))
return
0
;
if
(
!
BN_copy
(
dest
->
field
,
src
->
field
))
return
0
;
if
(
!
BN_copy
(
dest
->
a
,
src
->
a
))
return
0
;
if
(
!
BN_copy
(
dest
->
b
,
src
->
b
))
return
0
;
dest
->
poly
[
0
]
=
src
->
poly
[
0
];
dest
->
poly
[
1
]
=
src
->
poly
[
1
];
dest
->
poly
[
2
]
=
src
->
poly
[
2
];
dest
->
poly
[
3
]
=
src
->
poly
[
3
];
dest
->
poly
[
4
]
=
src
->
poly
[
4
];
dest
->
poly
[
5
]
=
src
->
poly
[
5
];
if
(
bn_wexpand
(
&
dest
->
a
,
(
int
)(
dest
->
poly
[
0
]
+
BN_BITS2
-
1
)
/
BN_BITS2
)
==
NULL
)
return
0
;
if
(
bn_wexpand
(
&
dest
->
b
,
(
int
)(
dest
->
poly
[
0
]
+
BN_BITS2
-
1
)
/
BN_BITS2
)
==
NULL
)
return
0
;
for
(
i
=
dest
->
a
.
top
;
i
<
dest
->
a
.
dmax
;
i
++
)
dest
->
a
.
d
[
i
]
=
0
;
for
(
i
=
dest
->
b
.
top
;
i
<
dest
->
b
.
dmax
;
i
++
)
dest
->
b
.
d
[
i
]
=
0
;
if
(
bn_wexpand
(
dest
->
a
,
(
int
)(
dest
->
poly
[
0
]
+
BN_BITS2
-
1
)
/
BN_BITS2
)
==
NULL
)
return
0
;
if
(
bn_wexpand
(
dest
->
b
,
(
int
)(
dest
->
poly
[
0
]
+
BN_BITS2
-
1
)
/
BN_BITS2
)
==
NULL
)
return
0
;
bn_set_all_zero
(
dest
->
a
)
;
bn_set_all_zero
(
dest
->
b
)
;
return
1
;
}
...
...
@@ -194,8 +202,8 @@ int ec_GF2m_simple_group_set_curve(EC_GROUP *group,
int
ret
=
0
,
i
;
/* group->field */
if
(
!
BN_copy
(
&
group
->
field
,
p
))
goto
err
;
i
=
BN_GF2m_poly2arr
(
&
group
->
field
,
group
->
poly
,
6
)
-
1
;
if
(
!
BN_copy
(
group
->
field
,
p
))
goto
err
;
i
=
BN_GF2m_poly2arr
(
group
->
field
,
group
->
poly
,
6
)
-
1
;
if
((
i
!=
5
)
&&
(
i
!=
3
))
{
ECerr
(
EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE
,
EC_R_UNSUPPORTED_FIELD
);
...
...
@@ -203,14 +211,14 @@ int ec_GF2m_simple_group_set_curve(EC_GROUP *group,
}
/* group->a */
if
(
!
BN_GF2m_mod_arr
(
&
group
->
a
,
a
,
group
->
poly
))
goto
err
;
if
(
bn_wexpand
(
&
group
->
a
,
(
int
)(
group
->
poly
[
0
]
+
BN_BITS2
-
1
)
/
BN_BITS2
)
==
NULL
)
goto
err
;
for
(
i
=
group
->
a
.
top
;
i
<
group
->
a
.
dmax
;
i
++
)
group
->
a
.
d
[
i
]
=
0
;
if
(
!
BN_GF2m_mod_arr
(
group
->
a
,
a
,
group
->
poly
))
goto
err
;
if
(
bn_wexpand
(
group
->
a
,
(
int
)(
group
->
poly
[
0
]
+
BN_BITS2
-
1
)
/
BN_BITS2
)
==
NULL
)
goto
err
;
bn_set_all_zero
(
group
->
a
)
;
/* group->b */
if
(
!
BN_GF2m_mod_arr
(
&
group
->
b
,
b
,
group
->
poly
))
goto
err
;
if
(
bn_wexpand
(
&
group
->
b
,
(
int
)(
group
->
poly
[
0
]
+
BN_BITS2
-
1
)
/
BN_BITS2
)
==
NULL
)
goto
err
;
for
(
i
=
group
->
b
.
top
;
i
<
group
->
b
.
dmax
;
i
++
)
group
->
b
.
d
[
i
]
=
0
;
if
(
!
BN_GF2m_mod_arr
(
group
->
b
,
b
,
group
->
poly
))
goto
err
;
if
(
bn_wexpand
(
group
->
b
,
(
int
)(
group
->
poly
[
0
]
+
BN_BITS2
-
1
)
/
BN_BITS2
)
==
NULL
)
goto
err
;
bn_set_all_zero
(
group
->
b
)
;
ret
=
1
;
err:
...
...
@@ -227,17 +235,17 @@ int ec_GF2m_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,
if
(
p
!=
NULL
)
{
if
(
!
BN_copy
(
p
,
&
group
->
field
))
return
0
;
if
(
!
BN_copy
(
p
,
group
->
field
))
return
0
;
}
if
(
a
!=
NULL
)
{
if
(
!
BN_copy
(
a
,
&
group
->
a
))
goto
err
;
if
(
!
BN_copy
(
a
,
group
->
a
))
goto
err
;
}
if
(
b
!=
NULL
)
{
if
(
!
BN_copy
(
b
,
&
group
->
b
))
goto
err
;
if
(
!
BN_copy
(
b
,
group
->
b
))
goto
err
;
}
ret
=
1
;
...
...
@@ -250,7 +258,7 @@ int ec_GF2m_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,
/* Gets the degree of the field. For a curve over GF(2^m) this is the value m. */
int
ec_GF2m_simple_group_get_degree
(
const
EC_GROUP
*
group
)
{
return
BN_num_bits
(
&
group
->
field
)
-
1
;
return
BN_num_bits
(
group
->
field
)
-
1
;
}
...
...
@@ -276,7 +284,7 @@ int ec_GF2m_simple_group_check_discriminant(const EC_GROUP *group, BN_CTX *ctx)
b
=
BN_CTX_get
(
ctx
);
if
(
b
==
NULL
)
goto
err
;
if
(
!
BN_GF2m_mod_arr
(
b
,
&
group
->
b
,
group
->
poly
))
goto
err
;
if
(
!
BN_GF2m_mod_arr
(
b
,
group
->
b
,
group
->
poly
))
goto
err
;
/* check the discriminant:
* y^2 + x*y = x^3 + a*x^2 + b is an elliptic curve <=> b != 0 (mod p)
...
...
@@ -297,9 +305,17 @@ err:
/* Initializes an EC_POINT. */
int
ec_GF2m_simple_point_init
(
EC_POINT
*
point
)
{
BN_init
(
&
point
->
X
);
BN_init
(
&
point
->
Y
);
BN_init
(
&
point
->
Z
);
point
->
X
=
BN_new
();
point
->
Y
=
BN_new
();
point
->
Z
=
BN_new
();
if
(
!
point
->
X
||
!
point
->
Y
||
!
point
->
Z
)
{
if
(
point
->
X
)
BN_free
(
point
->
X
);
if
(
point
->
Y
)
BN_free
(
point
->
Y
);
if
(
point
->
Z
)
BN_free
(
point
->
Z
);
return
0
;
}
return
1
;
}
...
...
@@ -307,18 +323,18 @@ int ec_GF2m_simple_point_init(EC_POINT *point)
/* Frees an EC_POINT. */
void
ec_GF2m_simple_point_finish
(
EC_POINT
*
point
)
{
BN_free
(
&
point
->
X
);
BN_free
(
&
point
->
Y
);
BN_free
(
&
point
->
Z
);
BN_free
(
point
->
X
);
BN_free
(
point
->
Y
);
BN_free
(
point
->
Z
);
}
/* Clears and frees an EC_POINT. */
void
ec_GF2m_simple_point_clear_finish
(
EC_POINT
*
point
)
{
BN_clear_free
(
&
point
->
X
);
BN_clear_free
(
&
point
->
Y
);
BN_clear_free
(
&
point
->
Z
);
BN_clear_free
(
point
->
X
);
BN_clear_free
(
point
->
Y
);
BN_clear_free
(
point
->
Z
);
point
->
Z_is_one
=
0
;
}
...
...
@@ -326,9 +342,9 @@ void ec_GF2m_simple_point_clear_finish(EC_POINT *point)
/* Copy the contents of one EC_POINT into another. Assumes dest is initialized. */
int
ec_GF2m_simple_point_copy
(
EC_POINT
*
dest
,
const
EC_POINT
*
src
)
{
if
(
!
BN_copy
(
&
dest
->
X
,
&
src
->
X
))
return
0
;
if
(
!
BN_copy
(
&
dest
->
Y
,
&
src
->
Y
))
return
0
;
if
(
!
BN_copy
(
&
dest
->
Z
,
&
src
->
Z
))
return
0
;
if
(
!
BN_copy
(
dest
->
X
,
src
->
X
))
return
0
;
if
(
!
BN_copy
(
dest
->
Y
,
src
->
Y
))
return
0
;
if
(
!
BN_copy
(
dest
->
Z
,
src
->
Z
))
return
0
;
dest
->
Z_is_one
=
src
->
Z_is_one
;
return
1
;
...
...
@@ -341,7 +357,7 @@ int ec_GF2m_simple_point_copy(EC_POINT *dest, const EC_POINT *src)
int
ec_GF2m_simple_point_set_to_infinity
(
const
EC_GROUP
*
group
,
EC_POINT
*
point
)
{
point
->
Z_is_one
=
0
;
BN_zero
(
&
point
->
Z
);
BN_zero
(
point
->
Z
);
return
1
;
}
...
...
@@ -359,12 +375,12 @@ int ec_GF2m_simple_point_set_affine_coordinates(const EC_GROUP *group, EC_POINT
return
0
;
}
if
(
!
BN_copy
(
&
point
->
X
,
x
))
goto
err
;
BN_set_negative
(
&
point
->
X
,
0
);
if
(
!
BN_copy
(
&
point
->
Y
,
y
))
goto
err
;
BN_set_negative
(
&
point
->
Y
,
0
);
if
(
!
BN_copy
(
&
point
->
Z
,
BN_value_one
()))
goto
err
;
BN_set_negative
(
&
point
->
Z
,
0
);
if
(
!
BN_copy
(
point
->
X
,
x
))
goto
err
;
BN_set_negative
(
point
->
X
,
0
);
if
(
!
BN_copy
(
point
->
Y
,
y
))
goto
err
;
BN_set_negative
(
point
->
Y
,
0
);
if
(
!
BN_copy
(
point
->
Z
,
BN_value_one
()))
goto
err
;
BN_set_negative
(
point
->
Z
,
0
);
point
->
Z_is_one
=
1
;
ret
=
1
;
...
...
@@ -387,19 +403,19 @@ int ec_GF2m_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_
return
0
;
}
if
(
BN_cmp
(
&
point
->
Z
,
BN_value_one
()))
if
(
BN_cmp
(
point
->
Z
,
BN_value_one
()))
{
ECerr
(
EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES
,
ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED
);
return
0
;
}
if
(
x
!=
NULL
)
{
if
(
!
BN_copy
(
x
,
&
point
->
X
))
goto
err
;
if
(
!
BN_copy
(
x
,
point
->
X
))
goto
err
;
BN_set_negative
(
x
,
0
);
}
if
(
y
!=
NULL
)
{
if
(
!
BN_copy
(
y
,
&
point
->
Y
))
goto
err
;
if
(
!
BN_copy
(
y
,
point
->
Y
))
goto
err
;
BN_set_negative
(
y
,
0
);
}
ret
=
1
;
...
...
@@ -449,8 +465,8 @@ int ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, co
if
(
a
->
Z_is_one
)
{
if
(
!
BN_copy
(
x0
,
&
a
->
X
))
goto
err
;
if
(
!
BN_copy
(
y0
,
&
a
->
Y
))
goto
err
;
if
(
!
BN_copy
(
x0
,
a
->
X
))
goto
err
;
if
(
!
BN_copy
(
y0
,
a
->
Y
))
goto
err
;
}
else
{
...
...
@@ -458,8 +474,8 @@ int ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, co
}
if
(
b
->
Z_is_one
)
{
if
(
!
BN_copy
(
x1
,
&
b
->
X
))
goto
err
;
if
(
!
BN_copy
(
y1
,
&
b
->
Y
))
goto
err
;
if
(
!
BN_copy
(
x1
,
b
->
X
))
goto
err
;
if
(
!
BN_copy
(
y1
,
b
->
Y
))
goto
err
;
}
else
{
...
...
@@ -473,7 +489,7 @@ int ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, co
if
(
!
BN_GF2m_add
(
s
,
y0
,
y1
))
goto
err
;
if
(
!
group
->
meth
->
field_div
(
group
,
s
,
s
,
t
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_sqr
(
group
,
x2
,
s
,
ctx
))
goto
err
;
if
(
!
BN_GF2m_add
(
x2
,
x2
,
&
group
->
a
))
goto
err
;
if
(
!
BN_GF2m_add
(
x2
,
x2
,
group
->
a
))
goto
err
;
if
(
!
BN_GF2m_add
(
x2
,
x2
,
s
))
goto
err
;
if
(
!
BN_GF2m_add
(
x2
,
x2
,
t
))
goto
err
;
}
...
...
@@ -490,7 +506,7 @@ int ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, co
if
(
!
group
->
meth
->
field_sqr
(
group
,
x2
,
s
,
ctx
))
goto
err
;
if
(
!
BN_GF2m_add
(
x2
,
x2
,
s
))
goto
err
;
if
(
!
BN_GF2m_add
(
x2
,
x2
,
&
group
->
a
))
goto
err
;
if
(
!
BN_GF2m_add
(
x2
,
x2
,
group
->
a
))
goto
err
;
}
if
(
!
BN_GF2m_add
(
y2
,
x1
,
x2
))
goto
err
;
...
...
@@ -521,19 +537,19 @@ int ec_GF2m_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN
int
ec_GF2m_simple_invert
(
const
EC_GROUP
*
group
,
EC_POINT
*
point
,
BN_CTX
*
ctx
)
{
if
(
EC_POINT_is_at_infinity
(
group
,
point
)
||
BN_is_zero
(
&
point
->
Y
))
if
(
EC_POINT_is_at_infinity
(
group
,
point
)
||
BN_is_zero
(
point
->
Y
))
/* point is its own inverse */
return
1
;
if
(
!
EC_POINT_make_affine
(
group
,
point
,
ctx
))
return
0
;
return
BN_GF2m_add
(
&
point
->
Y
,
&
point
->
X
,
&
point
->
Y
);
return
BN_GF2m_add
(
point
->
Y
,
point
->
X
,
point
->
Y
);
}
/* Indicates whether the given point is the point at infinity. */
int
ec_GF2m_simple_is_at_infinity
(
const
EC_GROUP
*
group
,
const
EC_POINT
*
point
)
{
return
BN_is_zero
(
&
point
->
Z
);
return
BN_is_zero
(
point
->
Z
);
}
...
...
@@ -575,12 +591,12 @@ int ec_GF2m_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_
* <=> x^3 + a*x^2 + x*y + b + y^2 = 0
* <=> ((x + a) * x + y ) * x + b + y^2 = 0
*/
if
(
!
BN_GF2m_add
(
lh
,
&
point
->
X
,
&
group
->
a
))
goto
err
;
if
(
!
field_mul
(
group
,
lh
,
lh
,
&
point
->
X
,
ctx
))
goto
err
;
if
(
!
BN_GF2m_add
(
lh
,
lh
,
&
point
->
Y
))
goto
err
;
if
(
!
field_mul
(
group
,
lh
,
lh
,
&
point
->
X
,
ctx
))
goto
err
;
if
(
!
BN_GF2m_add
(
lh
,
lh
,
&
group
->
b
))
goto
err
;
if
(
!
field_sqr
(
group
,
y2
,
&
point
->
Y
,
ctx
))
goto
err
;
if
(
!
BN_GF2m_add
(
lh
,
point
->
X
,
group
->
a
))
goto
err
;
if
(
!
field_mul
(
group
,
lh
,
lh
,
point
->
X
,
ctx
))
goto
err
;
if
(
!
BN_GF2m_add
(
lh
,
lh
,
point
->
Y
))
goto
err
;
if
(
!
field_mul
(
group
,
lh
,
lh
,
point
->
X
,
ctx
))
goto
err
;
if
(
!
BN_GF2m_add
(
lh
,
lh
,
group
->
b
))
goto
err
;
if
(
!
field_sqr
(
group
,
y2
,
point
->
Y
,
ctx
))
goto
err
;
if
(
!
BN_GF2m_add
(
lh
,
lh
,
y2
))
goto
err
;
ret
=
BN_is_zero
(
lh
);
err:
...
...
@@ -612,7 +628,7 @@ int ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT
if
(
a
->
Z_is_one
&&
b
->
Z_is_one
)
{
return
((
BN_cmp
(
&
a
->
X
,
&
b
->
X
)
==
0
)
&&
BN_cmp
(
&
a
->
Y
,
&
b
->
Y
)
==
0
)
?
0
:
1
;
return
((
BN_cmp
(
a
->
X
,
b
->
X
)
==
0
)
&&
BN_cmp
(
a
->
Y
,
b
->
Y
)
==
0
)
?
0
:
1
;
}
if
(
ctx
==
NULL
)
...
...
@@ -663,9 +679,9 @@ int ec_GF2m_simple_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *c
if
(
y
==
NULL
)
goto
err
;
if
(
!
EC_POINT_get_affine_coordinates_GF2m
(
group
,
point
,
x
,
y
,
ctx
))
goto
err
;
if
(
!
BN_copy
(
&
point
->
X
,
x
))
goto
err
;
if
(
!
BN_copy
(
&
point
->
Y
,
y
))
goto
err
;
if
(
!
BN_one
(
&
point
->
Z
))
goto
err
;
if
(
!
BN_copy
(
point
->
X
,
x
))
goto
err
;
if
(
!
BN_copy
(
point
->
Y
,
y
))
goto
err
;
if
(
!
BN_one
(
point
->
Z
))
goto
err
;
ret
=
1
;
...
...
@@ -707,7 +723,7 @@ int ec_GF2m_simple_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
/* Wrapper to simple binary polynomial field division implementation. */
int
ec_GF2m_simple_field_div
(
const
EC_GROUP
*
group
,
BIGNUM
*
r
,
const
BIGNUM
*
a
,
const
BIGNUM
*
b
,
BN_CTX
*
ctx
)
{
return
BN_GF2m_mod_div
(
r
,
a
,
b
,
&
group
->
field
,
ctx
);
return
BN_GF2m_mod_div
(
r
,
a
,
b
,
group
->
field
,
ctx
);
}
#endif
crypto/ec/ec_key.c
浏览文件 @
5784a521
...
...
@@ -326,7 +326,7 @@ int EC_KEY_check_key(const EC_KEY *eckey)
goto
err
;
}
/* testing whether pub_key * order is the point at infinity */
order
=
&
eckey
->
group
->
order
;
order
=
eckey
->
group
->
order
;
if
(
BN_is_zero
(
order
))
{
ECerr
(
EC_F_EC_KEY_CHECK_KEY
,
EC_R_INVALID_GROUP_ORDER
);
...
...
@@ -427,8 +427,8 @@ int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x, BIGNUM *y)
* field order: if not values are out of range.
*/
if
(
BN_cmp
(
x
,
tx
)
||
BN_cmp
(
y
,
ty
)
||
(
BN_cmp
(
x
,
&
key
->
group
->
field
)
>=
0
)
||
(
BN_cmp
(
y
,
&
key
->
group
->
field
)
>=
0
))
||
(
BN_cmp
(
x
,
key
->
group
->
field
)
>=
0
)
||
(
BN_cmp
(
y
,
key
->
group
->
field
)
>=
0
))
{
ECerr
(
EC_F_EC_KEY_SET_PUBLIC_KEY_AFFINE_COORDINATES
,
EC_R_COORDINATES_OUT_OF_RANGE
);
...
...
crypto/ec/ec_lcl.h
浏览文件 @
5784a521
...
...
@@ -190,7 +190,7 @@ struct ec_group_st {
const
EC_METHOD
*
meth
;
EC_POINT
*
generator
;
/* optional */
BIGNUM
order
,
cofactor
;
BIGNUM
*
order
,
*
cofactor
;
int
curve_name
;
/* optional NID for named curve */
int
asn1_flag
;
/* flag to control the asn1 encoding */
...
...
@@ -204,7 +204,7 @@ struct ec_group_st {
/* The following members are handled by the method functions,
* even if they appear generic */
BIGNUM
field
;
/* Field specification.
BIGNUM
*
field
;
/* Field specification.
* For curves over GF(p), this is the modulus;
* for curves over GF(2^m), this is the
* irreducible polynomial defining the field.
...
...
@@ -219,7 +219,7 @@ struct ec_group_st {
* non-zero terms.
*/
BIGNUM
a
,
b
;
/* Curve coefficients.
BIGNUM
*
a
,
*
b
;
/* Curve coefficients.
* (Here the assumption is that BIGNUMs can be used
* or abused for all kinds of fields, not just GF(p).)
* For characteristic > 3, the curve is defined
...
...
@@ -280,9 +280,9 @@ struct ec_point_st {
/* All members except 'meth' are handled by the method functions,
* even if they appear generic */
BIGNUM
X
;
BIGNUM
Y
;
BIGNUM
Z
;
/* Jacobian projective coordinates:
BIGNUM
*
X
;
BIGNUM
*
Y
;
BIGNUM
*
Z
;
/* Jacobian projective coordinates:
* (X, Y, Z) represents (X/Z^2, Y/Z^3) if Z != 0 */
int
Z_is_one
;
/* enable optimized point arithmetics for special case */
}
/* EC_POINT */
;
...
...
crypto/ec/ec_lib.c
浏览文件 @
5784a521
...
...
@@ -103,8 +103,11 @@ EC_GROUP *EC_GROUP_new(const EC_METHOD *meth)
ret
->
mont_data
=
NULL
;
ret
->
generator
=
NULL
;
BN_init
(
&
ret
->
order
);
BN_init
(
&
ret
->
cofactor
);
ret
->
order
=
BN_new
();
ret
->
cofactor
=
NULL
;
if
(
!
ret
->
order
)
goto
err
;
ret
->
cofactor
=
BN_new
();
if
(
!
ret
->
cofactor
)
goto
err
;
ret
->
curve_name
=
0
;
ret
->
asn1_flag
=
0
;
...
...
@@ -113,13 +116,14 @@ EC_GROUP *EC_GROUP_new(const EC_METHOD *meth)
ret
->
seed
=
NULL
;
ret
->
seed_len
=
0
;
if
(
!
meth
->
group_init
(
ret
))
{
OPENSSL_free
(
ret
);
return
NULL
;
}
if
(
!
meth
->
group_init
(
ret
))
goto
err
;
return
ret
;
err:
if
(
ret
->
order
)
BN_free
(
ret
->
order
);
if
(
ret
->
cofactor
)
BN_free
(
ret
->
cofactor
);
OPENSSL_free
(
ret
);
return
NULL
;
}
...
...
@@ -137,8 +141,8 @@ void EC_GROUP_free(EC_GROUP *group)
if
(
group
->
generator
!=
NULL
)
EC_POINT_free
(
group
->
generator
);
BN_free
(
&
group
->
order
);
BN_free
(
&
group
->
cofactor
);
BN_free
(
group
->
order
);
BN_free
(
group
->
cofactor
);
if
(
group
->
seed
)
OPENSSL_free
(
group
->
seed
);
...
...
@@ -163,8 +167,8 @@ void EC_GROUP_clear_free(EC_GROUP *group)
if
(
group
->
generator
!=
NULL
)
EC_POINT_clear_free
(
group
->
generator
);
BN_clear_free
(
&
group
->
order
);
BN_clear_free
(
&
group
->
cofactor
);
BN_clear_free
(
group
->
order
);
BN_clear_free
(
group
->
cofactor
);
if
(
group
->
seed
)
{
...
...
@@ -244,8 +248,8 @@ int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src)
}
}
if
(
!
BN_copy
(
&
dest
->
order
,
&
src
->
order
))
return
0
;
if
(
!
BN_copy
(
&
dest
->
cofactor
,
&
src
->
cofactor
))
return
0
;
if
(
!
BN_copy
(
dest
->
order
,
src
->
order
))
return
0
;
if
(
!
BN_copy
(
dest
->
cofactor
,
src
->
cofactor
))
return
0
;
dest
->
curve_name
=
src
->
curve_name
;
dest
->
asn1_flag
=
src
->
asn1_flag
;
...
...
@@ -325,14 +329,14 @@ int EC_GROUP_set_generator(EC_GROUP *group, const EC_POINT *generator, const BIG
if
(
!
EC_POINT_copy
(
group
->
generator
,
generator
))
return
0
;
if
(
order
!=
NULL
)
{
if
(
!
BN_copy
(
&
group
->
order
,
order
))
return
0
;
}
{
if
(
!
BN_copy
(
group
->
order
,
order
))
return
0
;
}
else
BN_zero
(
&
group
->
order
);
BN_zero
(
group
->
order
);
if
(
cofactor
!=
NULL
)
{
if
(
!
BN_copy
(
&
group
->
cofactor
,
cofactor
))
return
0
;
}
{
if
(
!
BN_copy
(
group
->
cofactor
,
cofactor
))
return
0
;
}
else
BN_zero
(
&
group
->
cofactor
);
BN_zero
(
group
->
cofactor
);
/* We ignore the return value because some groups have an order with
* factors of two, which makes the Montgomery setup fail.
...
...
@@ -355,7 +359,7 @@ BN_MONT_CTX *EC_GROUP_get_mont_data(const EC_GROUP *group)
int
EC_GROUP_get_order
(
const
EC_GROUP
*
group
,
BIGNUM
*
order
,
BN_CTX
*
ctx
)
{
if
(
!
BN_copy
(
order
,
&
group
->
order
))
if
(
!
BN_copy
(
order
,
group
->
order
))
return
0
;
return
!
BN_is_zero
(
order
);
...
...
@@ -364,10 +368,10 @@ int EC_GROUP_get_order(const EC_GROUP *group, BIGNUM *order, BN_CTX *ctx)
int
EC_GROUP_get_cofactor
(
const
EC_GROUP
*
group
,
BIGNUM
*
cofactor
,
BN_CTX
*
ctx
)
{
if
(
!
BN_copy
(
cofactor
,
&
group
->
cofactor
))
if
(
!
BN_copy
(
cofactor
,
group
->
cofactor
))
return
0
;
return
!
BN_is_zero
(
&
group
->
cofactor
);
return
!
BN_is_zero
(
group
->
cofactor
);
}
...
...
@@ -1152,7 +1156,7 @@ int ec_precompute_mont_data(EC_GROUP *group)
if
(
!
group
->
mont_data
)
goto
err
;
if
(
!
BN_MONT_CTX_set
(
group
->
mont_data
,
&
group
->
order
,
ctx
))
if
(
!
BN_MONT_CTX_set
(
group
->
mont_data
,
group
->
order
,
ctx
))
{
BN_MONT_CTX_free
(
group
->
mont_data
);
group
->
mont_data
=
NULL
;
...
...
crypto/ec/ec_mult.c
浏览文件 @
5784a521
...
...
@@ -64,9 +64,9 @@
#include <string.h>
#include <openssl/err.h>
#include "internal/bn_int.h"
#include "ec_lcl.h"
...
...
@@ -184,146 +184,7 @@ static void ec_pre_comp_clear_free(void *pre_)
/* Determine the modified width-(w+1) Non-Adjacent Form (wNAF) of 'scalar'.
* This is an array r[] of values that are either zero or odd with an
* absolute value less than 2^w satisfying
* scalar = \sum_j r[j]*2^j
* where at most one of any w+1 consecutive digits is non-zero
* with the exception that the most significant digit may be only
* w-1 zeros away from that next non-zero digit.
*/
static
signed
char
*
compute_wNAF
(
const
BIGNUM
*
scalar
,
int
w
,
size_t
*
ret_len
)
{
int
window_val
;
int
ok
=
0
;
signed
char
*
r
=
NULL
;
int
sign
=
1
;
int
bit
,
next_bit
,
mask
;
size_t
len
=
0
,
j
;
if
(
BN_is_zero
(
scalar
))
{
r
=
OPENSSL_malloc
(
1
);
if
(
!
r
)
{
ECerr
(
EC_F_COMPUTE_WNAF
,
ERR_R_MALLOC_FAILURE
);
goto
err
;
}
r
[
0
]
=
0
;
*
ret_len
=
1
;
return
r
;
}
if
(
w
<=
0
||
w
>
7
)
/* 'signed char' can represent integers with absolute values less than 2^7 */
{
ECerr
(
EC_F_COMPUTE_WNAF
,
ERR_R_INTERNAL_ERROR
);
goto
err
;
}
bit
=
1
<<
w
;
/* at most 128 */
next_bit
=
bit
<<
1
;
/* at most 256 */
mask
=
next_bit
-
1
;
/* at most 255 */
if
(
BN_is_negative
(
scalar
))
{
sign
=
-
1
;
}
if
(
scalar
->
d
==
NULL
||
scalar
->
top
==
0
)
{
ECerr
(
EC_F_COMPUTE_WNAF
,
ERR_R_INTERNAL_ERROR
);
goto
err
;
}
len
=
BN_num_bits
(
scalar
);
r
=
OPENSSL_malloc
(
len
+
1
);
/* modified wNAF may be one digit longer than binary representation
* (*ret_len will be set to the actual length, i.e. at most
* BN_num_bits(scalar) + 1) */
if
(
r
==
NULL
)
{
ECerr
(
EC_F_COMPUTE_WNAF
,
ERR_R_MALLOC_FAILURE
);
goto
err
;
}
window_val
=
scalar
->
d
[
0
]
&
mask
;
j
=
0
;
while
((
window_val
!=
0
)
||
(
j
+
w
+
1
<
len
))
/* if j+w+1 >= len, window_val will not increase */
{
int
digit
=
0
;
/* 0 <= window_val <= 2^(w+1) */
if
(
window_val
&
1
)
{
/* 0 < window_val < 2^(w+1) */
if
(
window_val
&
bit
)
{
digit
=
window_val
-
next_bit
;
/* -2^w < digit < 0 */
#if 1
/* modified wNAF */
if
(
j
+
w
+
1
>=
len
)
{
/* special case for generating modified wNAFs:
* no new bits will be added into window_val,
* so using a positive digit here will decrease
* the total length of the representation */
digit
=
window_val
&
(
mask
>>
1
);
/* 0 < digit < 2^w */
}
#endif
}
else
{
digit
=
window_val
;
/* 0 < digit < 2^w */
}
if
(
digit
<=
-
bit
||
digit
>=
bit
||
!
(
digit
&
1
))
{
ECerr
(
EC_F_COMPUTE_WNAF
,
ERR_R_INTERNAL_ERROR
);
goto
err
;
}
window_val
-=
digit
;
/* now window_val is 0 or 2^(w+1) in standard wNAF generation;
* for modified window NAFs, it may also be 2^w
*/
if
(
window_val
!=
0
&&
window_val
!=
next_bit
&&
window_val
!=
bit
)
{
ECerr
(
EC_F_COMPUTE_WNAF
,
ERR_R_INTERNAL_ERROR
);
goto
err
;
}
}
r
[
j
++
]
=
sign
*
digit
;
window_val
>>=
1
;
window_val
+=
bit
*
BN_is_bit_set
(
scalar
,
j
+
w
);
if
(
window_val
>
next_bit
)
{
ECerr
(
EC_F_COMPUTE_WNAF
,
ERR_R_INTERNAL_ERROR
);
goto
err
;
}
}
if
(
j
>
len
+
1
)
{
ECerr
(
EC_F_COMPUTE_WNAF
,
ERR_R_INTERNAL_ERROR
);
goto
err
;
}
len
=
j
;
ok
=
1
;
err:
if
(
!
ok
)
{
OPENSSL_free
(
r
);
r
=
NULL
;
}
if
(
ok
)
*
ret_len
=
len
;
return
r
;
}
/* TODO: table should be optimised for the wNAF-based implementation,
...
...
@@ -468,7 +329,7 @@ int ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
wsize
[
i
]
=
EC_window_bits_for_scalar_size
(
bits
);
num_val
+=
(
size_t
)
1
<<
(
wsize
[
i
]
-
1
);
wNAF
[
i
+
1
]
=
NULL
;
/* make sure we always have a pivot */
wNAF
[
i
]
=
compute_wNAF
((
i
<
num
?
scalars
[
i
]
:
scalar
),
wsize
[
i
],
&
wNAF_len
[
i
]);
wNAF
[
i
]
=
bn_
compute_wNAF
((
i
<
num
?
scalars
[
i
]
:
scalar
),
wsize
[
i
],
&
wNAF_len
[
i
]);
if
(
wNAF
[
i
]
==
NULL
)
goto
err
;
if
(
wNAF_len
[
i
]
>
max_len
)
...
...
@@ -501,7 +362,7 @@ int ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
/* use the window size for which we have precomputation */
wsize
[
num
]
=
pre_comp
->
w
;
tmp_wNAF
=
compute_wNAF
(
scalar
,
wsize
[
num
],
&
tmp_len
);
tmp_wNAF
=
bn_
compute_wNAF
(
scalar
,
wsize
[
num
],
&
tmp_len
);
if
(
!
tmp_wNAF
)
goto
err
;
...
...
crypto/ec/ec_pmeth.c
浏览文件 @
5784a521
...
...
@@ -336,7 +336,7 @@ static int pkey_ec_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
if
(
!
ec_key
->
group
)
return
-
2
;
/* If cofactor is 1 cofactor mode does nothing */
if
(
BN_is_one
(
&
ec_key
->
group
->
cofactor
))
if
(
BN_is_one
(
ec_key
->
group
->
cofactor
))
return
1
;
if
(
!
dctx
->
co_key
)
{
...
...
crypto/ec/ecp_nist.c
浏览文件 @
5784a521
...
...
@@ -172,7 +172,7 @@ int ec_GFp_nist_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
if
((
ctx_new
=
ctx
=
BN_CTX_new
())
==
NULL
)
goto
err
;
if
(
!
BN_mul
(
r
,
a
,
b
,
ctx
))
goto
err
;
if
(
!
group
->
field_mod_func
(
r
,
r
,
&
group
->
field
,
ctx
))
if
(
!
group
->
field_mod_func
(
r
,
r
,
group
->
field
,
ctx
))
goto
err
;
ret
=
1
;
...
...
@@ -198,7 +198,7 @@ int ec_GFp_nist_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
if
((
ctx_new
=
ctx
=
BN_CTX_new
())
==
NULL
)
goto
err
;
if
(
!
BN_sqr
(
r
,
a
,
ctx
))
goto
err
;
if
(
!
group
->
field_mod_func
(
r
,
r
,
&
group
->
field
,
ctx
))
if
(
!
group
->
field_mod_func
(
r
,
r
,
group
->
field
,
ctx
))
goto
err
;
ret
=
1
;
...
...
crypto/ec/ecp_nistz256.c
浏览文件 @
5784a521
...
...
@@ -28,7 +28,7 @@
#include <string.h>
#include
<openssl/bn.h>
#include
"internal/bn_int.h"
#include <openssl/err.h>
#include <openssl/ec.h>
#include "cryptlib.h"
...
...
@@ -543,12 +543,7 @@ static void ecp_nistz256_mod_inverse(BN_ULONG r[P256_LIMBS],
static
int
ecp_nistz256_bignum_to_field_elem
(
BN_ULONG
out
[
P256_LIMBS
],
const
BIGNUM
*
in
)
{
if
(
in
->
top
>
P256_LIMBS
)
return
0
;
memset
(
out
,
0
,
sizeof
(
BN_ULONG
)
*
P256_LIMBS
);
memcpy
(
out
,
in
->
d
,
sizeof
(
BN_ULONG
)
*
in
->
top
);
return
1
;
return
bn_copy_words
(
out
,
in
,
P256_LIMBS
);
}
/* r = sum(scalar[i]*point[i]) */
...
...
@@ -589,7 +584,7 @@ static void ecp_nistz256_windowed_mul(const EC_GROUP * group,
if
((
mod
=
BN_CTX_get
(
ctx
))
==
NULL
)
goto
err
;
if
(
!
BN_nnmod
(
mod
,
scalar
[
i
],
&
group
->
order
,
ctx
))
{
if
(
!
BN_nnmod
(
mod
,
scalar
[
i
],
group
->
order
,
ctx
))
{
ECerr
(
EC_F_ECP_NISTZ256_WINDOWED_MUL
,
ERR_R_BN_LIB
);
goto
err
;
}
...
...
@@ -597,8 +592,8 @@ static void ecp_nistz256_windowed_mul(const EC_GROUP * group,
}
else
scalars
[
i
]
=
scalar
[
i
];
for
(
j
=
0
;
j
<
scalars
[
i
]
->
top
*
BN_BYTES
;
j
+=
BN_BYTES
)
{
BN_ULONG
d
=
scalars
[
i
]
->
d
[
j
/
BN_BYTES
];
for
(
j
=
0
;
j
<
bn_get_top
(
scalars
[
i
])
*
BN_BYTES
;
j
+=
BN_BYTES
)
{
BN_ULONG
d
=
bn_get_words
(
scalars
[
i
])
[
j
/
BN_BYTES
];
p_str
[
i
][
j
+
0
]
=
d
&
0xff
;
p_str
[
i
][
j
+
1
]
=
(
d
>>
8
)
&
0xff
;
...
...
@@ -615,9 +610,9 @@ static void ecp_nistz256_windowed_mul(const EC_GROUP * group,
for
(;
j
<
33
;
j
++
)
p_str
[
i
][
j
]
=
0
;
if
(
!
ecp_nistz256_bignum_to_field_elem
(
temp
[
0
].
X
,
&
point
[
i
]
->
X
)
||
!
ecp_nistz256_bignum_to_field_elem
(
temp
[
0
].
Y
,
&
point
[
i
]
->
Y
)
||
!
ecp_nistz256_bignum_to_field_elem
(
temp
[
0
].
Z
,
&
point
[
i
]
->
Z
))
{
if
(
!
ecp_nistz256_bignum_to_field_elem
(
temp
[
0
].
X
,
point
[
i
]
->
X
)
||
!
ecp_nistz256_bignum_to_field_elem
(
temp
[
0
].
Y
,
point
[
i
]
->
Y
)
||
!
ecp_nistz256_bignum_to_field_elem
(
temp
[
0
].
Z
,
point
[
i
]
->
Z
))
{
ECerr
(
EC_F_ECP_NISTZ256_WINDOWED_MUL
,
EC_R_COORDINATES_OUT_OF_RANGE
);
goto
err
;
}
...
...
@@ -737,11 +732,12 @@ const static BN_ULONG def_yG[P256_LIMBS] = {
* P-256 generator. */
static
int
ecp_nistz256_is_affine_G
(
const
EC_POINT
*
generator
)
{
return
(
generator
->
X
.
top
==
P256_LIMBS
)
&&
(
generator
->
Y
.
top
==
P256_LIMBS
)
&&
(
generator
->
Z
.
top
==
(
P256_LIMBS
-
P256_LIMBS
/
8
))
&&
is_equal
(
generator
->
X
.
d
,
def_xG
)
&&
is_equal
(
generator
->
Y
.
d
,
def_yG
)
&&
is_one
(
generator
->
Z
.
d
);
return
(
bn_get_top
(
generator
->
X
)
==
P256_LIMBS
)
&&
(
bn_get_top
(
generator
->
Y
)
==
P256_LIMBS
)
&&
(
bn_get_top
(
generator
->
Z
)
==
(
P256_LIMBS
-
P256_LIMBS
/
8
))
&&
is_equal
(
bn_get_words
(
generator
->
X
),
def_xG
)
&&
is_equal
(
bn_get_words
(
generator
->
Y
),
def_yG
)
&&
is_one
(
bn_get_words
(
generator
->
Z
));
}
static
int
ecp_nistz256_mult_precompute
(
EC_GROUP
*
group
,
BN_CTX
*
ctx
)
...
...
@@ -825,8 +821,8 @@ static int ecp_nistz256_mult_precompute(EC_GROUP * group, BN_CTX * ctx)
* ec_GFp_simple_points_make_affine and make multiple
* points affine at the same time. */
ec_GFp_simple_make_affine
(
group
,
P
,
ctx
);
ecp_nistz256_bignum_to_field_elem
(
temp
.
X
,
&
P
->
X
);
ecp_nistz256_bignum_to_field_elem
(
temp
.
Y
,
&
P
->
Y
);
ecp_nistz256_bignum_to_field_elem
(
temp
.
X
,
P
->
X
);
ecp_nistz256_bignum_to_field_elem
(
temp
.
Y
,
P
->
Y
);
ecp_nistz256_scatter_w7
(
preComputedTable
[
j
],
&
temp
,
k
);
for
(
i
=
0
;
i
<
7
;
i
++
)
ec_GFp_simple_dbl
(
group
,
P
,
P
,
ctx
);
...
...
@@ -1069,23 +1065,28 @@ static int ecp_nistz256_set_from_affine(EC_POINT * out, const EC_GROUP * group,
const
P256_POINT_AFFINE
*
in
,
BN_CTX
*
ctx
)
{
BIGNUM
x
,
y
;
BIGNUM
*
x
,
*
y
;
BN_ULONG
d_x
[
P256_LIMBS
],
d_y
[
P256_LIMBS
];
int
ret
=
0
;
x
=
BN_new
();
if
(
!
x
)
return
0
;
y
=
BN_new
();
if
(
!
y
)
{
BN_free
(
x
);
return
0
;
}
memcpy
(
d_x
,
in
->
X
,
sizeof
(
d_x
));
x
.
d
=
d_x
;
x
.
dmax
=
x
.
top
=
P256_LIMBS
;
x
.
neg
=
0
;
x
.
flags
=
BN_FLG_STATIC_DATA
;
bn_set_static_words
(
x
,
d_x
,
P256_LIMBS
);
memcpy
(
d_y
,
in
->
Y
,
sizeof
(
d_y
));
y
.
d
=
d_y
;
y
.
dmax
=
y
.
top
=
P256_LIMBS
;
y
.
neg
=
0
;
y
.
flags
=
BN_FLG_STATIC_DATA
;
bn_set_static_words
(
y
,
d_y
,
P256_LIMBS
);
ret
=
EC_POINT_set_affine_coordinates_GFp
(
group
,
out
,
x
,
y
,
ctx
);
ret
=
EC_POINT_set_affine_coordinates_GFp
(
group
,
out
,
&
x
,
&
y
,
ctx
);
if
(
x
)
BN_free
(
x
);
if
(
y
)
BN_free
(
y
);
return
ret
;
}
...
...
@@ -1134,12 +1135,12 @@ static int ecp_nistz256_points_mul(const EC_GROUP * group,
}
/* Need 256 bits for space for all coordinates. */
bn_wexpand
(
&
r
->
X
,
P256_LIMBS
);
bn_wexpand
(
&
r
->
Y
,
P256_LIMBS
);
bn_wexpand
(
&
r
->
Z
,
P256_LIMBS
);
r
->
X
.
top
=
P256_LIMBS
;
r
->
Y
.
top
=
P256_LIMBS
;
r
->
Z
.
top
=
P256_LIMBS
;
bn_wexpand
(
r
->
X
,
P256_LIMBS
);
bn_wexpand
(
r
->
Y
,
P256_LIMBS
);
bn_wexpand
(
r
->
Z
,
P256_LIMBS
);
bn_set_top
(
r
->
X
,
P256_LIMBS
)
;
bn_set_top
(
r
->
Y
,
P256_LIMBS
)
;
bn_set_top
(
r
->
Z
,
P256_LIMBS
)
;
if
(
scalar
)
{
generator
=
EC_GROUP_get0_generator
(
group
);
...
...
@@ -1187,15 +1188,15 @@ static int ecp_nistz256_points_mul(const EC_GROUP * group,
if
((
tmp_scalar
=
BN_CTX_get
(
ctx
))
==
NULL
)
goto
err
;
if
(
!
BN_nnmod
(
tmp_scalar
,
scalar
,
&
group
->
order
,
ctx
))
{
if
(
!
BN_nnmod
(
tmp_scalar
,
scalar
,
group
->
order
,
ctx
))
{
ECerr
(
EC_F_ECP_NISTZ256_POINTS_MUL
,
ERR_R_BN_LIB
);
goto
err
;
}
scalar
=
tmp_scalar
;
}
for
(
i
=
0
;
i
<
scalar
->
top
*
BN_BYTES
;
i
+=
BN_BYTES
)
{
BN_ULONG
d
=
scalar
->
d
[
i
/
BN_BYTES
];
for
(
i
=
0
;
i
<
bn_get_top
(
scalar
)
*
BN_BYTES
;
i
+=
BN_BYTES
)
{
BN_ULONG
d
=
bn_get_words
(
scalar
)
[
i
/
BN_BYTES
];
p_str
[
i
+
0
]
=
d
&
0xff
;
p_str
[
i
+
1
]
=
(
d
>>
8
)
&
0xff
;
...
...
@@ -1301,12 +1302,12 @@ static int ecp_nistz256_points_mul(const EC_GROUP * group,
OPENSSL_free
(
scalars
);
}
memcpy
(
r
->
X
.
d
,
p
.
p
.
X
,
sizeof
(
p
.
p
.
X
));
memcpy
(
r
->
Y
.
d
,
p
.
p
.
Y
,
sizeof
(
p
.
p
.
Y
));
memcpy
(
r
->
Z
.
d
,
p
.
p
.
Z
,
sizeof
(
p
.
p
.
Z
));
bn_correct_top
(
&
r
->
X
);
bn_correct_top
(
&
r
->
Y
);
bn_correct_top
(
&
r
->
Z
);
bn_set_data
(
r
->
X
,
p
.
p
.
X
,
sizeof
(
p
.
p
.
X
));
bn_set_data
(
r
->
Y
,
p
.
p
.
Y
,
sizeof
(
p
.
p
.
Y
));
bn_set_data
(
r
->
Z
,
p
.
p
.
Z
,
sizeof
(
p
.
p
.
Z
));
bn_correct_top
(
r
->
X
);
bn_correct_top
(
r
->
Y
);
bn_correct_top
(
r
->
Z
);
ret
=
1
;
...
...
@@ -1329,9 +1330,9 @@ static int ecp_nistz256_get_affine(const EC_GROUP * group,
return
0
;
}
if
(
!
ecp_nistz256_bignum_to_field_elem
(
point_x
,
&
point
->
X
)
||
!
ecp_nistz256_bignum_to_field_elem
(
point_y
,
&
point
->
Y
)
||
!
ecp_nistz256_bignum_to_field_elem
(
point_z
,
&
point
->
Z
))
{
if
(
!
ecp_nistz256_bignum_to_field_elem
(
point_x
,
point
->
X
)
||
!
ecp_nistz256_bignum_to_field_elem
(
point_y
,
point
->
Y
)
||
!
ecp_nistz256_bignum_to_field_elem
(
point_z
,
point
->
Z
))
{
ECerr
(
EC_F_ECP_NISTZ256_GET_AFFINE
,
EC_R_COORDINATES_OUT_OF_RANGE
);
return
0
;
}
...
...
@@ -1342,8 +1343,8 @@ static int ecp_nistz256_get_affine(const EC_GROUP * group,
if
(
x
!=
NULL
)
{
bn_wexpand
(
x
,
P256_LIMBS
);
x
->
top
=
P256_LIMBS
;
ecp_nistz256_from_mont
(
x
->
d
,
x_aff
);
bn_set_top
(
x
,
P256_LIMBS
)
;
ecp_nistz256_from_mont
(
bn_get_words
(
x
)
,
x_aff
);
bn_correct_top
(
x
);
}
...
...
@@ -1351,8 +1352,8 @@ static int ecp_nistz256_get_affine(const EC_GROUP * group,
ecp_nistz256_mul_mont
(
z_inv3
,
z_inv3
,
z_inv2
);
ecp_nistz256_mul_mont
(
y_aff
,
z_inv3
,
point_y
);
bn_wexpand
(
y
,
P256_LIMBS
);
y
->
top
=
P256_LIMBS
;
ecp_nistz256_from_mont
(
y
->
d
,
y_aff
);
bn_set_top
(
y
,
P256_LIMBS
)
;
ecp_nistz256_from_mont
(
bn_get_words
(
y
)
,
y_aff
);
bn_correct_top
(
y
);
}
...
...
crypto/ec/ecp_oct.c
浏览文件 @
5784a521
...
...
@@ -99,7 +99,7 @@ int ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *po
*/
/* tmp1 := x^3 */
if
(
!
BN_nnmod
(
x
,
x_
,
&
group
->
field
,
ctx
))
goto
err
;
if
(
!
BN_nnmod
(
x
,
x_
,
group
->
field
,
ctx
))
goto
err
;
if
(
group
->
meth
->
field_decode
==
0
)
{
/* field_{sqr,mul} work on standard representation */
...
...
@@ -108,45 +108,45 @@ int ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *po
}
else
{
if
(
!
BN_mod_sqr
(
tmp2
,
x_
,
&
group
->
field
,
ctx
))
goto
err
;
if
(
!
BN_mod_mul
(
tmp1
,
tmp2
,
x_
,
&
group
->
field
,
ctx
))
goto
err
;
if
(
!
BN_mod_sqr
(
tmp2
,
x_
,
group
->
field
,
ctx
))
goto
err
;
if
(
!
BN_mod_mul
(
tmp1
,
tmp2
,
x_
,
group
->
field
,
ctx
))
goto
err
;
}
/* tmp1 := tmp1 + a*x */
if
(
group
->
a_is_minus3
)
{
if
(
!
BN_mod_lshift1_quick
(
tmp2
,
x
,
&
group
->
field
))
goto
err
;
if
(
!
BN_mod_add_quick
(
tmp2
,
tmp2
,
x
,
&
group
->
field
))
goto
err
;
if
(
!
BN_mod_sub_quick
(
tmp1
,
tmp1
,
tmp2
,
&
group
->
field
))
goto
err
;
if
(
!
BN_mod_lshift1_quick
(
tmp2
,
x
,
group
->
field
))
goto
err
;
if
(
!
BN_mod_add_quick
(
tmp2
,
tmp2
,
x
,
group
->
field
))
goto
err
;
if
(
!
BN_mod_sub_quick
(
tmp1
,
tmp1
,
tmp2
,
group
->
field
))
goto
err
;
}
else
{
if
(
group
->
meth
->
field_decode
)
{
if
(
!
group
->
meth
->
field_decode
(
group
,
tmp2
,
&
group
->
a
,
ctx
))
goto
err
;
if
(
!
BN_mod_mul
(
tmp2
,
tmp2
,
x
,
&
group
->
field
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_decode
(
group
,
tmp2
,
group
->
a
,
ctx
))
goto
err
;
if
(
!
BN_mod_mul
(
tmp2
,
tmp2
,
x
,
group
->
field
,
ctx
))
goto
err
;
}
else
{
/* field_mul works on standard representation */
if
(
!
group
->
meth
->
field_mul
(
group
,
tmp2
,
&
group
->
a
,
x
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_mul
(
group
,
tmp2
,
group
->
a
,
x
,
ctx
))
goto
err
;
}
if
(
!
BN_mod_add_quick
(
tmp1
,
tmp1
,
tmp2
,
&
group
->
field
))
goto
err
;
if
(
!
BN_mod_add_quick
(
tmp1
,
tmp1
,
tmp2
,
group
->
field
))
goto
err
;
}
/* tmp1 := tmp1 + b */
if
(
group
->
meth
->
field_decode
)
{
if
(
!
group
->
meth
->
field_decode
(
group
,
tmp2
,
&
group
->
b
,
ctx
))
goto
err
;
if
(
!
BN_mod_add_quick
(
tmp1
,
tmp1
,
tmp2
,
&
group
->
field
))
goto
err
;
if
(
!
group
->
meth
->
field_decode
(
group
,
tmp2
,
group
->
b
,
ctx
))
goto
err
;
if
(
!
BN_mod_add_quick
(
tmp1
,
tmp1
,
tmp2
,
group
->
field
))
goto
err
;
}
else
{
if
(
!
BN_mod_add_quick
(
tmp1
,
tmp1
,
&
group
->
b
,
&
group
->
field
))
goto
err
;
if
(
!
BN_mod_add_quick
(
tmp1
,
tmp1
,
group
->
b
,
group
->
field
))
goto
err
;
}
if
(
!
BN_mod_sqrt
(
y
,
tmp1
,
&
group
->
field
,
ctx
))
if
(
!
BN_mod_sqrt
(
y
,
tmp1
,
group
->
field
,
ctx
))
{
unsigned
long
err
=
ERR_peek_last_error
();
...
...
@@ -166,7 +166,7 @@ int ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *po
{
int
kron
;
kron
=
BN_kronecker
(
x
,
&
group
->
field
,
ctx
);
kron
=
BN_kronecker
(
x
,
group
->
field
,
ctx
);
if
(
kron
==
-
2
)
goto
err
;
if
(
kron
==
1
)
...
...
@@ -176,7 +176,7 @@ int ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *po
ECerr
(
EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES
,
EC_R_INVALID_COMPRESSED_POINT
);
goto
err
;
}
if
(
!
BN_usub
(
y
,
&
group
->
field
,
y
))
goto
err
;
if
(
!
BN_usub
(
y
,
group
->
field
,
y
))
goto
err
;
}
if
(
y_bit
!=
BN_is_odd
(
y
))
{
...
...
@@ -230,7 +230,7 @@ size_t ec_GFp_simple_point2oct(const EC_GROUP *group, const EC_POINT *point, poi
/* ret := required output buffer length */
field_len
=
BN_num_bytes
(
&
group
->
field
);
field_len
=
BN_num_bytes
(
group
->
field
);
ret
=
(
form
==
POINT_CONVERSION_COMPRESSED
)
?
1
+
field_len
:
1
+
2
*
field_len
;
/* if 'buf' is NULL, just return required length */
...
...
@@ -364,7 +364,7 @@ int ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
return
EC_POINT_set_to_infinity
(
group
,
point
);
}
field_len
=
BN_num_bytes
(
&
group
->
field
);
field_len
=
BN_num_bytes
(
group
->
field
);
enc_len
=
(
form
==
POINT_CONVERSION_COMPRESSED
)
?
1
+
field_len
:
1
+
2
*
field_len
;
if
(
len
!=
enc_len
)
...
...
@@ -386,7 +386,7 @@ int ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
if
(
y
==
NULL
)
goto
err
;
if
(
!
BN_bin2bn
(
buf
+
1
,
field_len
,
x
))
goto
err
;
if
(
BN_ucmp
(
x
,
&
group
->
field
)
>=
0
)
if
(
BN_ucmp
(
x
,
group
->
field
)
>=
0
)
{
ECerr
(
EC_F_EC_GFP_SIMPLE_OCT2POINT
,
EC_R_INVALID_ENCODING
);
goto
err
;
...
...
@@ -399,7 +399,7 @@ int ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
else
{
if
(
!
BN_bin2bn
(
buf
+
1
+
field_len
,
field_len
,
y
))
goto
err
;
if
(
BN_ucmp
(
y
,
&
group
->
field
)
>=
0
)
if
(
BN_ucmp
(
y
,
group
->
field
)
>=
0
)
{
ECerr
(
EC_F_EC_GFP_SIMPLE_OCT2POINT
,
EC_R_INVALID_ENCODING
);
goto
err
;
...
...
crypto/ec/ecp_smpl.c
浏览文件 @
5784a521
...
...
@@ -130,9 +130,16 @@ const EC_METHOD *EC_GFp_simple_method(void)
int
ec_GFp_simple_group_init
(
EC_GROUP
*
group
)
{
BN_init
(
&
group
->
field
);
BN_init
(
&
group
->
a
);
BN_init
(
&
group
->
b
);
group
->
field
=
BN_new
();
group
->
a
=
BN_new
();
group
->
b
=
BN_new
();
if
(
!
group
->
field
||
!
group
->
a
||
!
group
->
b
)
{
if
(
!
group
->
field
)
BN_free
(
group
->
field
);
if
(
!
group
->
a
)
BN_free
(
group
->
a
);
if
(
!
group
->
b
)
BN_free
(
group
->
b
);
return
0
;
}
group
->
a_is_minus3
=
0
;
return
1
;
}
...
...
@@ -140,25 +147,25 @@ int ec_GFp_simple_group_init(EC_GROUP *group)
void
ec_GFp_simple_group_finish
(
EC_GROUP
*
group
)
{
BN_free
(
&
group
->
field
);
BN_free
(
&
group
->
a
);
BN_free
(
&
group
->
b
);
BN_free
(
group
->
field
);
BN_free
(
group
->
a
);
BN_free
(
group
->
b
);
}
void
ec_GFp_simple_group_clear_finish
(
EC_GROUP
*
group
)
{
BN_clear_free
(
&
group
->
field
);
BN_clear_free
(
&
group
->
a
);
BN_clear_free
(
&
group
->
b
);
BN_clear_free
(
group
->
field
);
BN_clear_free
(
group
->
a
);
BN_clear_free
(
group
->
b
);
}
int
ec_GFp_simple_group_copy
(
EC_GROUP
*
dest
,
const
EC_GROUP
*
src
)
{
if
(
!
BN_copy
(
&
dest
->
field
,
&
src
->
field
))
return
0
;
if
(
!
BN_copy
(
&
dest
->
a
,
&
src
->
a
))
return
0
;
if
(
!
BN_copy
(
&
dest
->
b
,
&
src
->
b
))
return
0
;
if
(
!
BN_copy
(
dest
->
field
,
src
->
field
))
return
0
;
if
(
!
BN_copy
(
dest
->
a
,
src
->
a
))
return
0
;
if
(
!
BN_copy
(
dest
->
b
,
src
->
b
))
return
0
;
dest
->
a_is_minus3
=
src
->
a_is_minus3
;
...
...
@@ -192,24 +199,24 @@ int ec_GFp_simple_group_set_curve(EC_GROUP *group,
if
(
tmp_a
==
NULL
)
goto
err
;
/* group->field */
if
(
!
BN_copy
(
&
group
->
field
,
p
))
goto
err
;
BN_set_negative
(
&
group
->
field
,
0
);
if
(
!
BN_copy
(
group
->
field
,
p
))
goto
err
;
BN_set_negative
(
group
->
field
,
0
);
/* group->a */
if
(
!
BN_nnmod
(
tmp_a
,
a
,
p
,
ctx
))
goto
err
;
if
(
group
->
meth
->
field_encode
)
{
if
(
!
group
->
meth
->
field_encode
(
group
,
&
group
->
a
,
tmp_a
,
ctx
))
goto
err
;
}
{
if
(
!
group
->
meth
->
field_encode
(
group
,
group
->
a
,
tmp_a
,
ctx
))
goto
err
;
}
else
if
(
!
BN_copy
(
&
group
->
a
,
tmp_a
))
goto
err
;
if
(
!
BN_copy
(
group
->
a
,
tmp_a
))
goto
err
;
/* group->b */
if
(
!
BN_nnmod
(
&
group
->
b
,
b
,
p
,
ctx
))
goto
err
;
if
(
!
BN_nnmod
(
group
->
b
,
b
,
p
,
ctx
))
goto
err
;
if
(
group
->
meth
->
field_encode
)
if
(
!
group
->
meth
->
field_encode
(
group
,
&
group
->
b
,
&
group
->
b
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_encode
(
group
,
group
->
b
,
group
->
b
,
ctx
))
goto
err
;
/* group->a_is_minus3 */
if
(
!
BN_add_word
(
tmp_a
,
3
))
goto
err
;
group
->
a_is_minus3
=
(
0
==
BN_cmp
(
tmp_a
,
&
group
->
field
));
group
->
a_is_minus3
=
(
0
==
BN_cmp
(
tmp_a
,
group
->
field
));
ret
=
1
;
...
...
@@ -228,7 +235,7 @@ int ec_GFp_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, B
if
(
p
!=
NULL
)
{
if
(
!
BN_copy
(
p
,
&
group
->
field
))
return
0
;
if
(
!
BN_copy
(
p
,
group
->
field
))
return
0
;
}
if
(
a
!=
NULL
||
b
!=
NULL
)
...
...
@@ -243,22 +250,22 @@ int ec_GFp_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, B
}
if
(
a
!=
NULL
)
{
if
(
!
group
->
meth
->
field_decode
(
group
,
a
,
&
group
->
a
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_decode
(
group
,
a
,
group
->
a
,
ctx
))
goto
err
;
}
if
(
b
!=
NULL
)
{
if
(
!
group
->
meth
->
field_decode
(
group
,
b
,
&
group
->
b
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_decode
(
group
,
b
,
group
->
b
,
ctx
))
goto
err
;
}
}
else
{
if
(
a
!=
NULL
)
{
if
(
!
BN_copy
(
a
,
&
group
->
a
))
goto
err
;
if
(
!
BN_copy
(
a
,
group
->
a
))
goto
err
;
}
if
(
b
!=
NULL
)
{
if
(
!
BN_copy
(
b
,
&
group
->
b
))
goto
err
;
if
(
!
BN_copy
(
b
,
group
->
b
))
goto
err
;
}
}
}
...
...
@@ -274,7 +281,7 @@ int ec_GFp_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, B
int
ec_GFp_simple_group_get_degree
(
const
EC_GROUP
*
group
)
{
return
BN_num_bits
(
&
group
->
field
);
return
BN_num_bits
(
group
->
field
);
}
...
...
@@ -282,7 +289,7 @@ int ec_GFp_simple_group_check_discriminant(const EC_GROUP *group, BN_CTX *ctx)
{
int
ret
=
0
;
BIGNUM
*
a
,
*
b
,
*
order
,
*
tmp_1
,
*
tmp_2
;
const
BIGNUM
*
p
=
&
group
->
field
;
const
BIGNUM
*
p
=
group
->
field
;
BN_CTX
*
new_ctx
=
NULL
;
if
(
ctx
==
NULL
)
...
...
@@ -304,13 +311,13 @@ int ec_GFp_simple_group_check_discriminant(const EC_GROUP *group, BN_CTX *ctx)
if
(
group
->
meth
->
field_decode
)
{
if
(
!
group
->
meth
->
field_decode
(
group
,
a
,
&
group
->
a
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_decode
(
group
,
b
,
&
group
->
b
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_decode
(
group
,
a
,
group
->
a
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_decode
(
group
,
b
,
group
->
b
,
ctx
))
goto
err
;
}
else
{
if
(
!
BN_copy
(
a
,
&
group
->
a
))
goto
err
;
if
(
!
BN_copy
(
b
,
&
group
->
b
))
goto
err
;
if
(
!
BN_copy
(
a
,
group
->
a
))
goto
err
;
if
(
!
BN_copy
(
b
,
group
->
b
))
goto
err
;
}
/* check the discriminant:
...
...
@@ -347,37 +354,44 @@ err:
int
ec_GFp_simple_point_init
(
EC_POINT
*
point
)
{
BN_init
(
&
point
->
X
);
BN_init
(
&
point
->
Y
);
BN_init
(
&
point
->
Z
);
point
->
X
=
BN_new
(
);
point
->
Y
=
BN_new
(
);
point
->
Z
=
BN_new
(
);
point
->
Z_is_one
=
0
;
if
(
!
point
->
X
||
!
point
->
Y
||
!
point
->
Z
)
{
if
(
point
->
X
)
BN_free
(
point
->
X
);
if
(
point
->
Y
)
BN_free
(
point
->
Y
);
if
(
point
->
Z
)
BN_free
(
point
->
Z
);
return
0
;
}
return
1
;
}
void
ec_GFp_simple_point_finish
(
EC_POINT
*
point
)
{
BN_free
(
&
point
->
X
);
BN_free
(
&
point
->
Y
);
BN_free
(
&
point
->
Z
);
BN_free
(
point
->
X
);
BN_free
(
point
->
Y
);
BN_free
(
point
->
Z
);
}
void
ec_GFp_simple_point_clear_finish
(
EC_POINT
*
point
)
{
BN_clear_free
(
&
point
->
X
);
BN_clear_free
(
&
point
->
Y
);
BN_clear_free
(
&
point
->
Z
);
BN_clear_free
(
point
->
X
);
BN_clear_free
(
point
->
Y
);
BN_clear_free
(
point
->
Z
);
point
->
Z_is_one
=
0
;
}
int
ec_GFp_simple_point_copy
(
EC_POINT
*
dest
,
const
EC_POINT
*
src
)
{
if
(
!
BN_copy
(
&
dest
->
X
,
&
src
->
X
))
return
0
;
if
(
!
BN_copy
(
&
dest
->
Y
,
&
src
->
Y
))
return
0
;
if
(
!
BN_copy
(
&
dest
->
Z
,
&
src
->
Z
))
return
0
;
if
(
!
BN_copy
(
dest
->
X
,
src
->
X
))
return
0
;
if
(
!
BN_copy
(
dest
->
Y
,
src
->
Y
))
return
0
;
if
(
!
BN_copy
(
dest
->
Z
,
src
->
Z
))
return
0
;
dest
->
Z_is_one
=
src
->
Z_is_one
;
return
1
;
...
...
@@ -387,7 +401,7 @@ int ec_GFp_simple_point_copy(EC_POINT *dest, const EC_POINT *src)
int
ec_GFp_simple_point_set_to_infinity
(
const
EC_GROUP
*
group
,
EC_POINT
*
point
)
{
point
->
Z_is_one
=
0
;
BN_zero
(
&
point
->
Z
);
BN_zero
(
point
->
Z
);
return
1
;
}
...
...
@@ -407,19 +421,19 @@ int ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP *group, EC_POIN
if
(
x
!=
NULL
)
{
if
(
!
BN_nnmod
(
&
point
->
X
,
x
,
&
group
->
field
,
ctx
))
goto
err
;
if
(
!
BN_nnmod
(
point
->
X
,
x
,
group
->
field
,
ctx
))
goto
err
;
if
(
group
->
meth
->
field_encode
)
{
if
(
!
group
->
meth
->
field_encode
(
group
,
&
point
->
X
,
&
point
->
X
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_encode
(
group
,
point
->
X
,
point
->
X
,
ctx
))
goto
err
;
}
}
if
(
y
!=
NULL
)
{
if
(
!
BN_nnmod
(
&
point
->
Y
,
y
,
&
group
->
field
,
ctx
))
goto
err
;
if
(
!
BN_nnmod
(
point
->
Y
,
y
,
group
->
field
,
ctx
))
goto
err
;
if
(
group
->
meth
->
field_encode
)
{
if
(
!
group
->
meth
->
field_encode
(
group
,
&
point
->
Y
,
&
point
->
Y
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_encode
(
group
,
point
->
Y
,
point
->
Y
,
ctx
))
goto
err
;
}
}
...
...
@@ -427,17 +441,17 @@ int ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP *group, EC_POIN
{
int
Z_is_one
;
if
(
!
BN_nnmod
(
&
point
->
Z
,
z
,
&
group
->
field
,
ctx
))
goto
err
;
Z_is_one
=
BN_is_one
(
&
point
->
Z
);
if
(
!
BN_nnmod
(
point
->
Z
,
z
,
group
->
field
,
ctx
))
goto
err
;
Z_is_one
=
BN_is_one
(
point
->
Z
);
if
(
group
->
meth
->
field_encode
)
{
if
(
Z_is_one
&&
(
group
->
meth
->
field_set_to_one
!=
0
))
{
if
(
!
group
->
meth
->
field_set_to_one
(
group
,
&
point
->
Z
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_set_to_one
(
group
,
point
->
Z
,
ctx
))
goto
err
;
}
else
{
if
(
!
group
->
meth
->
field_encode
(
group
,
&
point
->
Z
,
&
point
->
Z
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_encode
(
group
,
point
->
Z
,
point
->
Z
,
ctx
))
goto
err
;
}
}
point
->
Z_is_one
=
Z_is_one
;
...
...
@@ -469,30 +483,30 @@ int ec_GFp_simple_get_Jprojective_coordinates_GFp(const EC_GROUP *group, const E
if
(
x
!=
NULL
)
{
if
(
!
group
->
meth
->
field_decode
(
group
,
x
,
&
point
->
X
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_decode
(
group
,
x
,
point
->
X
,
ctx
))
goto
err
;
}
if
(
y
!=
NULL
)
{
if
(
!
group
->
meth
->
field_decode
(
group
,
y
,
&
point
->
Y
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_decode
(
group
,
y
,
point
->
Y
,
ctx
))
goto
err
;
}
if
(
z
!=
NULL
)
{
if
(
!
group
->
meth
->
field_decode
(
group
,
z
,
&
point
->
Z
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_decode
(
group
,
z
,
point
->
Z
,
ctx
))
goto
err
;
}
}
else
{
if
(
x
!=
NULL
)
{
if
(
!
BN_copy
(
x
,
&
point
->
X
))
goto
err
;
if
(
!
BN_copy
(
x
,
point
->
X
))
goto
err
;
}
if
(
y
!=
NULL
)
{
if
(
!
BN_copy
(
y
,
&
point
->
Y
))
goto
err
;
if
(
!
BN_copy
(
y
,
point
->
Y
))
goto
err
;
}
if
(
z
!=
NULL
)
{
if
(
!
BN_copy
(
z
,
&
point
->
Z
))
goto
err
;
if
(
!
BN_copy
(
z
,
point
->
Z
))
goto
err
;
}
}
...
...
@@ -551,12 +565,12 @@ int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_P
if
(
group
->
meth
->
field_decode
)
{
if
(
!
group
->
meth
->
field_decode
(
group
,
Z
,
&
point
->
Z
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_decode
(
group
,
Z
,
point
->
Z
,
ctx
))
goto
err
;
Z_
=
Z
;
}
else
{
Z_
=
&
point
->
Z
;
Z_
=
point
->
Z
;
}
if
(
BN_is_one
(
Z_
))
...
...
@@ -565,28 +579,28 @@ int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_P
{
if
(
x
!=
NULL
)
{
if
(
!
group
->
meth
->
field_decode
(
group
,
x
,
&
point
->
X
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_decode
(
group
,
x
,
point
->
X
,
ctx
))
goto
err
;
}
if
(
y
!=
NULL
)
{
if
(
!
group
->
meth
->
field_decode
(
group
,
y
,
&
point
->
Y
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_decode
(
group
,
y
,
point
->
Y
,
ctx
))
goto
err
;
}
}
else
{
if
(
x
!=
NULL
)
{
if
(
!
BN_copy
(
x
,
&
point
->
X
))
goto
err
;
if
(
!
BN_copy
(
x
,
point
->
X
))
goto
err
;
}
if
(
y
!=
NULL
)
{
if
(
!
BN_copy
(
y
,
&
point
->
Y
))
goto
err
;
if
(
!
BN_copy
(
y
,
point
->
Y
))
goto
err
;
}
}
}
else
{
if
(
!
BN_mod_inverse
(
Z_1
,
Z_
,
&
group
->
field
,
ctx
))
if
(
!
BN_mod_inverse
(
Z_1
,
Z_
,
group
->
field
,
ctx
))
{
ECerr
(
EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES
,
ERR_R_BN_LIB
);
goto
err
;
...
...
@@ -599,13 +613,13 @@ int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_P
}
else
{
if
(
!
BN_mod_sqr
(
Z_2
,
Z_1
,
&
group
->
field
,
ctx
))
goto
err
;
if
(
!
BN_mod_sqr
(
Z_2
,
Z_1
,
group
->
field
,
ctx
))
goto
err
;
}
if
(
x
!=
NULL
)
{
/* in the Montgomery case, field_mul will cancel out Montgomery factor in X: */
if
(
!
group
->
meth
->
field_mul
(
group
,
x
,
&
point
->
X
,
Z_2
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_mul
(
group
,
x
,
point
->
X
,
Z_2
,
ctx
))
goto
err
;
}
if
(
y
!=
NULL
)
...
...
@@ -617,11 +631,11 @@ int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_P
}
else
{
if
(
!
BN_mod_mul
(
Z_3
,
Z_2
,
Z_1
,
&
group
->
field
,
ctx
))
goto
err
;
if
(
!
BN_mod_mul
(
Z_3
,
Z_2
,
Z_1
,
group
->
field
,
ctx
))
goto
err
;
}
/* in the Montgomery case, field_mul will cancel out Montgomery factor in Y: */
if
(
!
group
->
meth
->
field_mul
(
group
,
y
,
&
point
->
Y
,
Z_3
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_mul
(
group
,
y
,
point
->
Y
,
Z_3
,
ctx
))
goto
err
;
}
}
...
...
@@ -652,7 +666,7 @@ int ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, con
field_mul
=
group
->
meth
->
field_mul
;
field_sqr
=
group
->
meth
->
field_sqr
;
p
=
&
group
->
field
;
p
=
group
->
field
;
if
(
ctx
==
NULL
)
{
...
...
@@ -679,38 +693,38 @@ int ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, con
/* n1, n2 */
if
(
b
->
Z_is_one
)
{
if
(
!
BN_copy
(
n1
,
&
a
->
X
))
goto
end
;
if
(
!
BN_copy
(
n2
,
&
a
->
Y
))
goto
end
;
if
(
!
BN_copy
(
n1
,
a
->
X
))
goto
end
;
if
(
!
BN_copy
(
n2
,
a
->
Y
))
goto
end
;
/* n1 = X_a */
/* n2 = Y_a */
}
else
{
if
(
!
field_sqr
(
group
,
n0
,
&
b
->
Z
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
n1
,
&
a
->
X
,
n0
,
ctx
))
goto
end
;
if
(
!
field_sqr
(
group
,
n0
,
b
->
Z
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
n1
,
a
->
X
,
n0
,
ctx
))
goto
end
;
/* n1 = X_a * Z_b^2 */
if
(
!
field_mul
(
group
,
n0
,
n0
,
&
b
->
Z
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
n2
,
&
a
->
Y
,
n0
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
n0
,
n0
,
b
->
Z
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
n2
,
a
->
Y
,
n0
,
ctx
))
goto
end
;
/* n2 = Y_a * Z_b^3 */
}
/* n3, n4 */
if
(
a
->
Z_is_one
)
{
if
(
!
BN_copy
(
n3
,
&
b
->
X
))
goto
end
;
if
(
!
BN_copy
(
n4
,
&
b
->
Y
))
goto
end
;
if
(
!
BN_copy
(
n3
,
b
->
X
))
goto
end
;
if
(
!
BN_copy
(
n4
,
b
->
Y
))
goto
end
;
/* n3 = X_b */
/* n4 = Y_b */
}
else
{
if
(
!
field_sqr
(
group
,
n0
,
&
a
->
Z
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
n3
,
&
b
->
X
,
n0
,
ctx
))
goto
end
;
if
(
!
field_sqr
(
group
,
n0
,
a
->
Z
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
n3
,
b
->
X
,
n0
,
ctx
))
goto
end
;
/* n3 = X_b * Z_a^2 */
if
(
!
field_mul
(
group
,
n0
,
n0
,
&
a
->
Z
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
n4
,
&
b
->
Y
,
n0
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
n0
,
n0
,
a
->
Z
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
n4
,
b
->
Y
,
n0
,
ctx
))
goto
end
;
/* n4 = Y_b * Z_a^3 */
}
...
...
@@ -733,7 +747,7 @@ int ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, con
else
{
/* a is the inverse of b */
BN_zero
(
&
r
->
Z
);
BN_zero
(
r
->
Z
);
r
->
Z_is_one
=
0
;
ret
=
1
;
goto
end
;
...
...
@@ -749,17 +763,17 @@ int ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, con
/* Z_r */
if
(
a
->
Z_is_one
&&
b
->
Z_is_one
)
{
if
(
!
BN_copy
(
&
r
->
Z
,
n5
))
goto
end
;
if
(
!
BN_copy
(
r
->
Z
,
n5
))
goto
end
;
}
else
{
if
(
a
->
Z_is_one
)
{
if
(
!
BN_copy
(
n0
,
&
b
->
Z
))
goto
end
;
}
{
if
(
!
BN_copy
(
n0
,
b
->
Z
))
goto
end
;
}
else
if
(
b
->
Z_is_one
)
{
if
(
!
BN_copy
(
n0
,
&
a
->
Z
))
goto
end
;
}
{
if
(
!
BN_copy
(
n0
,
a
->
Z
))
goto
end
;
}
else
{
if
(
!
field_mul
(
group
,
n0
,
&
a
->
Z
,
&
b
->
Z
,
ctx
))
goto
end
;
}
if
(
!
field_mul
(
group
,
&
r
->
Z
,
n0
,
n5
,
ctx
))
goto
end
;
{
if
(
!
field_mul
(
group
,
n0
,
a
->
Z
,
b
->
Z
,
ctx
))
goto
end
;
}
if
(
!
field_mul
(
group
,
r
->
Z
,
n0
,
n5
,
ctx
))
goto
end
;
}
r
->
Z_is_one
=
0
;
/* Z_r = Z_a * Z_b * n5 */
...
...
@@ -768,11 +782,11 @@ int ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, con
if
(
!
field_sqr
(
group
,
n0
,
n6
,
ctx
))
goto
end
;
if
(
!
field_sqr
(
group
,
n4
,
n5
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
n3
,
n1
,
n4
,
ctx
))
goto
end
;
if
(
!
BN_mod_sub_quick
(
&
r
->
X
,
n0
,
n3
,
p
))
goto
end
;
if
(
!
BN_mod_sub_quick
(
r
->
X
,
n0
,
n3
,
p
))
goto
end
;
/* X_r = n6^2 - n5^2 * 'n7' */
/* 'n9' */
if
(
!
BN_mod_lshift1_quick
(
n0
,
&
r
->
X
,
p
))
goto
end
;
if
(
!
BN_mod_lshift1_quick
(
n0
,
r
->
X
,
p
))
goto
end
;
if
(
!
BN_mod_sub_quick
(
n0
,
n3
,
n0
,
p
))
goto
end
;
/* n9 = n5^2 * 'n7' - 2 * X_r */
...
...
@@ -784,7 +798,7 @@ int ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, con
if
(
BN_is_odd
(
n0
))
if
(
!
BN_add
(
n0
,
n0
,
p
))
goto
end
;
/* now 0 <= n0 < 2*p, and n0 is even */
if
(
!
BN_rshift1
(
&
r
->
Y
,
n0
))
goto
end
;
if
(
!
BN_rshift1
(
r
->
Y
,
n0
))
goto
end
;
/* Y_r = (n6 * 'n9' - 'n8' * 'n5^3') / 2 */
ret
=
1
;
...
...
@@ -809,14 +823,14 @@ int ec_GFp_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_
if
(
EC_POINT_is_at_infinity
(
group
,
a
))
{
BN_zero
(
&
r
->
Z
);
BN_zero
(
r
->
Z
);
r
->
Z_is_one
=
0
;
return
1
;
}
field_mul
=
group
->
meth
->
field_mul
;
field_sqr
=
group
->
meth
->
field_sqr
;
p
=
&
group
->
field
;
p
=
group
->
field
;
if
(
ctx
==
NULL
)
{
...
...
@@ -840,17 +854,17 @@ int ec_GFp_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_
/* n1 */
if
(
a
->
Z_is_one
)
{
if
(
!
field_sqr
(
group
,
n0
,
&
a
->
X
,
ctx
))
goto
err
;
if
(
!
field_sqr
(
group
,
n0
,
a
->
X
,
ctx
))
goto
err
;
if
(
!
BN_mod_lshift1_quick
(
n1
,
n0
,
p
))
goto
err
;
if
(
!
BN_mod_add_quick
(
n0
,
n0
,
n1
,
p
))
goto
err
;
if
(
!
BN_mod_add_quick
(
n1
,
n0
,
&
group
->
a
,
p
))
goto
err
;
if
(
!
BN_mod_add_quick
(
n1
,
n0
,
group
->
a
,
p
))
goto
err
;
/* n1 = 3 * X_a^2 + a_curve */
}
else
if
(
group
->
a_is_minus3
)
{
if
(
!
field_sqr
(
group
,
n1
,
&
a
->
Z
,
ctx
))
goto
err
;
if
(
!
BN_mod_add_quick
(
n0
,
&
a
->
X
,
n1
,
p
))
goto
err
;
if
(
!
BN_mod_sub_quick
(
n2
,
&
a
->
X
,
n1
,
p
))
goto
err
;
if
(
!
field_sqr
(
group
,
n1
,
a
->
Z
,
ctx
))
goto
err
;
if
(
!
BN_mod_add_quick
(
n0
,
a
->
X
,
n1
,
p
))
goto
err
;
if
(
!
BN_mod_sub_quick
(
n2
,
a
->
X
,
n1
,
p
))
goto
err
;
if
(
!
field_mul
(
group
,
n1
,
n0
,
n2
,
ctx
))
goto
err
;
if
(
!
BN_mod_lshift1_quick
(
n0
,
n1
,
p
))
goto
err
;
if
(
!
BN_mod_add_quick
(
n1
,
n0
,
n1
,
p
))
goto
err
;
...
...
@@ -859,12 +873,12 @@ int ec_GFp_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_
}
else
{
if
(
!
field_sqr
(
group
,
n0
,
&
a
->
X
,
ctx
))
goto
err
;
if
(
!
field_sqr
(
group
,
n0
,
a
->
X
,
ctx
))
goto
err
;
if
(
!
BN_mod_lshift1_quick
(
n1
,
n0
,
p
))
goto
err
;
if
(
!
BN_mod_add_quick
(
n0
,
n0
,
n1
,
p
))
goto
err
;
if
(
!
field_sqr
(
group
,
n1
,
&
a
->
Z
,
ctx
))
goto
err
;
if
(
!
field_sqr
(
group
,
n1
,
a
->
Z
,
ctx
))
goto
err
;
if
(
!
field_sqr
(
group
,
n1
,
n1
,
ctx
))
goto
err
;
if
(
!
field_mul
(
group
,
n1
,
n1
,
&
group
->
a
,
ctx
))
goto
err
;
if
(
!
field_mul
(
group
,
n1
,
n1
,
group
->
a
,
ctx
))
goto
err
;
if
(
!
BN_mod_add_quick
(
n1
,
n1
,
n0
,
p
))
goto
err
;
/* n1 = 3 * X_a^2 + a_curve * Z_a^4 */
}
...
...
@@ -872,26 +886,26 @@ int ec_GFp_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_
/* Z_r */
if
(
a
->
Z_is_one
)
{
if
(
!
BN_copy
(
n0
,
&
a
->
Y
))
goto
err
;
if
(
!
BN_copy
(
n0
,
a
->
Y
))
goto
err
;
}
else
{
if
(
!
field_mul
(
group
,
n0
,
&
a
->
Y
,
&
a
->
Z
,
ctx
))
goto
err
;
if
(
!
field_mul
(
group
,
n0
,
a
->
Y
,
a
->
Z
,
ctx
))
goto
err
;
}
if
(
!
BN_mod_lshift1_quick
(
&
r
->
Z
,
n0
,
p
))
goto
err
;
if
(
!
BN_mod_lshift1_quick
(
r
->
Z
,
n0
,
p
))
goto
err
;
r
->
Z_is_one
=
0
;
/* Z_r = 2 * Y_a * Z_a */
/* n2 */
if
(
!
field_sqr
(
group
,
n3
,
&
a
->
Y
,
ctx
))
goto
err
;
if
(
!
field_mul
(
group
,
n2
,
&
a
->
X
,
n3
,
ctx
))
goto
err
;
if
(
!
field_sqr
(
group
,
n3
,
a
->
Y
,
ctx
))
goto
err
;
if
(
!
field_mul
(
group
,
n2
,
a
->
X
,
n3
,
ctx
))
goto
err
;
if
(
!
BN_mod_lshift_quick
(
n2
,
n2
,
2
,
p
))
goto
err
;
/* n2 = 4 * X_a * Y_a^2 */
/* X_r */
if
(
!
BN_mod_lshift1_quick
(
n0
,
n2
,
p
))
goto
err
;
if
(
!
field_sqr
(
group
,
&
r
->
X
,
n1
,
ctx
))
goto
err
;
if
(
!
BN_mod_sub_quick
(
&
r
->
X
,
&
r
->
X
,
n0
,
p
))
goto
err
;
if
(
!
field_sqr
(
group
,
r
->
X
,
n1
,
ctx
))
goto
err
;
if
(
!
BN_mod_sub_quick
(
r
->
X
,
r
->
X
,
n0
,
p
))
goto
err
;
/* X_r = n1^2 - 2 * n2 */
/* n3 */
...
...
@@ -900,9 +914,9 @@ int ec_GFp_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_
/* n3 = 8 * Y_a^4 */
/* Y_r */
if
(
!
BN_mod_sub_quick
(
n0
,
n2
,
&
r
->
X
,
p
))
goto
err
;
if
(
!
BN_mod_sub_quick
(
n0
,
n2
,
r
->
X
,
p
))
goto
err
;
if
(
!
field_mul
(
group
,
n0
,
n1
,
n0
,
ctx
))
goto
err
;
if
(
!
BN_mod_sub_quick
(
&
r
->
Y
,
n0
,
n3
,
p
))
goto
err
;
if
(
!
BN_mod_sub_quick
(
r
->
Y
,
n0
,
n3
,
p
))
goto
err
;
/* Y_r = n1 * (n2 - X_r) - n3 */
ret
=
1
;
...
...
@@ -917,17 +931,17 @@ int ec_GFp_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_
int
ec_GFp_simple_invert
(
const
EC_GROUP
*
group
,
EC_POINT
*
point
,
BN_CTX
*
ctx
)
{
if
(
EC_POINT_is_at_infinity
(
group
,
point
)
||
BN_is_zero
(
&
point
->
Y
))
if
(
EC_POINT_is_at_infinity
(
group
,
point
)
||
BN_is_zero
(
point
->
Y
))
/* point is its own inverse */
return
1
;
return
BN_usub
(
&
point
->
Y
,
&
group
->
field
,
&
point
->
Y
);
return
BN_usub
(
point
->
Y
,
group
->
field
,
point
->
Y
);
}
int
ec_GFp_simple_is_at_infinity
(
const
EC_GROUP
*
group
,
const
EC_POINT
*
point
)
{
return
BN_is_zero
(
&
point
->
Z
);
return
BN_is_zero
(
point
->
Z
);
}
...
...
@@ -945,7 +959,7 @@ int ec_GFp_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_C
field_mul
=
group
->
meth
->
field_mul
;
field_sqr
=
group
->
meth
->
field_sqr
;
p
=
&
group
->
field
;
p
=
group
->
field
;
if
(
ctx
==
NULL
)
{
...
...
@@ -971,11 +985,11 @@ int ec_GFp_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_C
*/
/* rh := X^2 */
if
(
!
field_sqr
(
group
,
rh
,
&
point
->
X
,
ctx
))
goto
err
;
if
(
!
field_sqr
(
group
,
rh
,
point
->
X
,
ctx
))
goto
err
;
if
(
!
point
->
Z_is_one
)
{
if
(
!
field_sqr
(
group
,
tmp
,
&
point
->
Z
,
ctx
))
goto
err
;
if
(
!
field_sqr
(
group
,
tmp
,
point
->
Z
,
ctx
))
goto
err
;
if
(
!
field_sqr
(
group
,
Z4
,
tmp
,
ctx
))
goto
err
;
if
(
!
field_mul
(
group
,
Z6
,
Z4
,
tmp
,
ctx
))
goto
err
;
...
...
@@ -985,17 +999,17 @@ int ec_GFp_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_C
if
(
!
BN_mod_lshift1_quick
(
tmp
,
Z4
,
p
))
goto
err
;
if
(
!
BN_mod_add_quick
(
tmp
,
tmp
,
Z4
,
p
))
goto
err
;
if
(
!
BN_mod_sub_quick
(
rh
,
rh
,
tmp
,
p
))
goto
err
;
if
(
!
field_mul
(
group
,
rh
,
rh
,
&
point
->
X
,
ctx
))
goto
err
;
if
(
!
field_mul
(
group
,
rh
,
rh
,
point
->
X
,
ctx
))
goto
err
;
}
else
{
if
(
!
field_mul
(
group
,
tmp
,
Z4
,
&
group
->
a
,
ctx
))
goto
err
;
if
(
!
field_mul
(
group
,
tmp
,
Z4
,
group
->
a
,
ctx
))
goto
err
;
if
(
!
BN_mod_add_quick
(
rh
,
rh
,
tmp
,
p
))
goto
err
;
if
(
!
field_mul
(
group
,
rh
,
rh
,
&
point
->
X
,
ctx
))
goto
err
;
if
(
!
field_mul
(
group
,
rh
,
rh
,
point
->
X
,
ctx
))
goto
err
;
}
/* rh := rh + b*Z^6 */
if
(
!
field_mul
(
group
,
tmp
,
&
group
->
b
,
Z6
,
ctx
))
goto
err
;
if
(
!
field_mul
(
group
,
tmp
,
group
->
b
,
Z6
,
ctx
))
goto
err
;
if
(
!
BN_mod_add_quick
(
rh
,
rh
,
tmp
,
p
))
goto
err
;
}
else
...
...
@@ -1003,14 +1017,14 @@ int ec_GFp_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_C
/* point->Z_is_one */
/* rh := (rh + a)*X */
if
(
!
BN_mod_add_quick
(
rh
,
rh
,
&
group
->
a
,
p
))
goto
err
;
if
(
!
field_mul
(
group
,
rh
,
rh
,
&
point
->
X
,
ctx
))
goto
err
;
if
(
!
BN_mod_add_quick
(
rh
,
rh
,
group
->
a
,
p
))
goto
err
;
if
(
!
field_mul
(
group
,
rh
,
rh
,
point
->
X
,
ctx
))
goto
err
;
/* rh := rh + b */
if
(
!
BN_mod_add_quick
(
rh
,
rh
,
&
group
->
b
,
p
))
goto
err
;
if
(
!
BN_mod_add_quick
(
rh
,
rh
,
group
->
b
,
p
))
goto
err
;
}
/* 'lh' := Y^2 */
if
(
!
field_sqr
(
group
,
tmp
,
&
point
->
Y
,
ctx
))
goto
err
;
if
(
!
field_sqr
(
group
,
tmp
,
point
->
Y
,
ctx
))
goto
err
;
ret
=
(
0
==
BN_ucmp
(
tmp
,
rh
));
...
...
@@ -1047,7 +1061,7 @@ int ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *
if
(
a
->
Z_is_one
&&
b
->
Z_is_one
)
{
return
((
BN_cmp
(
&
a
->
X
,
&
b
->
X
)
==
0
)
&&
BN_cmp
(
&
a
->
Y
,
&
b
->
Y
)
==
0
)
?
0
:
1
;
return
((
BN_cmp
(
a
->
X
,
b
->
X
)
==
0
)
&&
BN_cmp
(
a
->
Y
,
b
->
Y
)
==
0
)
?
0
:
1
;
}
field_mul
=
group
->
meth
->
field_mul
;
...
...
@@ -1075,20 +1089,20 @@ int ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *
if
(
!
b
->
Z_is_one
)
{
if
(
!
field_sqr
(
group
,
Zb23
,
&
b
->
Z
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
tmp1
,
&
a
->
X
,
Zb23
,
ctx
))
goto
end
;
if
(
!
field_sqr
(
group
,
Zb23
,
b
->
Z
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
tmp1
,
a
->
X
,
Zb23
,
ctx
))
goto
end
;
tmp1_
=
tmp1
;
}
else
tmp1_
=
&
a
->
X
;
tmp1_
=
a
->
X
;
if
(
!
a
->
Z_is_one
)
{
if
(
!
field_sqr
(
group
,
Za23
,
&
a
->
Z
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
tmp2
,
&
b
->
X
,
Za23
,
ctx
))
goto
end
;
if
(
!
field_sqr
(
group
,
Za23
,
a
->
Z
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
tmp2
,
b
->
X
,
Za23
,
ctx
))
goto
end
;
tmp2_
=
tmp2
;
}
else
tmp2_
=
&
b
->
X
;
tmp2_
=
b
->
X
;
/* compare X_a*Z_b^2 with X_b*Z_a^2 */
if
(
BN_cmp
(
tmp1_
,
tmp2_
)
!=
0
)
...
...
@@ -1100,20 +1114,20 @@ int ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *
if
(
!
b
->
Z_is_one
)
{
if
(
!
field_mul
(
group
,
Zb23
,
Zb23
,
&
b
->
Z
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
tmp1
,
&
a
->
Y
,
Zb23
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
Zb23
,
Zb23
,
b
->
Z
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
tmp1
,
a
->
Y
,
Zb23
,
ctx
))
goto
end
;
/* tmp1_ = tmp1 */
}
else
tmp1_
=
&
a
->
Y
;
tmp1_
=
a
->
Y
;
if
(
!
a
->
Z_is_one
)
{
if
(
!
field_mul
(
group
,
Za23
,
Za23
,
&
a
->
Z
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
tmp2
,
&
b
->
Y
,
Za23
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
Za23
,
Za23
,
a
->
Z
,
ctx
))
goto
end
;
if
(
!
field_mul
(
group
,
tmp2
,
b
->
Y
,
Za23
,
ctx
))
goto
end
;
/* tmp2_ = tmp2 */
}
else
tmp2_
=
&
b
->
Y
;
tmp2_
=
b
->
Y
;
/* compare Y_a*Z_b^3 with Y_b*Z_a^3 */
if
(
BN_cmp
(
tmp1_
,
tmp2_
)
!=
0
)
...
...
@@ -1206,9 +1220,9 @@ int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT
/* Set each prod_Z[i] to the product of points[0]->Z .. points[i]->Z,
* skipping any zero-valued inputs (pretend that they're 1). */
if
(
!
BN_is_zero
(
&
points
[
0
]
->
Z
))
if
(
!
BN_is_zero
(
points
[
0
]
->
Z
))
{
if
(
!
BN_copy
(
prod_Z
[
0
],
&
points
[
0
]
->
Z
))
goto
err
;
if
(
!
BN_copy
(
prod_Z
[
0
],
points
[
0
]
->
Z
))
goto
err
;
}
else
{
...
...
@@ -1224,9 +1238,9 @@ int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT
for
(
i
=
1
;
i
<
num
;
i
++
)
{
if
(
!
BN_is_zero
(
&
points
[
i
]
->
Z
))
if
(
!
BN_is_zero
(
points
[
i
]
->
Z
))
{
if
(
!
group
->
meth
->
field_mul
(
group
,
prod_Z
[
i
],
prod_Z
[
i
-
1
],
&
points
[
i
]
->
Z
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_mul
(
group
,
prod_Z
[
i
],
prod_Z
[
i
-
1
],
points
[
i
]
->
Z
,
ctx
))
goto
err
;
}
else
{
...
...
@@ -1237,7 +1251,7 @@ int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT
/* Now use a single explicit inversion to replace every
* non-zero points[i]->Z by its inverse. */
if
(
!
BN_mod_inverse
(
tmp
,
prod_Z
[
num
-
1
],
&
group
->
field
,
ctx
))
if
(
!
BN_mod_inverse
(
tmp
,
prod_Z
[
num
-
1
],
group
->
field
,
ctx
))
{
ECerr
(
EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE
,
ERR_R_BN_LIB
);
goto
err
;
...
...
@@ -1255,22 +1269,22 @@ int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT
{
/* Loop invariant: tmp is the product of the inverses of
* points[0]->Z .. points[i]->Z (zero-valued inputs skipped). */
if
(
!
BN_is_zero
(
&
points
[
i
]
->
Z
))
if
(
!
BN_is_zero
(
points
[
i
]
->
Z
))
{
/* Set tmp_Z to the inverse of points[i]->Z (as product
* of Z inverses 0 .. i, Z values 0 .. i - 1). */
if
(
!
group
->
meth
->
field_mul
(
group
,
tmp_Z
,
prod_Z
[
i
-
1
],
tmp
,
ctx
))
goto
err
;
/* Update tmp to satisfy the loop invariant for i - 1. */
if
(
!
group
->
meth
->
field_mul
(
group
,
tmp
,
tmp
,
&
points
[
i
]
->
Z
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_mul
(
group
,
tmp
,
tmp
,
points
[
i
]
->
Z
,
ctx
))
goto
err
;
/* Replace points[i]->Z by its inverse. */
if
(
!
BN_copy
(
&
points
[
i
]
->
Z
,
tmp_Z
))
goto
err
;
if
(
!
BN_copy
(
points
[
i
]
->
Z
,
tmp_Z
))
goto
err
;
}
}
if
(
!
BN_is_zero
(
&
points
[
0
]
->
Z
))
if
(
!
BN_is_zero
(
points
[
0
]
->
Z
))
{
/* Replace points[0]->Z by its inverse. */
if
(
!
BN_copy
(
&
points
[
0
]
->
Z
,
tmp
))
goto
err
;
if
(
!
BN_copy
(
points
[
0
]
->
Z
,
tmp
))
goto
err
;
}
/* Finally, fix up the X and Y coordinates for all points. */
...
...
@@ -1279,23 +1293,23 @@ int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT
{
EC_POINT
*
p
=
points
[
i
];
if
(
!
BN_is_zero
(
&
p
->
Z
))
if
(
!
BN_is_zero
(
p
->
Z
))
{
/* turn (X, Y, 1/Z) into (X/Z^2, Y/Z^3, 1) */
if
(
!
group
->
meth
->
field_sqr
(
group
,
tmp
,
&
p
->
Z
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_mul
(
group
,
&
p
->
X
,
&
p
->
X
,
tmp
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_sqr
(
group
,
tmp
,
p
->
Z
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_mul
(
group
,
p
->
X
,
p
->
X
,
tmp
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_mul
(
group
,
tmp
,
tmp
,
&
p
->
Z
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_mul
(
group
,
&
p
->
Y
,
&
p
->
Y
,
tmp
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_mul
(
group
,
tmp
,
tmp
,
p
->
Z
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_mul
(
group
,
p
->
Y
,
p
->
Y
,
tmp
,
ctx
))
goto
err
;
if
(
group
->
meth
->
field_set_to_one
!=
0
)
{
if
(
!
group
->
meth
->
field_set_to_one
(
group
,
&
p
->
Z
,
ctx
))
goto
err
;
if
(
!
group
->
meth
->
field_set_to_one
(
group
,
p
->
Z
,
ctx
))
goto
err
;
}
else
{
if
(
!
BN_one
(
&
p
->
Z
))
goto
err
;
if
(
!
BN_one
(
p
->
Z
))
goto
err
;
}
p
->
Z_is_one
=
1
;
}
...
...
@@ -1322,11 +1336,11 @@ int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT
int
ec_GFp_simple_field_mul
(
const
EC_GROUP
*
group
,
BIGNUM
*
r
,
const
BIGNUM
*
a
,
const
BIGNUM
*
b
,
BN_CTX
*
ctx
)
{
return
BN_mod_mul
(
r
,
a
,
b
,
&
group
->
field
,
ctx
);
return
BN_mod_mul
(
r
,
a
,
b
,
group
->
field
,
ctx
);
}
int
ec_GFp_simple_field_sqr
(
const
EC_GROUP
*
group
,
BIGNUM
*
r
,
const
BIGNUM
*
a
,
BN_CTX
*
ctx
)
{
return
BN_mod_sqr
(
r
,
a
,
&
group
->
field
,
ctx
);
return
BN_mod_sqr
(
r
,
a
,
group
->
field
,
ctx
);
}
crypto/ec/ectest.c
浏览文件 @
5784a521
...
...
@@ -667,7 +667,7 @@ static void prime_field_tests(void)
{
const
EC_POINT
*
points
[
4
];
const
BIGNUM
*
scalars
[
4
];
BIGNUM
scalar3
;
BIGNUM
*
scalar3
;
if
(
EC_POINT_is_at_infinity
(
group
,
Q
))
ABORT
;
points
[
0
]
=
Q
;
...
...
@@ -713,16 +713,17 @@ static void prime_field_tests(void)
scalars
[
1
]
=
y
;
scalars
[
2
]
=
z
;
/* z = -(x+y) */
BN_init
(
&
scalar3
);
BN_zero
(
&
scalar3
);
scalars
[
3
]
=
&
scalar3
;
scalar3
=
BN_new
();
if
(
!
scalar3
)
ABORT
;
BN_zero
(
scalar3
);
scalars
[
3
]
=
scalar3
;
if
(
!
EC_POINTs_mul
(
group
,
P
,
NULL
,
4
,
points
,
scalars
,
ctx
))
ABORT
;
if
(
!
EC_POINT_is_at_infinity
(
group
,
P
))
ABORT
;
fprintf
(
stdout
,
" ok
\n\n
"
);
BN_free
(
&
scalar3
);
BN_free
(
scalar3
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录