diff options
| author | Steven Valdez <svaldez@chromium.org> | 2020-09-21 11:39:22 -0400 |
|---|---|---|
| committer | CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> | 2020-10-08 13:42:48 +0000 |
| commit | f2b2ef84072604ef6ecbbd10a38332b12acea82c (patch) | |
| tree | bfe90dd698222bfc5a741d9a4bd48b63ea4498fc /tool | |
| parent | f94e6d7f9dc94842c33e6e6cb90691210ecf6b47 (diff) | |
| download | boringssl-f2b2ef84072604ef6ecbbd10a38332b12acea82c.zip boringssl-f2b2ef84072604ef6ecbbd10a38332b12acea82c.tar.gz boringssl-f2b2ef84072604ef6ecbbd10a38332b12acea82c.tar.bz2 | |
Update TrustTokenV2 to use VOPRFs and assemble RR.
Change-Id: I2f1f6b187bf42ebfdb61def73726d95740a9d55c
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/42965
Commit-Queue: Steven Valdez <svaldez@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/speed.cc | 43 |
1 files changed, 27 insertions, 16 deletions
diff --git a/tool/speed.cc b/tool/speed.cc index af81a60..5d724e7 100644 --- a/tool/speed.cc +++ b/tool/speed.cc @@ -984,11 +984,12 @@ static bool SpeedHashToCurve(const std::string &selected) { return true; } -static PMBTOKEN_PRETOKEN *pmbtoken_pretoken_dup(PMBTOKEN_PRETOKEN *in) { - PMBTOKEN_PRETOKEN *out = - (PMBTOKEN_PRETOKEN *)OPENSSL_malloc(sizeof(PMBTOKEN_PRETOKEN)); +static TRUST_TOKEN_PRETOKEN *trust_token_pretoken_dup( + TRUST_TOKEN_PRETOKEN *in) { + TRUST_TOKEN_PRETOKEN *out = + (TRUST_TOKEN_PRETOKEN *)OPENSSL_malloc(sizeof(TRUST_TOKEN_PRETOKEN)); if (out) { - OPENSSL_memcpy(out, in, sizeof(PMBTOKEN_PRETOKEN)); + OPENSSL_memcpy(out, in, sizeof(TRUST_TOKEN_PRETOKEN)); } return out; } @@ -1059,9 +1060,9 @@ static bool SpeedTrustToken(std::string name, const TRUST_TOKEN_METHOD *method, &msg_len, batchsize); OPENSSL_free(issue_msg); // Clear pretokens. - sk_PMBTOKEN_PRETOKEN_pop_free(client->pretokens, - PMBTOKEN_PRETOKEN_free); - client->pretokens = sk_PMBTOKEN_PRETOKEN_new_null(); + sk_TRUST_TOKEN_PRETOKEN_pop_free(client->pretokens, + TRUST_TOKEN_PRETOKEN_free); + client->pretokens = sk_TRUST_TOKEN_PRETOKEN_new_null(); return ok; })) { fprintf(stderr, "TRUST_TOKEN_CLIENT_begin_issuance failed.\n"); @@ -1078,9 +1079,10 @@ static bool SpeedTrustToken(std::string name, const TRUST_TOKEN_METHOD *method, } bssl::UniquePtr<uint8_t> free_issue_msg(issue_msg); - bssl::UniquePtr<STACK_OF(PMBTOKEN_PRETOKEN)> pretokens( - sk_PMBTOKEN_PRETOKEN_deep_copy(client->pretokens, pmbtoken_pretoken_dup, - PMBTOKEN_PRETOKEN_free)); + bssl::UniquePtr<STACK_OF(TRUST_TOKEN_PRETOKEN)> pretokens( + sk_TRUST_TOKEN_PRETOKEN_deep_copy(client->pretokens, + trust_token_pretoken_dup, + TRUST_TOKEN_PRETOKEN_free)); if (!TimeFunction(&results, [&]() -> bool { uint8_t *issue_resp = NULL; @@ -1116,8 +1118,9 @@ static bool SpeedTrustToken(std::string name, const TRUST_TOKEN_METHOD *method, issue_resp, resp_len)); // Reset pretokens. - client->pretokens = sk_PMBTOKEN_PRETOKEN_deep_copy( - pretokens.get(), pmbtoken_pretoken_dup, PMBTOKEN_PRETOKEN_free); + client->pretokens = sk_TRUST_TOKEN_PRETOKEN_deep_copy( + pretokens.get(), trust_token_pretoken_dup, + TRUST_TOKEN_PRETOKEN_free); return !!tokens; })) { fprintf(stderr, "TRUST_TOKEN_CLIENT_finish_issuance failed.\n"); @@ -1203,9 +1206,9 @@ static bool SpeedTrustToken(std::string name, const TRUST_TOKEN_METHOD *method, if (!TimeFunction(&results, [&]() -> bool { uint8_t *srr = NULL, *sig = NULL; size_t srr_len, sig_len; - int ok = TRUST_TOKEN_CLIENT_finish_redemption(client.get(), &srr, - &srr_len, &sig, &sig_len, - redeem_resp, resp_len); + int ok = TRUST_TOKEN_CLIENT_finish_redemption( + client.get(), &srr, &srr_len, &sig, &sig_len, redeem_resp, + redeem_resp_len); OPENSSL_free(srr); OPENSSL_free(sig); return ok; @@ -1352,7 +1355,15 @@ bool Speed(const std::vector<std::string> &args) { !SpeedTrustToken("TrustToken-Exp1-Batch1", TRUST_TOKEN_experiment_v1(), 1, selected) || !SpeedTrustToken("TrustToken-Exp1-Batch10", TRUST_TOKEN_experiment_v1(), - 10, selected)) { + 10, selected) || + !SpeedTrustToken("TrustToken-Exp2VOPRF-Batch1", + TRUST_TOKEN_experiment_v2_voprf(), 1, selected) || + !SpeedTrustToken("TrustToken-Exp2VOPRF-Batch10", + TRUST_TOKEN_experiment_v2_voprf(), 10, selected) || + !SpeedTrustToken("TrustToken-Exp2PMB-Batch1", + TRUST_TOKEN_experiment_v2_pmb(), 1, selected) || + !SpeedTrustToken("TrustToken-Exp2PMB-Batch10", + TRUST_TOKEN_experiment_v2_pmb(), 10, selected)) { return false; } if (g_print_json) { |