external/boringssl: Sync to c3889634a1aa52575c5d26497696238208fbd0f5.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/41c10e2b5f37edce8b9f292f7f3bacb7e30e25c4..c3889634a1aa52575c5d26497696238208fbd0f5
Test: atest CtsLibcoreTestCases
Change-Id: Ia1c2941ccf58a9e0d736b3409a2d13c21603a205
diff --git a/src/ssl/ssl_key_share.cc b/src/ssl/ssl_key_share.cc
index 108ea6a..78d2aa1 100644
--- a/src/ssl/ssl_key_share.cc
+++ b/src/ssl/ssl_key_share.cc
@@ -220,11 +220,12 @@
X25519_keypair(x25519_public_key, x25519_private_key_);
uint8_t hrss_entropy[HRSS_GENERATE_KEY_BYTES];
+ HRSS_public_key hrss_public_key;
RAND_bytes(hrss_entropy, sizeof(hrss_entropy));
- HRSS_generate_key(&hrss_public_key_, &hrss_private_key_, hrss_entropy);
+ HRSS_generate_key(&hrss_public_key, &hrss_private_key_, hrss_entropy);
uint8_t hrss_public_key_bytes[HRSS_PUBLIC_KEY_BYTES];
- HRSS_marshal_public_key(hrss_public_key_bytes, &hrss_public_key_);
+ HRSS_marshal_public_key(hrss_public_key_bytes, &hrss_public_key);
if (!CBB_add_bytes(out, x25519_public_key, sizeof(x25519_public_key)) ||
!CBB_add_bytes(out, hrss_public_key_bytes,
@@ -233,7 +234,7 @@
}
return true;
- };
+ }
bool Accept(CBB *out_public_key, Array<uint8_t> *out_secret,
uint8_t *out_alert, Span<const uint8_t> peer_key) override {
@@ -287,16 +288,15 @@
return false;
}
- HRSS_decap(secret.data() + 32, &hrss_public_key_, &hrss_private_key_,
- peer_key.data() + 32, peer_key.size() - 32);
+ HRSS_decap(secret.data() + 32, &hrss_private_key_, peer_key.data() + 32,
+ peer_key.size() - 32);
*out_secret = std::move(secret);
return true;
- };
+ }
private:
uint8_t x25519_private_key_[32];
- HRSS_public_key hrss_public_key_;
HRSS_private_key hrss_private_key_;
};