2014-06-20 20:00:00 +01:00
|
|
|
/* Originally written by Bodo Moeller for the OpenSSL project.
|
|
|
|
* ====================================================================
|
|
|
|
* Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
*
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
*
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in
|
|
|
|
* the documentation and/or other materials provided with the
|
|
|
|
* distribution.
|
|
|
|
*
|
|
|
|
* 3. All advertising materials mentioning features or use of this
|
|
|
|
* software must display the following acknowledgment:
|
|
|
|
* "This product includes software developed by the OpenSSL Project
|
|
|
|
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
|
|
|
|
*
|
|
|
|
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
|
|
|
* endorse or promote products derived from this software without
|
|
|
|
* prior written permission. For written permission, please contact
|
|
|
|
* openssl-core@openssl.org.
|
|
|
|
*
|
|
|
|
* 5. Products derived from this software may not be called "OpenSSL"
|
|
|
|
* nor may "OpenSSL" appear in their names without prior written
|
|
|
|
* permission of the OpenSSL Project.
|
|
|
|
*
|
|
|
|
* 6. Redistributions of any form whatsoever must retain the following
|
|
|
|
* acknowledgment:
|
|
|
|
* "This product includes software developed by the OpenSSL Project
|
|
|
|
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
|
|
|
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
|
|
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
|
|
|
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
|
|
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
|
|
|
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
* ====================================================================
|
|
|
|
*
|
|
|
|
* This product includes cryptographic software written by Eric Young
|
|
|
|
* (eay@cryptsoft.com). This product includes software written by Tim
|
|
|
|
* Hudson (tjh@cryptsoft.com).
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
/* ====================================================================
|
|
|
|
* Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
|
|
|
|
*
|
|
|
|
* Portions of the attached software ("Contribution") are developed by
|
|
|
|
* SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
|
|
|
|
*
|
|
|
|
* The Contribution is licensed pursuant to the OpenSSL open source
|
|
|
|
* license provided above.
|
|
|
|
*
|
|
|
|
* The elliptic curve binary polynomial software is originally written by
|
|
|
|
* Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems
|
|
|
|
* Laboratories. */
|
|
|
|
|
|
|
|
#include <openssl/ec.h>
|
|
|
|
|
|
|
|
#include <openssl/bn.h>
|
|
|
|
#include <openssl/err.h>
|
|
|
|
|
|
|
|
#include "internal.h"
|
|
|
|
|
|
|
|
|
|
|
|
static size_t ec_GFp_simple_point2oct(const EC_GROUP *group,
|
|
|
|
const EC_POINT *point,
|
|
|
|
point_conversion_form_t form,
|
|
|
|
uint8_t *buf, size_t len, BN_CTX *ctx) {
|
2018-02-04 19:23:22 +00:00
|
|
|
size_t ret = 0;
|
2014-06-20 20:00:00 +01:00
|
|
|
BN_CTX *new_ctx = NULL;
|
|
|
|
int used_ctx = 0;
|
|
|
|
|
|
|
|
if ((form != POINT_CONVERSION_COMPRESSED) &&
|
2014-12-08 14:41:59 +00:00
|
|
|
(form != POINT_CONVERSION_UNCOMPRESSED)) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(EC, EC_R_INVALID_FORM);
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (EC_POINT_is_at_infinity(group, point)) {
|
2015-11-12 20:24:35 +00:00
|
|
|
OPENSSL_PUT_ERROR(EC, EC_R_POINT_AT_INFINITY);
|
|
|
|
goto err;
|
2014-06-20 20:00:00 +01:00
|
|
|
}
|
|
|
|
|
2018-02-04 19:23:22 +00:00
|
|
|
const size_t field_len = BN_num_bytes(&group->field);
|
|
|
|
size_t output_len = 1 /* type byte */ + field_len;
|
|
|
|
if (form == POINT_CONVERSION_UNCOMPRESSED) {
|
|
|
|
// Uncompressed points have a second coordinate.
|
|
|
|
output_len += field_len;
|
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2017-08-18 19:06:02 +01:00
|
|
|
// if 'buf' is NULL, just return required length
|
2014-06-20 20:00:00 +01:00
|
|
|
if (buf != NULL) {
|
2018-02-04 19:23:22 +00:00
|
|
|
if (len < output_len) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(EC, EC_R_BUFFER_TOO_SMALL);
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ctx == NULL) {
|
|
|
|
ctx = new_ctx = BN_CTX_new();
|
2014-11-10 22:28:53 +00:00
|
|
|
if (ctx == NULL) {
|
2015-11-12 20:24:35 +00:00
|
|
|
goto err;
|
2014-11-10 22:28:53 +00:00
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
BN_CTX_start(ctx);
|
|
|
|
used_ctx = 1;
|
2018-02-04 19:23:22 +00:00
|
|
|
BIGNUM *x = BN_CTX_get(ctx);
|
|
|
|
BIGNUM *y = BN_CTX_get(ctx);
|
2014-11-10 22:28:53 +00:00
|
|
|
if (y == NULL) {
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
2014-11-10 22:28:53 +00:00
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2014-11-10 22:28:53 +00:00
|
|
|
if (!EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx)) {
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
2014-11-10 22:28:53 +00:00
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2014-12-08 14:41:59 +00:00
|
|
|
if ((form == POINT_CONVERSION_COMPRESSED) &&
|
2014-11-10 22:28:53 +00:00
|
|
|
BN_is_odd(y)) {
|
2014-06-20 20:00:00 +01:00
|
|
|
buf[0] = form + 1;
|
2014-11-10 22:28:53 +00:00
|
|
|
} else {
|
2014-06-20 20:00:00 +01:00
|
|
|
buf[0] = form;
|
2014-11-10 22:28:53 +00:00
|
|
|
}
|
2018-02-04 19:23:22 +00:00
|
|
|
size_t i = 1;
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2014-11-10 22:28:53 +00:00
|
|
|
if (!BN_bn2bin_padded(buf + i, field_len, x)) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(EC, ERR_R_INTERNAL_ERROR);
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
|
|
|
}
|
2014-11-10 22:28:53 +00:00
|
|
|
i += field_len;
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2014-12-08 14:41:59 +00:00
|
|
|
if (form == POINT_CONVERSION_UNCOMPRESSED) {
|
2014-11-10 22:28:53 +00:00
|
|
|
if (!BN_bn2bin_padded(buf + i, field_len, y)) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(EC, ERR_R_INTERNAL_ERROR);
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
|
|
|
}
|
2014-11-10 22:28:53 +00:00
|
|
|
i += field_len;
|
2014-06-20 20:00:00 +01:00
|
|
|
}
|
|
|
|
|
2018-02-04 19:23:22 +00:00
|
|
|
if (i != output_len) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(EC, ERR_R_INTERNAL_ERROR);
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-02-04 19:23:22 +00:00
|
|
|
ret = output_len;
|
2014-06-20 20:00:00 +01:00
|
|
|
|
|
|
|
err:
|
2014-11-10 22:28:53 +00:00
|
|
|
if (used_ctx) {
|
2014-06-20 20:00:00 +01:00
|
|
|
BN_CTX_end(ctx);
|
2014-11-10 22:28:53 +00:00
|
|
|
}
|
2015-04-22 20:08:19 +01:00
|
|
|
BN_CTX_free(new_ctx);
|
2018-02-04 19:23:22 +00:00
|
|
|
return ret;
|
2014-06-20 20:00:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static int ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
|
|
|
|
const uint8_t *buf, size_t len,
|
|
|
|
BN_CTX *ctx) {
|
|
|
|
BN_CTX *new_ctx = NULL;
|
2018-02-04 19:23:22 +00:00
|
|
|
int ret = 0, used_ctx = 0;
|
2014-06-20 20:00:00 +01:00
|
|
|
|
|
|
|
if (len == 0) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(EC, EC_R_BUFFER_TOO_SMALL);
|
2018-02-04 19:23:22 +00:00
|
|
|
goto err;
|
2014-06-20 20:00:00 +01:00
|
|
|
}
|
2018-02-04 19:23:22 +00:00
|
|
|
|
|
|
|
point_conversion_form_t form = buf[0];
|
|
|
|
const int y_bit = form & 1;
|
2014-06-20 20:00:00 +01:00
|
|
|
form = form & ~1U;
|
2015-11-12 20:24:35 +00:00
|
|
|
if ((form != POINT_CONVERSION_COMPRESSED &&
|
|
|
|
form != POINT_CONVERSION_UNCOMPRESSED) ||
|
|
|
|
(form == POINT_CONVERSION_UNCOMPRESSED && y_bit)) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(EC, EC_R_INVALID_ENCODING);
|
2018-02-04 19:23:22 +00:00
|
|
|
goto err;
|
2014-06-20 20:00:00 +01:00
|
|
|
}
|
|
|
|
|
2018-02-04 19:23:22 +00:00
|
|
|
const size_t field_len = BN_num_bytes(&group->field);
|
|
|
|
size_t enc_len = 1 /* type byte */ + field_len;
|
|
|
|
if (form == POINT_CONVERSION_UNCOMPRESSED) {
|
|
|
|
// Uncompressed points have a second coordinate.
|
|
|
|
enc_len += field_len;
|
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
|
|
|
|
if (len != enc_len) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(EC, EC_R_INVALID_ENCODING);
|
2018-02-04 19:23:22 +00:00
|
|
|
goto err;
|
2014-06-20 20:00:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (ctx == NULL) {
|
|
|
|
ctx = new_ctx = BN_CTX_new();
|
2015-02-11 06:17:18 +00:00
|
|
|
if (ctx == NULL) {
|
2018-02-04 19:23:22 +00:00
|
|
|
goto err;
|
2015-02-11 06:17:18 +00:00
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
BN_CTX_start(ctx);
|
2018-02-04 19:23:22 +00:00
|
|
|
used_ctx = 1;
|
|
|
|
BIGNUM *x = BN_CTX_get(ctx);
|
|
|
|
BIGNUM *y = BN_CTX_get(ctx);
|
2015-08-06 15:42:27 +01:00
|
|
|
if (x == NULL || y == NULL) {
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
2015-02-11 06:17:18 +00:00
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2015-02-11 06:17:18 +00:00
|
|
|
if (!BN_bin2bn(buf + 1, field_len, x)) {
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
2015-02-11 06:17:18 +00:00
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
if (BN_ucmp(x, &group->field) >= 0) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(EC, EC_R_INVALID_ENCODING);
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (form == POINT_CONVERSION_COMPRESSED) {
|
2015-02-11 06:17:18 +00:00
|
|
|
if (!EC_POINT_set_compressed_coordinates_GFp(group, point, x, y_bit, ctx)) {
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
2015-02-11 06:17:18 +00:00
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
} else {
|
2015-02-11 06:17:18 +00:00
|
|
|
if (!BN_bin2bn(buf + 1 + field_len, field_len, y)) {
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
2015-02-11 06:17:18 +00:00
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
if (BN_ucmp(y, &group->field) >= 0) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(EC, EC_R_INVALID_ENCODING);
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2015-02-11 06:17:18 +00:00
|
|
|
if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) {
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
2015-02-11 06:17:18 +00:00
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
ret = 1;
|
|
|
|
|
|
|
|
err:
|
2018-02-04 19:23:22 +00:00
|
|
|
if (used_ctx) {
|
|
|
|
BN_CTX_end(ctx);
|
|
|
|
}
|
2015-04-22 20:08:19 +01:00
|
|
|
BN_CTX_free(new_ctx);
|
2014-06-20 20:00:00 +01:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *point,
|
|
|
|
const uint8_t *buf, size_t len, BN_CTX *ctx) {
|
2017-10-26 20:48:18 +01:00
|
|
|
if (EC_GROUP_cmp(group, point->group, NULL) != 0) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(EC, EC_R_INCOMPATIBLE_OBJECTS);
|
2014-06-20 20:00:00 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2015-10-10 01:07:47 +01:00
|
|
|
return ec_GFp_simple_oct2point(group, point, buf, len, ctx);
|
2014-06-20 20:00:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point,
|
|
|
|
point_conversion_form_t form, uint8_t *buf,
|
|
|
|
size_t len, BN_CTX *ctx) {
|
2017-10-26 20:48:18 +01:00
|
|
|
if (EC_GROUP_cmp(group, point->group, NULL) != 0) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(EC, EC_R_INCOMPATIBLE_OBJECTS);
|
2014-06-20 20:00:00 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2015-10-10 01:07:47 +01:00
|
|
|
return ec_GFp_simple_point2oct(group, point, form, buf, len, ctx);
|
2014-06-20 20:00:00 +01:00
|
|
|
}
|
|
|
|
|
2017-12-25 15:10:43 +00:00
|
|
|
int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,
|
|
|
|
EC_POINT *point, const BIGNUM *x,
|
|
|
|
int y_bit, BN_CTX *ctx) {
|
|
|
|
if (EC_GROUP_cmp(group, point->group, NULL) != 0) {
|
|
|
|
OPENSSL_PUT_ERROR(EC, EC_R_INCOMPATIBLE_OBJECTS);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-03-11 02:46:15 +00:00
|
|
|
if (BN_is_negative(x) || BN_cmp(x, &group->field) >= 0) {
|
2016-11-25 20:16:47 +00:00
|
|
|
OPENSSL_PUT_ERROR(EC, EC_R_INVALID_COMPRESSED_POINT);
|
2016-03-11 02:46:15 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-06-20 20:00:00 +01:00
|
|
|
BN_CTX *new_ctx = NULL;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
ERR_clear_error();
|
|
|
|
|
|
|
|
if (ctx == NULL) {
|
|
|
|
ctx = new_ctx = BN_CTX_new();
|
|
|
|
if (ctx == NULL) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
y_bit = (y_bit != 0);
|
|
|
|
|
|
|
|
BN_CTX_start(ctx);
|
2017-12-25 15:10:43 +00:00
|
|
|
BIGNUM *tmp1 = BN_CTX_get(ctx);
|
|
|
|
BIGNUM *tmp2 = BN_CTX_get(ctx);
|
|
|
|
BIGNUM *a = BN_CTX_get(ctx);
|
|
|
|
BIGNUM *b = BN_CTX_get(ctx);
|
|
|
|
BIGNUM *y = BN_CTX_get(ctx);
|
|
|
|
if (y == NULL ||
|
|
|
|
!EC_GROUP_get_curve_GFp(group, NULL, a, b, ctx)) {
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2017-08-18 19:06:02 +01:00
|
|
|
// Recover y. We have a Weierstrass equation
|
|
|
|
// y^2 = x^3 + a*x + b,
|
|
|
|
// so y is one of the square roots of x^3 + a*x + b.
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2017-08-18 19:06:02 +01:00
|
|
|
// tmp1 := x^3
|
2017-12-25 15:10:43 +00:00
|
|
|
if (!BN_mod_sqr(tmp2, x, &group->field, ctx) ||
|
|
|
|
!BN_mod_mul(tmp1, tmp2, x, &group->field, ctx)) {
|
|
|
|
goto err;
|
2014-06-20 20:00:00 +01:00
|
|
|
}
|
|
|
|
|
2017-08-18 19:06:02 +01:00
|
|
|
// tmp1 := tmp1 + a*x
|
2014-06-20 20:00:00 +01:00
|
|
|
if (group->a_is_minus3) {
|
Make BN_mod_*_quick constant-time.
As the EC code will ultimately want to use these in "words" form by way
of EC_FELEM, and because it's much easier, I've implement these as
low-level words-based functions that require all inputs have the same
width. The BIGNUM versions which RSA and, for now, EC calls are
implemented on top of that.
Unfortunately, doing such things in constant-time and accounting for
undersized inputs requires some scratch space, and these functions don't
take BN_CTX. So I've added internal bn_mod_*_quick_ctx functions that
take a BN_CTX and the old functions now allocate a bit unnecessarily.
RSA only needs lshift (for BN_MONT_CTX) and sub (for CRT), but the
generic EC code wants add as well.
The generic EC code isn't even remotely constant-time, and I hope to
ultimately use stack-allocated EC_FELEMs, so I've made the actual
implementations here implemented in "words", which is much simpler
anyway due to not having to take care of widths.
I've also gone ahead and switched the EC code to these functions,
largely as a test of their performance (an earlier iteration made the EC
code noticeably slower). These operations are otherwise not
performance-critical in RSA.
The conversion from BIGNUM to BIGNUM+BN_CTX should be dropped by the
static linker already, and the unused BIGNUM+BN_CTX functions will fall
off when EC_FELEM happens.
Update-Note: BN_mod_*_quick bounce on malloc a bit now, but they're not
really used externally. The one caller I found was wpa_supplicant
which bounces on malloc already. They appear to be implementing
compressed coordinates by hand? We may be able to convince them to
call EC_POINT_set_compressed_coordinates_GFp.
Bug: 233, 236
Change-Id: I2bf361e9c089e0211b97d95523dbc06f1168e12b
Reviewed-on: https://boringssl-review.googlesource.com/25261
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
2018-01-24 20:29:00 +00:00
|
|
|
if (!bn_mod_lshift1_quick_ctx(tmp2, x, &group->field, ctx) ||
|
|
|
|
!bn_mod_add_quick_ctx(tmp2, tmp2, x, &group->field, ctx) ||
|
|
|
|
!bn_mod_sub_quick_ctx(tmp1, tmp1, tmp2, &group->field, ctx)) {
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
} else {
|
2017-12-25 15:10:43 +00:00
|
|
|
if (!BN_mod_mul(tmp2, a, x, &group->field, ctx) ||
|
Make BN_mod_*_quick constant-time.
As the EC code will ultimately want to use these in "words" form by way
of EC_FELEM, and because it's much easier, I've implement these as
low-level words-based functions that require all inputs have the same
width. The BIGNUM versions which RSA and, for now, EC calls are
implemented on top of that.
Unfortunately, doing such things in constant-time and accounting for
undersized inputs requires some scratch space, and these functions don't
take BN_CTX. So I've added internal bn_mod_*_quick_ctx functions that
take a BN_CTX and the old functions now allocate a bit unnecessarily.
RSA only needs lshift (for BN_MONT_CTX) and sub (for CRT), but the
generic EC code wants add as well.
The generic EC code isn't even remotely constant-time, and I hope to
ultimately use stack-allocated EC_FELEMs, so I've made the actual
implementations here implemented in "words", which is much simpler
anyway due to not having to take care of widths.
I've also gone ahead and switched the EC code to these functions,
largely as a test of their performance (an earlier iteration made the EC
code noticeably slower). These operations are otherwise not
performance-critical in RSA.
The conversion from BIGNUM to BIGNUM+BN_CTX should be dropped by the
static linker already, and the unused BIGNUM+BN_CTX functions will fall
off when EC_FELEM happens.
Update-Note: BN_mod_*_quick bounce on malloc a bit now, but they're not
really used externally. The one caller I found was wpa_supplicant
which bounces on malloc already. They appear to be implementing
compressed coordinates by hand? We may be able to convince them to
call EC_POINT_set_compressed_coordinates_GFp.
Bug: 233, 236
Change-Id: I2bf361e9c089e0211b97d95523dbc06f1168e12b
Reviewed-on: https://boringssl-review.googlesource.com/25261
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
2018-01-24 20:29:00 +00:00
|
|
|
!bn_mod_add_quick_ctx(tmp1, tmp1, tmp2, &group->field, ctx)) {
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-18 19:06:02 +01:00
|
|
|
// tmp1 := tmp1 + b
|
Make BN_mod_*_quick constant-time.
As the EC code will ultimately want to use these in "words" form by way
of EC_FELEM, and because it's much easier, I've implement these as
low-level words-based functions that require all inputs have the same
width. The BIGNUM versions which RSA and, for now, EC calls are
implemented on top of that.
Unfortunately, doing such things in constant-time and accounting for
undersized inputs requires some scratch space, and these functions don't
take BN_CTX. So I've added internal bn_mod_*_quick_ctx functions that
take a BN_CTX and the old functions now allocate a bit unnecessarily.
RSA only needs lshift (for BN_MONT_CTX) and sub (for CRT), but the
generic EC code wants add as well.
The generic EC code isn't even remotely constant-time, and I hope to
ultimately use stack-allocated EC_FELEMs, so I've made the actual
implementations here implemented in "words", which is much simpler
anyway due to not having to take care of widths.
I've also gone ahead and switched the EC code to these functions,
largely as a test of their performance (an earlier iteration made the EC
code noticeably slower). These operations are otherwise not
performance-critical in RSA.
The conversion from BIGNUM to BIGNUM+BN_CTX should be dropped by the
static linker already, and the unused BIGNUM+BN_CTX functions will fall
off when EC_FELEM happens.
Update-Note: BN_mod_*_quick bounce on malloc a bit now, but they're not
really used externally. The one caller I found was wpa_supplicant
which bounces on malloc already. They appear to be implementing
compressed coordinates by hand? We may be able to convince them to
call EC_POINT_set_compressed_coordinates_GFp.
Bug: 233, 236
Change-Id: I2bf361e9c089e0211b97d95523dbc06f1168e12b
Reviewed-on: https://boringssl-review.googlesource.com/25261
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
2018-01-24 20:29:00 +00:00
|
|
|
if (!bn_mod_add_quick_ctx(tmp1, tmp1, b, &group->field, ctx)) {
|
2017-12-25 15:10:43 +00:00
|
|
|
goto err;
|
2014-06-20 20:00:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!BN_mod_sqrt(y, tmp1, &group->field, ctx)) {
|
|
|
|
unsigned long err = ERR_peek_last_error();
|
|
|
|
|
|
|
|
if (ERR_GET_LIB(err) == ERR_LIB_BN &&
|
|
|
|
ERR_GET_REASON(err) == BN_R_NOT_A_SQUARE) {
|
|
|
|
ERR_clear_error();
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(EC, EC_R_INVALID_COMPRESSED_POINT);
|
2014-06-20 20:00:00 +01:00
|
|
|
} else {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(EC, ERR_R_BN_LIB);
|
2014-06-20 20:00:00 +01:00
|
|
|
}
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (y_bit != BN_is_odd(y)) {
|
|
|
|
if (BN_is_zero(y)) {
|
2016-11-25 19:43:22 +00:00
|
|
|
OPENSSL_PUT_ERROR(EC, EC_R_INVALID_COMPRESSION_BIT);
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (!BN_usub(y, &group->field, y)) {
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (y_bit != BN_is_odd(y)) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(EC, ERR_R_INTERNAL_ERROR);
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2015-02-11 06:17:18 +00:00
|
|
|
if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) {
|
2014-06-20 20:00:00 +01:00
|
|
|
goto err;
|
2015-02-11 06:17:18 +00:00
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
|
|
|
|
ret = 1;
|
|
|
|
|
|
|
|
err:
|
|
|
|
BN_CTX_end(ctx);
|
2015-04-22 20:08:19 +01:00
|
|
|
BN_CTX_free(new_ctx);
|
2014-06-20 20:00:00 +01:00
|
|
|
return ret;
|
|
|
|
}
|