Test that version is available in the ALPN callback. HTTP/2 requires TLS 1.2 so the negotiated version should be available during the ALPN callback. Change-Id: Iea332808b531a6e5c917de5b8c8917c0aa7428a1 Reviewed-on: https://boringssl-review.googlesource.com/12060 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/ssl/ssl_test.cc b/ssl/ssl_test.cc index eb60550..4c658d3 100644 --- a/ssl/ssl_test.cc +++ b/ssl/ssl_test.cc
@@ -2377,16 +2377,19 @@ // The ALPN callback does not fail the handshake on error, so have the // callback write a boolean. - bool pending_cipher_known = false; + std::pair<uint16_t, bool> callback_state(version, false); SSL_CTX_set_alpn_select_cb( ctx.get(), [](SSL *ssl, const uint8_t **out, uint8_t *out_len, const uint8_t *in, unsigned in_len, void *arg) -> int { - bool *result = reinterpret_cast<bool *>(arg); - *result = SSL_get_pending_cipher(ssl) != nullptr; + auto state = reinterpret_cast<std::pair<uint16_t, bool>*>(arg); + if (SSL_get_pending_cipher(ssl) != nullptr && + SSL_version(ssl) == state->first) { + state->second = true; + } return SSL_TLSEXT_ERR_NOACK; }, - &pending_cipher_known); + &callback_state); bssl::UniquePtr<SSL> client, server; if (!ConnectClientAndServer(&client, &server, ctx.get(), ctx.get(), @@ -2394,7 +2397,7 @@ return false; } - if (!pending_cipher_known) { + if (!callback_state.second) { fprintf(stderr, "%x: The pending cipher was not known in the ALPN callback.\n", version);