Skip to content

Commit 376776a

Browse files
Abdulkadir Fiqifacebook-github-bot
Abdulkadir Fiqi
authored andcommitted
Refactor uses of setClientCertificate to setClientCertManager
Summary: use the new setClientCertManager method instead of the deprecated setClientCertificate method and remove it from FizzClientContext.h Reviewed By: zxjtan Differential Revision: D62404702 fbshipit-source-id: 936c19c31499558043e50027875143edebb4539c
1 parent 1148065 commit 376776a

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

proxygen/httpclient/samples/httperf2/Client.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,9 @@ void Client::setupFizzContext(std::shared_ptr<fizz::client::PskCache> pskCache,
154154
folly::readFile(key.c_str(), keyData);
155155
}
156156
auto selfCert = fizz::openssl::CertUtils::makeSelfCert(certData, keyData);
157-
fizzContext_->setClientCertificate(std::move(selfCert));
157+
auto certMgr = std::make_shared<fizz::client::CertManager>();
158+
certMgr->addCert(std::move(selfCert));
159+
fizzContext_->setClientCertManager(std::move(certMgr));
158160
}
159161
}
160162

proxygen/httpserver/samples/hq/FizzContext.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,9 @@ FizzClientContextPtr createFizzClientContext(const HQBaseParams& params,
201201
folly::readFile(params.keyFilePath.c_str(), keyData);
202202
}
203203
auto cert = fizz::openssl::CertUtils::makeSelfCert(certData, keyData);
204-
ctx->setClientCertificate(std::move(cert));
204+
auto certMgr = std::make_shared<fizz::client::CertManager>();
205+
certMgr->addCert(std::move(cert));
206+
ctx->setClientCertManager(std::move(certMgr));
205207
ctx->setSupportedAlpns(params.supportedAlpns);
206208
ctx->setDefaultShares(
207209
{fizz::NamedGroup::x25519, fizz::NamedGroup::secp256r1});

proxygen/lib/transport/H3DatagramAsyncSocket.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,9 @@ H3DatagramAsyncSocket::createFizzClientContext() {
310310
std::string keyData;
311311
folly::readFile(options_.certAndKey_->second.c_str(), keyData);
312312
auto cert = fizz::openssl::CertUtils::makeSelfCert(certData, keyData);
313-
ctx->setClientCertificate(std::move(cert));
313+
auto certMgr = std::make_shared<fizz::client::CertManager>();
314+
certMgr->addCert(std::move(cert));
315+
ctx->setClientCertManager(std::move(certMgr));
314316
}
315317

316318
std::vector<std::string> supportedAlpns = {proxygen::kH3FBCurrentDraft};

0 commit comments

Comments
 (0)