This PR updates the submodules to the latest commit and changes the openssl submodule to the Akamai fork (which is what is currently in PR to merge into openssl master). This openssl branch is much more up to date than the previous one and contains some fixes that were causing openssl to crash.
This commit is contained in:
Nick Banks 2020-01-11 18:35:25 -08:00 коммит произвёл GitHub
Родитель c489fe24a9
Коммит cb24e7b0d2
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 7 добавлений и 7 удалений

4
.gitmodules поставляемый
Просмотреть файл

@ -3,8 +3,8 @@
url = https://github.com/google/googletest
[submodule "submodules/openssl"]
path = submodules/openssl
url = https://github.com/tatsuhiro-t/openssl.git
branch = openssl-quic-draft-24
url = https://github.com/akamai/openssl.git
branch = master-quic-support
[submodule "submodules/everest"]
path = submodules/everest
url = https://github.com/nibanks/everest-dist.git

Просмотреть файл

@ -957,7 +957,7 @@ QuicTlsClientSecConfigCreate(
// passing TLS related config from APP layer to TAL.
//
Ret =
/*Ret =
SSL_CTX_load_verify_locations(
SecurityConfig->SSLCtx,
QuicOpenSslClientTrustedCert,
@ -966,7 +966,7 @@ QuicTlsClientSecConfigCreate(
QuicTraceLogError("[ tls] SSL_CTX_load_verify_locations failed, error: %ld", ERR_get_error());
Status = QUIC_STATUS_TLS_ERROR;
goto Exit;
}
}*/
}
}
@ -1157,7 +1157,7 @@ QuicTlsInitialize(
if (Config->IsServer) {
SSL_set_accept_state(TlsContext->Ssl);
SSL_set_quic_early_data_enabled(TlsContext->Ssl, 1);
//SSL_set_quic_early_data_enabled(TlsContext->Ssl, 1);
} else {
SSL_set_connect_state(TlsContext->Ssl);
SSL_set_tlsext_host_name(TlsContext->Ssl, TlsContext->SNI);

@ -1 +1 @@
Subproject commit 0a03480824b4fc7883255dbd2fd8940c9f81e22e
Subproject commit 306f3754a71d6d1ac644681d3544d06744914228

@ -1 +1 @@
Subproject commit 0685fe7102af597d52f979e7509406d71959093c
Subproject commit 663b4dd8a13e9bcf7fbde1da2aa2c8c1b6781d16