kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4249481a66
boringssl/crypto/fipsmodule/ec/oct.c

417 lines
12 KiB
C
Raw Normal View History

Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
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>
Add EC_POINT_point2cbb. This slightly simplifies the SSL_ECDH code and will be useful later on in reimplementing the key parsing logic. Change-Id: Ie41ea5fd3a9a734b3879b715fbf57bd991e23799 Reviewed-on: https://boringssl-review.googlesource.com/6858 Reviewed-by: Adam Langley <agl@google.com>
2015-12-31 02:39:34 +00:00
#include <openssl/bytestring.h>
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
#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) {
size_t ret;
BN_CTX *new_ctx = NULL;
int used_ctx = 0;
BIGNUM *x, *y;
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
size_t field_len, i;
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
if ((form != POINT_CONVERSION_COMPRESSED) &&
Remove ec hybrid point format According to rfc5480 and rfc4492 the hybrid format is not allowed neither in certificates or the tls protocol. Change-Id: I1d3fb5bef765bc7b58d29bdd60e15247fac4dc7a Reviewed-on: https://boringssl-review.googlesource.com/2510 Reviewed-by: Adam Langley <agl@google.com>
2014-12-08 14:41:59 +00:00
(form != POINT_CONVERSION_UNCOMPRESSED)) {
Remove the func parameter to OPENSSL_PUT_ERROR. Much of this was done automatically with find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' BUG=468039 Change-Id: I4c75fd95dff85ab1d4a546b05e6aed1aeeb499d8 Reviewed-on: https://boringssl-review.googlesource.com/5276 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 05:28:17 +01:00
OPENSSL_PUT_ERROR(EC, EC_R_INVALID_FORM);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
}
if (EC_POINT_is_at_infinity(group, point)) {
Don't encode or decode ∞. |EC_POINT_point2oct| would encode ∞, which is surprising, and |EC_POINT_oct2point| would decode ∞, which is insane. This change removes both behaviours. Thanks to Brian Smith for pointing it out. Change-Id: Ia89f257dc429a69b9ea7b7b15f75454ccc9c3bdd Reviewed-on: https://boringssl-review.googlesource.com/6488 Reviewed-by: Adam Langley <agl@google.com>
2015-11-12 20:24:35 +00:00
OPENSSL_PUT_ERROR(EC, EC_R_POINT_AT_INFINITY);
goto err;
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
}
/* ret := required output buffer length */
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 */
if (buf != NULL) {
if (len < ret) {
Remove the func parameter to OPENSSL_PUT_ERROR. Much of this was done automatically with find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' BUG=468039 Change-Id: I4c75fd95dff85ab1d4a546b05e6aed1aeeb499d8 Reviewed-on: https://boringssl-review.googlesource.com/5276 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 05:28:17 +01:00
OPENSSL_PUT_ERROR(EC, EC_R_BUFFER_TOO_SMALL);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
}
if (ctx == NULL) {
ctx = new_ctx = BN_CTX_new();
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
if (ctx == NULL) {
Don't encode or decode ∞. |EC_POINT_point2oct| would encode ∞, which is surprising, and |EC_POINT_oct2point| would decode ∞, which is insane. This change removes both behaviours. Thanks to Brian Smith for pointing it out. Change-Id: Ia89f257dc429a69b9ea7b7b15f75454ccc9c3bdd Reviewed-on: https://boringssl-review.googlesource.com/6488 Reviewed-by: Adam Langley <agl@google.com>
2015-11-12 20:24:35 +00:00
goto err;
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
}
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
}
BN_CTX_start(ctx);
used_ctx = 1;
x = BN_CTX_get(ctx);
y = BN_CTX_get(ctx);
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
if (y == NULL) {
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
}
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
if (!EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx)) {
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
}
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
Remove ec hybrid point format According to rfc5480 and rfc4492 the hybrid format is not allowed neither in certificates or the tls protocol. Change-Id: I1d3fb5bef765bc7b58d29bdd60e15247fac4dc7a Reviewed-on: https://boringssl-review.googlesource.com/2510 Reviewed-by: Adam Langley <agl@google.com>
2014-12-08 14:41:59 +00:00
if ((form == POINT_CONVERSION_COMPRESSED) &&
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
BN_is_odd(y)) {
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
buf[0] = form + 1;
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
} else {
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
buf[0] = form;
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
}
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
i = 1;
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
if (!BN_bn2bin_padded(buf + i, field_len, x)) {
Remove the func parameter to OPENSSL_PUT_ERROR. Much of this was done automatically with find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' BUG=468039 Change-Id: I4c75fd95dff85ab1d4a546b05e6aed1aeeb499d8 Reviewed-on: https://boringssl-review.googlesource.com/5276 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 05:28:17 +01:00
OPENSSL_PUT_ERROR(EC, ERR_R_INTERNAL_ERROR);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
}
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
i += field_len;
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
Remove ec hybrid point format According to rfc5480 and rfc4492 the hybrid format is not allowed neither in certificates or the tls protocol. Change-Id: I1d3fb5bef765bc7b58d29bdd60e15247fac4dc7a Reviewed-on: https://boringssl-review.googlesource.com/2510 Reviewed-by: Adam Langley <agl@google.com>
2014-12-08 14:41:59 +00:00
if (form == POINT_CONVERSION_UNCOMPRESSED) {
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
if (!BN_bn2bin_padded(buf + i, field_len, y)) {
Remove the func parameter to OPENSSL_PUT_ERROR. Much of this was done automatically with find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' BUG=468039 Change-Id: I4c75fd95dff85ab1d4a546b05e6aed1aeeb499d8 Reviewed-on: https://boringssl-review.googlesource.com/5276 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 05:28:17 +01:00
OPENSSL_PUT_ERROR(EC, ERR_R_INTERNAL_ERROR);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
}
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
i += field_len;
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
}
if (i != ret) {
Remove the func parameter to OPENSSL_PUT_ERROR. Much of this was done automatically with find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' BUG=468039 Change-Id: I4c75fd95dff85ab1d4a546b05e6aed1aeeb499d8 Reviewed-on: https://boringssl-review.googlesource.com/5276 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 05:28:17 +01:00
OPENSSL_PUT_ERROR(EC, ERR_R_INTERNAL_ERROR);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
}
}
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
if (used_ctx) {
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
BN_CTX_end(ctx);
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
}
Remove unnecessary NULL checks, part 2. Stuff in crypto/ec. Change-Id: I3bd238c365c4766ed8abc6f835a107478b43b159 Reviewed-on: https://boringssl-review.googlesource.com/4515 Reviewed-by: Adam Langley <agl@google.com>
2015-04-22 20:08:19 +01:00
BN_CTX_free(new_ctx);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
return ret;
err:
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
if (used_ctx) {
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
BN_CTX_end(ctx);
Use BN_bn2bin_padded rather than doing math to figure out leading zeros. Saves doing it ad-hoc all the time. Change-Id: Ic1a1180f56eec37c19799649bb8f18237bd617f8 Reviewed-on: https://boringssl-review.googlesource.com/2241 Reviewed-by: Adam Langley <agl@google.com>
2014-11-10 22:28:53 +00:00
}
Remove unnecessary NULL checks, part 2. Stuff in crypto/ec. Change-Id: I3bd238c365c4766ed8abc6f835a107478b43b159 Reviewed-on: https://boringssl-review.googlesource.com/4515 Reviewed-by: Adam Langley <agl@google.com>
2015-04-22 20:08:19 +01:00
BN_CTX_free(new_ctx);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
return 0;
}
static int ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
const uint8_t *buf, size_t len,
BN_CTX *ctx) {
point_conversion_form_t form;
int y_bit;
BN_CTX *new_ctx = NULL;
BIGNUM *x, *y;
size_t field_len, enc_len;
int ret = 0;
if (len == 0) {
Remove the func parameter to OPENSSL_PUT_ERROR. Much of this was done automatically with find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' BUG=468039 Change-Id: I4c75fd95dff85ab1d4a546b05e6aed1aeeb499d8 Reviewed-on: https://boringssl-review.googlesource.com/5276 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 05:28:17 +01:00
OPENSSL_PUT_ERROR(EC, EC_R_BUFFER_TOO_SMALL);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
return 0;
}
form = buf[0];
y_bit = form & 1;
form = form & ~1U;
Don't encode or decode ∞. |EC_POINT_point2oct| would encode ∞, which is surprising, and |EC_POINT_oct2point| would decode ∞, which is insane. This change removes both behaviours. Thanks to Brian Smith for pointing it out. Change-Id: Ia89f257dc429a69b9ea7b7b15f75454ccc9c3bdd Reviewed-on: https://boringssl-review.googlesource.com/6488 Reviewed-by: Adam Langley <agl@google.com>
2015-11-12 20:24:35 +00:00
if ((form != POINT_CONVERSION_COMPRESSED &&
form != POINT_CONVERSION_UNCOMPRESSED) ||
(form == POINT_CONVERSION_UNCOMPRESSED && y_bit)) {
Remove the func parameter to OPENSSL_PUT_ERROR. Much of this was done automatically with find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' BUG=468039 Change-Id: I4c75fd95dff85ab1d4a546b05e6aed1aeeb499d8 Reviewed-on: https://boringssl-review.googlesource.com/5276 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 05:28:17 +01:00
OPENSSL_PUT_ERROR(EC, EC_R_INVALID_ENCODING);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
return 0;
}
field_len = BN_num_bytes(&group->field);
enc_len =
(form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
if (len != enc_len) {
Remove the func parameter to OPENSSL_PUT_ERROR. Much of this was done automatically with find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' BUG=468039 Change-Id: I4c75fd95dff85ab1d4a546b05e6aed1aeeb499d8 Reviewed-on: https://boringssl-review.googlesource.com/5276 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 05:28:17 +01:00
OPENSSL_PUT_ERROR(EC, EC_R_INVALID_ENCODING);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
return 0;
}
if (ctx == NULL) {
ctx = new_ctx = BN_CTX_new();
Add in missing curly braces part 2. ECC code. Change-Id: I1a960620edbb30e10dcbab0e8053a1deb9db3262 Reviewed-on: https://boringssl-review.googlesource.com/3402 Reviewed-by: Adam Langley <agl@google.com>
2015-02-11 06:17:18 +00:00
if (ctx == NULL) {
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
return 0;
Add in missing curly braces part 2. ECC code. Change-Id: I1a960620edbb30e10dcbab0e8053a1deb9db3262 Reviewed-on: https://boringssl-review.googlesource.com/3402 Reviewed-by: Adam Langley <agl@google.com>
2015-02-11 06:17:18 +00:00
}
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
}
BN_CTX_start(ctx);
x = BN_CTX_get(ctx);
y = BN_CTX_get(ctx);
Improve error checking of some |BN_CTX_get| callers. The documentation for |BN_CTX_get| states: "Once |BN_CTX_get| has returned NULL, all future calls will also return NULL until |BN_CTX_end| is called." Some code takes advantage of that guarantee by only checking the return value of the last call to |BN_CTX_get| in a series of calls. That is correct and the most efficient way of doing it. However, that pattern is inconsistent with most of the other uses of |BN_CTX_get|. Also, static analysis tools like Coverity cannot understand that pattern. This commit removes the instances of that pattern that Coverity complained about when scanning *ring*. Change-Id: Ie36d0223ea1caee460c7979547cf5bfd5fb16f93 Reviewed-on: https://boringssl-review.googlesource.com/5611 Reviewed-by: Adam Langley <agl@google.com>
2015-08-06 15:42:27 +01:00
if (x == NULL || y == NULL) {
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
Add in missing curly braces part 2. ECC code. Change-Id: I1a960620edbb30e10dcbab0e8053a1deb9db3262 Reviewed-on: https://boringssl-review.googlesource.com/3402 Reviewed-by: Adam Langley <agl@google.com>
2015-02-11 06:17:18 +00:00
}
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
Add in missing curly braces part 2. ECC code. Change-Id: I1a960620edbb30e10dcbab0e8053a1deb9db3262 Reviewed-on: https://boringssl-review.googlesource.com/3402 Reviewed-by: Adam Langley <agl@google.com>
2015-02-11 06:17:18 +00:00
if (!BN_bin2bn(buf + 1, field_len, x)) {
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
Add in missing curly braces part 2. ECC code. Change-Id: I1a960620edbb30e10dcbab0e8053a1deb9db3262 Reviewed-on: https://boringssl-review.googlesource.com/3402 Reviewed-by: Adam Langley <agl@google.com>
2015-02-11 06:17:18 +00:00
}
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
if (BN_ucmp(x, &group->field) >= 0) {
Remove the func parameter to OPENSSL_PUT_ERROR. Much of this was done automatically with find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' BUG=468039 Change-Id: I4c75fd95dff85ab1d4a546b05e6aed1aeeb499d8 Reviewed-on: https://boringssl-review.googlesource.com/5276 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 05:28:17 +01:00
OPENSSL_PUT_ERROR(EC, EC_R_INVALID_ENCODING);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
}
if (form == POINT_CONVERSION_COMPRESSED) {
Add in missing curly braces part 2. ECC code. Change-Id: I1a960620edbb30e10dcbab0e8053a1deb9db3262 Reviewed-on: https://boringssl-review.googlesource.com/3402 Reviewed-by: Adam Langley <agl@google.com>
2015-02-11 06:17:18 +00:00
if (!EC_POINT_set_compressed_coordinates_GFp(group, point, x, y_bit, ctx)) {
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
Add in missing curly braces part 2. ECC code. Change-Id: I1a960620edbb30e10dcbab0e8053a1deb9db3262 Reviewed-on: https://boringssl-review.googlesource.com/3402 Reviewed-by: Adam Langley <agl@google.com>
2015-02-11 06:17:18 +00:00
}
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
} else {
Add in missing curly braces part 2. ECC code. Change-Id: I1a960620edbb30e10dcbab0e8053a1deb9db3262 Reviewed-on: https://boringssl-review.googlesource.com/3402 Reviewed-by: Adam Langley <agl@google.com>
2015-02-11 06:17:18 +00:00
if (!BN_bin2bn(buf + 1 + field_len, field_len, y)) {
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
Add in missing curly braces part 2. ECC code. Change-Id: I1a960620edbb30e10dcbab0e8053a1deb9db3262 Reviewed-on: https://boringssl-review.googlesource.com/3402 Reviewed-by: Adam Langley <agl@google.com>
2015-02-11 06:17:18 +00:00
}
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
if (BN_ucmp(y, &group->field) >= 0) {
Remove the func parameter to OPENSSL_PUT_ERROR. Much of this was done automatically with find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' BUG=468039 Change-Id: I4c75fd95dff85ab1d4a546b05e6aed1aeeb499d8 Reviewed-on: https://boringssl-review.googlesource.com/5276 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 05:28:17 +01:00
OPENSSL_PUT_ERROR(EC, EC_R_INVALID_ENCODING);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
}
Add in missing curly braces part 2. ECC code. Change-Id: I1a960620edbb30e10dcbab0e8053a1deb9db3262 Reviewed-on: https://boringssl-review.googlesource.com/3402 Reviewed-by: Adam Langley <agl@google.com>
2015-02-11 06:17:18 +00:00
if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) {
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
Add in missing curly braces part 2. ECC code. Change-Id: I1a960620edbb30e10dcbab0e8053a1deb9db3262 Reviewed-on: https://boringssl-review.googlesource.com/3402 Reviewed-by: Adam Langley <agl@google.com>
2015-02-11 06:17:18 +00:00
}
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
}
ret = 1;
err:
BN_CTX_end(ctx);
Remove unnecessary NULL checks, part 2. Stuff in crypto/ec. Change-Id: I3bd238c365c4766ed8abc6f835a107478b43b159 Reviewed-on: https://boringssl-review.googlesource.com/4515 Reviewed-by: Adam Langley <agl@google.com>
2015-04-22 20:08:19 +01:00
BN_CTX_free(new_ctx);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
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) {
if (group->meth != point->meth) {
Remove the func parameter to OPENSSL_PUT_ERROR. Much of this was done automatically with find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' BUG=468039 Change-Id: I4c75fd95dff85ab1d4a546b05e6aed1aeeb499d8 Reviewed-on: https://boringssl-review.googlesource.com/5276 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 05:28:17 +01:00
OPENSSL_PUT_ERROR(EC, EC_R_INCOMPATIBLE_OBJECTS);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
return 0;
}
Simplify |EC_METHOD| by removing invariant methods. None of these methods vary per group. Factoring these out of |EC_METHOD| should help some toolchains to do a better job optimizing the code for size. Change-Id: Ibd22a52992b4d549f12a8d22bddfdb3051aaa891 Reviewed-on: https://boringssl-review.googlesource.com/6172 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-10 01:07:47 +01:00
return ec_GFp_simple_oct2point(group, point, buf, len, ctx);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
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) {
if (group->meth != point->meth) {
Remove the func parameter to OPENSSL_PUT_ERROR. Much of this was done automatically with find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' BUG=468039 Change-Id: I4c75fd95dff85ab1d4a546b05e6aed1aeeb499d8 Reviewed-on: https://boringssl-review.googlesource.com/5276 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 05:28:17 +01:00
OPENSSL_PUT_ERROR(EC, EC_R_INCOMPATIBLE_OBJECTS);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
return 0;
}
Simplify |EC_METHOD| by removing invariant methods. None of these methods vary per group. Factoring these out of |EC_METHOD| should help some toolchains to do a better job optimizing the code for size. Change-Id: Ibd22a52992b4d549f12a8d22bddfdb3051aaa891 Reviewed-on: https://boringssl-review.googlesource.com/6172 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-10 01:07:47 +01:00
return ec_GFp_simple_point2oct(group, point, form, buf, len, ctx);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
}
Add EC_POINT_point2cbb. This slightly simplifies the SSL_ECDH code and will be useful later on in reimplementing the key parsing logic. Change-Id: Ie41ea5fd3a9a734b3879b715fbf57bd991e23799 Reviewed-on: https://boringssl-review.googlesource.com/6858 Reviewed-by: Adam Langley <agl@google.com>
2015-12-31 02:39:34 +00:00
int EC_POINT_point2cbb(CBB *out, const EC_GROUP *group, const EC_POINT *point,
point_conversion_form_t form, BN_CTX *ctx) {
size_t len = EC_POINT_point2oct(group, point, form, NULL, 0, ctx);
if (len == 0) {
return 0;
}
uint8_t *p;
return CBB_add_space(out, &p, len) &&
EC_POINT_point2oct(group, point, form, p, len, ctx) == len;
}
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
int ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group,
Require compressed x EC coordinate to be a field element. Don't try to fix a bad |x| coordinate by reducing it. Instead, just fail. This also makes the code clearer; in particular, it was confusing why |x_| was used for some calculations when it seems like |x| was just as good or better. Change-Id: I9a6911f0d2bd72852a26b46f3828eb5ba3ef924f Reviewed-on: https://boringssl-review.googlesource.com/7440 Reviewed-by: David Benjamin <davidben@google.com>
2016-03-11 02:46:15 +00:00
EC_POINT *point, const BIGNUM *x,
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
int y_bit, BN_CTX *ctx) {
Require compressed x EC coordinate to be a field element. Don't try to fix a bad |x| coordinate by reducing it. Instead, just fail. This also makes the code clearer; in particular, it was confusing why |x_| was used for some calculations when it seems like |x| was just as good or better. Change-Id: I9a6911f0d2bd72852a26b46f3828eb5ba3ef924f Reviewed-on: https://boringssl-review.googlesource.com/7440 Reviewed-by: David Benjamin <davidben@google.com>
2016-03-11 02:46:15 +00:00
if (BN_is_negative(x) || BN_cmp(x, &group->field) >= 0) {
Fix error code for unreduced x. EC_R_INVALID_COMPRESSED_POINT makes more sense than EC_R_INVALID_COMPRESSION_BIT here. Change-Id: I0dbdc91bab59843d5c04f2d0e97600fe7644753e Reviewed-on: https://boringssl-review.googlesource.com/12464 Reviewed-by: Adam Langley <agl@google.com>
2016-11-25 20:16:47 +00:00
OPENSSL_PUT_ERROR(EC, EC_R_INVALID_COMPRESSED_POINT);
Require compressed x EC coordinate to be a field element. Don't try to fix a bad |x| coordinate by reducing it. Instead, just fail. This also makes the code clearer; in particular, it was confusing why |x_| was used for some calculations when it seems like |x| was just as good or better. Change-Id: I9a6911f0d2bd72852a26b46f3828eb5ba3ef924f Reviewed-on: https://boringssl-review.googlesource.com/7440 Reviewed-by: David Benjamin <davidben@google.com>
2016-03-11 02:46:15 +00:00
return 0;
}
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
BN_CTX *new_ctx = NULL;
Require compressed x EC coordinate to be a field element. Don't try to fix a bad |x| coordinate by reducing it. Instead, just fail. This also makes the code clearer; in particular, it was confusing why |x_| was used for some calculations when it seems like |x| was just as good or better. Change-Id: I9a6911f0d2bd72852a26b46f3828eb5ba3ef924f Reviewed-on: https://boringssl-review.googlesource.com/7440 Reviewed-by: David Benjamin <davidben@google.com>
2016-03-11 02:46:15 +00:00
BIGNUM *tmp1, *tmp2, *y;
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
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);
tmp1 = BN_CTX_get(ctx);
tmp2 = BN_CTX_get(ctx);
y = BN_CTX_get(ctx);
if (y == NULL) {
goto err;
}
/* 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. */
/* tmp1 := x^3 */
if (group->meth->field_decode == 0) {
/* field_{sqr,mul} work on standard representation */
Require compressed x EC coordinate to be a field element. Don't try to fix a bad |x| coordinate by reducing it. Instead, just fail. This also makes the code clearer; in particular, it was confusing why |x_| was used for some calculations when it seems like |x| was just as good or better. Change-Id: I9a6911f0d2bd72852a26b46f3828eb5ba3ef924f Reviewed-on: https://boringssl-review.googlesource.com/7440 Reviewed-by: David Benjamin <davidben@google.com>
2016-03-11 02:46:15 +00:00
if (!group->meth->field_sqr(group, tmp2, x, ctx) ||
!group->meth->field_mul(group, tmp1, tmp2, x, ctx)) {
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
}
} else {
Require compressed x EC coordinate to be a field element. Don't try to fix a bad |x| coordinate by reducing it. Instead, just fail. This also makes the code clearer; in particular, it was confusing why |x_| was used for some calculations when it seems like |x| was just as good or better. Change-Id: I9a6911f0d2bd72852a26b46f3828eb5ba3ef924f Reviewed-on: https://boringssl-review.googlesource.com/7440 Reviewed-by: David Benjamin <davidben@google.com>
2016-03-11 02:46:15 +00:00
if (!BN_mod_sqr(tmp2, x, &group->field, ctx) ||
!BN_mod_mul(tmp1, tmp2, x, &group->field, ctx)) {
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
}
}
/* tmp1 := tmp1 + a*x */
if (group->a_is_minus3) {
if (!BN_mod_lshift1_quick(tmp2, x, &group->field) ||
!BN_mod_add_quick(tmp2, tmp2, x, &group->field) ||
!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) ||
!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 (!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) ||
!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_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();
Remove the func parameter to OPENSSL_PUT_ERROR. Much of this was done automatically with find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' BUG=468039 Change-Id: I4c75fd95dff85ab1d4a546b05e6aed1aeeb499d8 Reviewed-on: https://boringssl-review.googlesource.com/5276 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 05:28:17 +01:00
OPENSSL_PUT_ERROR(EC, EC_R_INVALID_COMPRESSED_POINT);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
} else {
Remove the func parameter to OPENSSL_PUT_ERROR. Much of this was done automatically with find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' BUG=468039 Change-Id: I4c75fd95dff85ab1d4a546b05e6aed1aeeb499d8 Reviewed-on: https://boringssl-review.googlesource.com/5276 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 05:28:17 +01:00
OPENSSL_PUT_ERROR(EC, ERR_R_BN_LIB);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
}
goto err;
}
if (y_bit != BN_is_odd(y)) {
if (BN_is_zero(y)) {
Don't compute the Kronecker symbol in ec_GFp_simple_set_compressed_coordinates. If y is zero, there is no point with odd y, so the odd bit may not be set, hence EC_R_INVALID_COMPRESSION_BIT. This code instead computed the Kronecker symbol of x and changed the error code to EC_R_INVALID_COMPRESSED_POINT if not a square. As the comment says, this was (intended to be) unreachable. But it seems x was a typo for tmp1. It dates to before upstream's 6fb60a84dd1ec81953917e0444dab50186617432, when BN_mod_sqrt gave garbage if its input was not square. Now it emits BN_R_NOT_A_SQUARE. Upstream's 48fe4d6233ac2d60745742a27f820dd88bc6689d then mapped BN_R_NOT_A_SQUARE to EC_R_INVALID_COMPRESSED_POINT. Change-Id: Id9e02fa1c154b61cc0c3a768c9cfe6bd9674c378 Reviewed-on: https://boringssl-review.googlesource.com/12463 Reviewed-by: Adam Langley <agl@google.com>
2016-11-25 19:43:22 +00:00
OPENSSL_PUT_ERROR(EC, EC_R_INVALID_COMPRESSION_BIT);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
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)) {
Remove the func parameter to OPENSSL_PUT_ERROR. Much of this was done automatically with find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' BUG=468039 Change-Id: I4c75fd95dff85ab1d4a546b05e6aed1aeeb499d8 Reviewed-on: https://boringssl-review.googlesource.com/5276 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 05:28:17 +01:00
OPENSSL_PUT_ERROR(EC, ERR_R_INTERNAL_ERROR);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
}
Add in missing curly braces part 2. ECC code. Change-Id: I1a960620edbb30e10dcbab0e8053a1deb9db3262 Reviewed-on: https://boringssl-review.googlesource.com/3402 Reviewed-by: Adam Langley <agl@google.com>
2015-02-11 06:17:18 +00:00
if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) {
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
goto err;
Add in missing curly braces part 2. ECC code. Change-Id: I1a960620edbb30e10dcbab0e8053a1deb9db3262 Reviewed-on: https://boringssl-review.googlesource.com/3402 Reviewed-by: Adam Langley <agl@google.com>
2015-02-11 06:17:18 +00:00
}
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
ret = 1;
err:
BN_CTX_end(ctx);
Remove unnecessary NULL checks, part 2. Stuff in crypto/ec. Change-Id: I3bd238c365c4766ed8abc6f835a107478b43b159 Reviewed-on: https://boringssl-review.googlesource.com/4515 Reviewed-by: Adam Langley <agl@google.com>
2015-04-22 20:08:19 +01:00
BN_CTX_free(new_ctx);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
return ret;
}
int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,
EC_POINT *point, const BIGNUM *x,
int y_bit, BN_CTX *ctx) {
if (group->meth != point->meth) {
Remove the func parameter to OPENSSL_PUT_ERROR. Much of this was done automatically with find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' find . -name '*.c' | xargs sed -E -i '' -e 's/(OPENSSL_PUT_ERROR\([a-zA-Z_0-9]+, )[a-zA-Z_0-9]+, ([a-zA-Z_0-9]+\);)/\1\2/' BUG=468039 Change-Id: I4c75fd95dff85ab1d4a546b05e6aed1aeeb499d8 Reviewed-on: https://boringssl-review.googlesource.com/5276 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 05:28:17 +01:00
OPENSSL_PUT_ERROR(EC, EC_R_INCOMPATIBLE_OBJECTS);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
return 0;
}
Simplify |EC_METHOD| by removing invariant methods. None of these methods vary per group. Factoring these out of |EC_METHOD| should help some toolchains to do a better job optimizing the code for size. Change-Id: Ibd22a52992b4d549f12a8d22bddfdb3051aaa891 Reviewed-on: https://boringssl-review.googlesource.com/6172 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-10 01:07:47 +01:00
return ec_GFp_simple_set_compressed_coordinates(group, point, x, y_bit, ctx);
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
}
Reference in New Issue Copy Permalink