diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2021-03-30 10:42:03 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2021-03-30 10:42:03 +0900 |
| commit | 45e88b8ec6dfbd8f981ca89ded80ef48eca6f0e9 (patch) | |
| tree | 8eccdaf9957c4c605e03ca927ce565f075ee9c87 /src/visibility.c | |
| parent | 68bb0ddc5504c9c0f3f52259a4085bb2fc1a02ad (diff) | |
| download | libgcrypt-45e88b8ec6dfbd8f981ca89ded80ef48eca6f0e9.tar.gz | |
ecc: Fix the regression of gcry_mpi_ec_add.
* mpi/ec.c (_gcry_mpi_ec_point_resize): Export the routine
for internal use.
(add_points_edwards, _gcry_mpi_ec_mul_point): Use mpi_point_resize.
* src/gcrypt-int.h (_gcry_mpi_ec_point_resize): Declare.
* src/visibility.c (gcry_mpi_ec_dup, gcry_mpi_ec_add): Make sure for
the size of limb before calling the internal functions.
(gcry_mpi_ec_sub): Likewise.
--
GnuPG-bug-id: 5372
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'src/visibility.c')
| -rw-r--r-- | src/visibility.c | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/src/visibility.c b/src/visibility.c index 8cda962c..b94b1fe9 100644 --- a/src/visibility.c +++ b/src/visibility.c @@ -26,6 +26,7 @@ #include "cipher-proto.h" #include "context.h" #include "mpi.h" +#include "ec-context.h" const char * gcry_strerror (gcry_error_t err) @@ -570,23 +571,47 @@ gcry_mpi_ec_get_affine (gcry_mpi_t x, gcry_mpi_t y, gcry_mpi_point_t point, void gcry_mpi_ec_dup (gcry_mpi_point_t w, gcry_mpi_point_t u, gcry_ctx_t ctx) { - _gcry_mpi_ec_dup_point (w, u, _gcry_ctx_get_pointer (ctx, CONTEXT_TYPE_EC)); + mpi_ec_t ec = _gcry_ctx_get_pointer (ctx, CONTEXT_TYPE_EC); + + if (ec->model == MPI_EC_EDWARDS || ec->model == MPI_EC_MONTGOMERY) + { + mpi_point_resize (w, ec); + mpi_point_resize (u, ec); + } + + _gcry_mpi_ec_dup_point (w, u, ec); } void gcry_mpi_ec_add (gcry_mpi_point_t w, gcry_mpi_point_t u, gcry_mpi_point_t v, gcry_ctx_t ctx) { - _gcry_mpi_ec_add_points (w, u, v, - _gcry_ctx_get_pointer (ctx, CONTEXT_TYPE_EC)); + mpi_ec_t ec = _gcry_ctx_get_pointer (ctx, CONTEXT_TYPE_EC); + + if (ec->model == MPI_EC_EDWARDS || ec->model == MPI_EC_MONTGOMERY) + { + mpi_point_resize (w, ec); + mpi_point_resize (u, ec); + mpi_point_resize (v, ec); + } + + _gcry_mpi_ec_add_points (w, u, v, ec); } void gcry_mpi_ec_sub (gcry_mpi_point_t w, gcry_mpi_point_t u, gcry_mpi_point_t v, gcry_ctx_t ctx) { - _gcry_mpi_ec_sub_points (w, u, v, - _gcry_ctx_get_pointer (ctx, CONTEXT_TYPE_EC)); + mpi_ec_t ec = _gcry_ctx_get_pointer (ctx, CONTEXT_TYPE_EC); + + if (ec->model == MPI_EC_EDWARDS || ec->model == MPI_EC_MONTGOMERY) + { + mpi_point_resize (w, ec); + mpi_point_resize (u, ec); + mpi_point_resize (v, ec); + } + + _gcry_mpi_ec_sub_points (w, u, v, ec); } void |