Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use root level certificate verification callback in OpenSSL #1818

Merged
merged 2 commits into from
Jul 14, 2021
Merged

Use root level certificate verification callback in OpenSSL #1818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1466eb4
Use root level certificate verification callback in OpenSSL
thhous-msft Jul 14, 2021
a5f2a78
Bumps openssl cache
thhous-msft Jul 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure/templates/build-config-user.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:

- task: Cache@2
inputs:
key: '"${{ parameters.platform }}_${{ parameters.arch }}_${{ parameters.tls }}_${{ parameters.extraName }}_${{ parameters.config }}_13" | .gitmodules'
key: '"${{ parameters.platform }}_${{ parameters.arch }}_${{ parameters.tls }}_${{ parameters.extraName }}_${{ parameters.config }}_14" | .gitmodules'
path: build/${{ parameters.platform }}/${{ parameters.arch }}_${{ parameters.tls }}/openssl
displayName: Cache OpenSSL
condition: and(succeeded(), eq('${{ parameters.tls }}', 'openssl'), not(${{ parameters.skipOpenSSLCache }}))
Expand Down
30 changes: 25 additions & 5 deletions src/platform/tls_openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,12 @@ CxPlatTlsVerifyCertificate(
static
int
CxPlatTlsCertificateVerifyCallback(
int preverify_ok,
X509_STORE_CTX *x509_ctx
X509_STORE_CTX *x509_ctx,
void* param
)
{
UNREFERENCED_PARAMETER(param);
int CertificateVerified = 0;
int status = TRUE;
QUIC_BUFFER PortableCertificate = { 0, 0 };
QUIC_BUFFER PortableChain = { 0, 0 };
Expand All @@ -202,11 +204,27 @@ CxPlatTlsCertificateVerifyCallback(
CXPLAT_TLS* TlsContext = SSL_get_app_data(Ssl);

if (!(TlsContext->SecConfig->Flags & QUIC_CREDENTIAL_FLAG_USE_TLS_BUILTIN_CERTIFICATE_VALIDATION)) {
preverify_ok = CxPlatTlsVerifyCertificate(Cert, TlsContext->SNI, TlsContext->SecConfig->Flags);
if (Cert == NULL) {
QuicTraceEvent(
TlsError,
"[ tls][%p] ERROR, %s.",
TlsContext->Connection,
"No certificate passed");
X509_STORE_CTX_set_error(x509_ctx, X509_R_NO_CERT_SET_FOR_US_TO_VERIFY);
return FALSE;
}

CertificateVerified = CxPlatTlsVerifyCertificate(Cert, TlsContext->SNI, TlsContext->SecConfig->Flags);

if (!CertificateVerified) {
X509_STORE_CTX_set_error(x509_ctx, X509_V_ERR_CERT_REJECTED);
}
} else {
CertificateVerified = X509_verify_cert(x509_ctx);
}

if (!(TlsContext->SecConfig->Flags & QUIC_CREDENTIAL_FLAG_NO_CERTIFICATE_VALIDATION) &&
!preverify_ok) {
!CertificateVerified) {
QuicTraceEvent(
TlsError,
"[ tls][%p] ERROR, %s.",
Expand All @@ -224,6 +242,7 @@ CxPlatTlsCertificateVerifyCallback(
"[ tls][%p] ERROR, %s.",
TlsContext->Connection,
"Failed to serialize certificate context");
X509_STORE_CTX_set_error(x509_ctx, X509_V_ERR_OUT_OF_MEM);
return FALSE;
}
}
Expand Down Expand Up @@ -1129,7 +1148,8 @@ CxPlatTlsSecConfigCreate(
}

if (CredConfigFlags & QUIC_CREDENTIAL_FLAG_CLIENT) {
SSL_CTX_set_verify(SecurityConfig->SSLCtx, SSL_VERIFY_PEER, CxPlatTlsCertificateVerifyCallback);
SSL_CTX_set_cert_verify_callback(SecurityConfig->SSLCtx, CxPlatTlsCertificateVerifyCallback, NULL);
ThadHouse marked this conversation as resolved.
Show resolved Hide resolved
SSL_CTX_set_verify(SecurityConfig->SSLCtx, SSL_VERIFY_PEER, NULL);
SSL_CTX_set_verify_depth(SecurityConfig->SSLCtx, CXPLAT_TLS_DEFAULT_VERIFY_DEPTH);

//
Expand Down