OERV-RUNTIME/boringssl
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update master-with-bazel from master branch

Browse Source
This commit is contained in:
BoringSSL Robot
2023-07-11 01:46:37 +00:00
parent 0209f25880 8f4daaf266
commit 299ffc295e
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ssl/test/test_state.cc
+13 -17
View File
@@ -151,34 +151,30 @@ bool TestState::Serialize(CBB *cbb) const {
std::unique_ptr<TestState> TestState::Deserialize(CBS *cbs, SSL_CTX *ctx) {
CBS in, pending_session, text;
std::unique_ptr<TestState> out_state(new TestState());
auto state = std::make_unique<TestState>();
uint16_t version;
constexpr uint16_t kVersion = 0;
uint64_t sec, usec;
if (!CBS_get_u24_length_prefixed(cbs, &in) ||
!CBS_get_u16(&in, &version) ||
if (!CBS_get_u24_length_prefixed(cbs, &in) || //
!CBS_get_u16(&in, &version) || //
version > kVersion ||
!CBS_get_u24_length_prefixed(&in, &pending_session) ||
!CBS_get_u16_length_prefixed(&in, &text)) {
!CBS_get_u16_length_prefixed(&in, &text) ||
!CBS_get_asn1_uint64(&in, &sec) || //
!CBS_get_asn1_uint64(&in, &usec) || //
usec >= 1000000) {
return nullptr;
}
if (CBS_len(&pending_session)) {
out_state->pending_session = SSL_SESSION_parse(
state->pending_session = SSL_SESSION_parse(
&pending_session, ctx->x509_method, ctx->pool);
if (!out_state->pending_session) {
if (!state->pending_session) {
return nullptr;
}
}
out_state->msg_callback_text = std::string(
state->msg_callback_text = std::string(
reinterpret_cast<const char *>(CBS_data(&text)), CBS_len(&text));
// TODO(2020-05-01): Make this unconditional & merge into above.
if (CBS_len(&in) > 0) {
if (!CBS_get_asn1_uint64(&in, &sec) ||
!CBS_get_asn1_uint64(&in, &usec)) {
return nullptr;
}
g_clock.tv_sec = sec;
g_clock.tv_usec = usec;
}
return out_state;
g_clock.tv_sec = sec;
g_clock.tv_usec = usec;
return state;
}