Skip to content

tls: add allowPartialTrustChain flag #54790

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

Closed
addaleax wants to merge 6 commits into from
Closed

tls: add allowPartialTrustChain flag #54790

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bb69f14
tls: add `allowPartialTrustChain` flag
addaleax Sep 5, 2024
d488340
fixup! tls: add `allowPartialTrustChain` flag
addaleax Sep 5, 2024
5f501b4
fixup! fixup! tls: add `allowPartialTrustChain` flag
addaleax Sep 5, 2024
509156a
fixup! tls: add `allowPartialTrustChain` flag
addaleax Sep 5, 2024
433f6b3
fixup! fixup! tls: add `allowPartialTrustChain` flag
addaleax Sep 5, 2024
3ae1ea0
fixup! fixup! fixup! tls: add `allowPartialTrustChain` flag
addaleax Sep 5, 2024
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
Prev Previous commit
Next Next commit
fixup! tls: add allowPartialTrustChain flag
  • Loading branch information
@addaleax
addaleax committed Sep 5, 2024
commit 509156ac75aed153b3deab72b33eec6c3e6efe17
4 changes: 2 additions & 2 deletions src/crypto/crypto_context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,15 +761,15 @@ void SecureContext::SetX509StoreFlag(unsigned long flags) {
}

X509_STORE* SecureContext::GetCertStoreOwnedByThisSecureContext() {
if (owned_cert_store_cached_ != nullptr) return owned_cert_store_cached_;
if (own_cert_store_cache_ != nullptr) return own_cert_store_cache_;

X509_STORE* cert_store = SSL_CTX_get_cert_store(ctx_.get());
if (cert_store == GetOrCreateRootCertStore()) {
cert_store = NewRootCertStore();
SSL_CTX_set_cert_store(ctx_.get(), cert_store);
}

return owned_cert_store_cached_ = cert_store;
return own_cert_store_cache_ = cert_store;
}

void SecureContext::SetAllowPartialTrustChain(
Expand Down
3 changes: 2 additions & 1 deletion src/crypto/crypto_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ class SecureContext final : public BaseObject {
SSLCtxPointer ctx_;
X509Pointer cert_;
X509Pointer issuer_;
X509_STORE* owned_cert_store_cached_ = nullptr;
// Non-owning cache for SSL_CTX_get_cert_store(ctx_.get())
X509_STORE* own_cert_store_cache_ = nullptr;
#ifndef OPENSSL_NO_ENGINE
bool client_cert_engine_provided_ = false;
ncrypto::EnginePointer private_key_engine_;
Expand Down
8 changes: 3 additions & 5 deletions test/parallel/test-tls-client-allow-partial-trust-chain.js
View file
Open in desktop
Comment thread
addaleax marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
'use strict';
const common = require('../common');

if (!common.hasCrypto)
common.skip('missing crypto');
if (!common.hasCrypto) { common.skip('missing crypto'); };

const assert = require('assert');
const { once } = require('events');
const tls = require('tls');
const fixtures = require('../common/fixtures');

// agent6-cert.pem is signed by intermediate cert of ca3.
// The server has a cert chain of agent6->ca3->ca1(root).

const { it, beforeEach, afterEach, describe } = require('node:test');

describe('allowPartialTrustChain', function() {
describe('allowPartialTrustChain', { skip: !common.hasCrypto }, function() {
const tls = require('tls');
let server;
let client;
let opts;
Expand Down