external/boringssl: Sync to bc2a2013e03754a89a701739a7b58c422391efa2.
Third time's the charm.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/c9827e073f64e353c4891ecc2c73721882543ee0..bc2a2013e03754a89a701739a7b58c422391efa2
Test: atest CtsLibcoreTestCases
Test: atest CtsLibcoreOkHttpTestCases
Change-Id: I7943c83d12237ec6e4dc54fb3d5a9cecb909e6e7
diff --git a/src/tool/speed.cc b/src/tool/speed.cc
index a0fc905..3929cf6 100644
--- a/src/tool/speed.cc
+++ b/src/tool/speed.cc
@@ -51,6 +51,8 @@
#include "../crypto/internal.h"
#include "internal.h"
+#include "../third_party/sike/sike.h"
+
// TimeResults represents the results of benchmarking a function.
struct TimeResults {
@@ -294,6 +296,64 @@
return true;
}
+static bool SpeedSIKEP434(const std::string &selected) {
+ if (!selected.empty() && selected.find("SIKE") == std::string::npos) {
+ return true;
+ }
+ // speed generation
+ uint8_t public_SIKE[SIKE_PUB_BYTESZ];
+ uint8_t private_SIKE[SIKE_PRV_BYTESZ];
+ uint8_t ct[SIKE_CT_BYTESZ];
+ bool res;
+
+ {
+ TimeResults results;
+ res = TimeFunction(&results,
+ [&private_SIKE, &public_SIKE]() -> bool {
+ return (SIKE_keypair(private_SIKE, public_SIKE) == 1);
+ });
+ results.Print("SIKE/P434 generate");
+ }
+
+ if (!res) {
+ fprintf(stderr, "Failed to time SIKE_keypair.\n");
+ return false;
+ }
+
+ {
+ TimeResults results;
+ TimeFunction(&results,
+ [&ct, &public_SIKE]() -> bool {
+ uint8_t ss[SIKE_SS_BYTESZ];
+ SIKE_encaps(ss, ct, public_SIKE);
+ return true;
+ });
+ results.Print("SIKE/P434 encap");
+ }
+
+ if (!res) {
+ fprintf(stderr, "Failed to time SIKE_encaps.\n");
+ return false;
+ }
+
+ {
+ TimeResults results;
+ TimeFunction(&results,
+ [&ct, &public_SIKE, &private_SIKE]() -> bool {
+ uint8_t ss[SIKE_SS_BYTESZ];
+ SIKE_decaps(ss, ct, public_SIKE, private_SIKE);
+ return true;
+ });
+ results.Print("SIKE/P434 decap");
+ }
+
+ if (!res) {
+ fprintf(stderr, "Failed to time SIKE_decaps.\n");
+ return false;
+ }
+ return true;
+}
+
static uint8_t *align(uint8_t *in, unsigned alignment) {
return reinterpret_cast<uint8_t *>(
(reinterpret_cast<uintptr_t>(in) + alignment) &
@@ -435,7 +495,7 @@
static bool SpeedHashChunk(const EVP_MD *md, std::string name,
size_t chunk_len) {
bssl::ScopedEVP_MD_CTX ctx;
- uint8_t scratch[8192];
+ uint8_t scratch[16384];
if (chunk_len > sizeof(scratch)) {
return false;
@@ -476,7 +536,7 @@
}
static bool SpeedRandomChunk(std::string name, size_t chunk_len) {
- uint8_t scratch[8192];
+ uint8_t scratch[16384];
if (chunk_len > sizeof(scratch)) {
return false;
@@ -938,6 +998,7 @@
!SpeedECDH(selected) ||
!SpeedECDSA(selected) ||
!Speed25519(selected) ||
+ !SpeedSIKEP434(selected) ||
!SpeedSPAKE2(selected) ||
!SpeedScrypt(selected) ||
!SpeedRSAKeyGen(selected) ||