diff options
| author | Pete Bentley <prb@google.com> | 2019-08-08 12:52:37 +0100 |
|---|---|---|
| committer | Pete Bentley <prb@google.com> | 2019-08-08 14:43:20 +0100 |
| commit | f8d8b73da16aa9f2fdda401a46b4f86a83016712 (patch) | |
| tree | 3725c3e206175c177a448c50d41ad2c2589a07fa /src/crypto/fipsmodule/ec/ec_key.c | |
| parent | cb6fdd2c554b117ce1100249a0f8a91519782c12 (diff) | |
| download | boringssl-f8d8b73da16aa9f2fdda401a46b4f86a83016712.tar.gz | |
external/boringssl: Sync to 81080a729af568f7b5fde92b9170cc17065027c9.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/c9827e073f64e353c4891ecc2c73721882543ee0..81080a729af568f7b5fde92b9170cc17065027c9
Bug: 134581881
Test: atest CtsLibcoreTestCases
Test: atest CtsLibcoreOkHttpTestCases
Change-Id: Id3a510c9724554a28b6514b892bd15dde305855c
Diffstat (limited to 'src/crypto/fipsmodule/ec/ec_key.c')
| -rw-r--r-- | src/crypto/fipsmodule/ec/ec_key.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/crypto/fipsmodule/ec/ec_key.c b/src/crypto/fipsmodule/ec/ec_key.c index 3ef17d99..3851c198 100644 --- a/src/crypto/fipsmodule/ec/ec_key.c +++ b/src/crypto/fipsmodule/ec/ec_key.c @@ -322,8 +322,8 @@ int EC_KEY_check_key(const EC_KEY *eckey) { if (eckey->priv_key != NULL) { point = EC_POINT_new(eckey->group); if (point == NULL || - !ec_point_mul_scalar(eckey->group, &point->raw, - &eckey->priv_key->scalar, NULL, NULL)) { + !ec_point_mul_scalar_base(eckey->group, &point->raw, + &eckey->priv_key->scalar)) { OPENSSL_PUT_ERROR(EC, ERR_R_EC_LIB); goto err; } @@ -440,8 +440,7 @@ int EC_KEY_generate_key(EC_KEY *key) { // Generate the private key by testing candidates (FIPS 186-4 B.4.2). !ec_random_nonzero_scalar(key->group, &priv_key->scalar, kDefaultAdditionalData) || - !ec_point_mul_scalar(key->group, &pub_key->raw, &priv_key->scalar, NULL, - NULL)) { + !ec_point_mul_scalar_base(key->group, &pub_key->raw, &priv_key->scalar)) { EC_POINT_free(pub_key); ec_wrapped_scalar_free(priv_key); return 0; |