3/n update fizz dependencies in proxygen

Summary: `fizz::`-> `fizz::openssl::` Reviewed By: rnandan08 Differential Revision: D56609767 fbshipit-source-id: 1b72fdaaa396980eb28aba89550f12a9d6c5233b
facebook · May 6, 2024 · d851d3d · d851d3d
1 parent 805db60
commit d851d3d
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/third-party/proxygen/src/proxygen/httpclient/samples/httperf2/Client.cpp b/third-party/proxygen/src/proxygen/httpclient/samples/httperf2/Client.cpp
@@ -9,7 +9,7 @@
 #include <proxygen/httpclient/samples/httperf2/Client.h>
 
 #include <boost/cast.hpp>
-#include <fizz/protocol/CertUtils.h>
+#include <fizz/backend/openssl/certificate/CertUtils.h>
 #include <folly/FileUtil.h>
 #include <folly/io/SocketOptionMap.h>
 #include <folly/portability/OpenSSL.h>
@@ -153,7 +153,7 @@ void Client::setupFizzContext(std::shared_ptr<fizz::client::PskCache> pskCache,
     if (!key.empty()) {
       folly::readFile(key.c_str(), keyData);
     }
-    auto selfCert = fizz::CertUtils::makeSelfCert(certData, keyData);
+    auto selfCert = fizz::openssl::CertUtils::makeSelfCert(certData, keyData);
     fizzContext_->setClientCertificate(std::move(selfCert));
   }
 }

diff --git a/third-party/proxygen/src/proxygen/httpserver/samples/hq/FizzContext.cpp b/third-party/proxygen/src/proxygen/httpserver/samples/hq/FizzContext.cpp
@@ -8,9 +8,9 @@
 
 #include <proxygen/httpserver/samples/hq/FizzContext.h>
 
+#include <fizz/backend/openssl/certificate/CertUtils.h>
 #include <fizz/compression/ZlibCertificateDecompressor.h>
 #include <fizz/compression/ZstdCertificateDecompressor.h>
-#include <fizz/protocol/CertUtils.h>
 #include <fizz/server/AeadTicketCipher.h>
 #include <fizz/server/CertManager.h>
 #include <fizz/server/TicketCodec.h>
@@ -152,12 +152,12 @@ FizzServerContextPtr createFizzServerContext(const HQServerParams& params) {
   if (!params.keyFilePath.empty()) {
     folly::readFile(params.keyFilePath.c_str(), keyData);
   }
-  auto cert = fizz::CertUtils::makeSelfCert(certData, keyData);
+  auto cert = fizz::openssl::CertUtils::makeSelfCert(certData, keyData);
   auto certManager = std::make_shared<fizz::server::CertManager>();
   certManager->addCert(std::move(cert), true);
 
-  auto cert2 =
-      fizz::CertUtils::makeSelfCert(kPrime256v1CertData, kPrime256v1KeyData);
+  auto cert2 = fizz::openssl::CertUtils::makeSelfCert(kPrime256v1CertData,
+                                                      kPrime256v1KeyData);
   certManager->addCert(std::move(cert2), false);
 
   auto serverCtx = std::make_shared<fizz::server::FizzServerContext>();
@@ -200,7 +200,7 @@ FizzClientContextPtr createFizzClientContext(const HQBaseParams& params,
   if (!params.keyFilePath.empty()) {
     folly::readFile(params.keyFilePath.c_str(), keyData);
   }
-  auto cert = fizz::CertUtils::makeSelfCert(certData, keyData);
+  auto cert = fizz::openssl::CertUtils::makeSelfCert(certData, keyData);
   ctx->setClientCertificate(std::move(cert));
   ctx->setSupportedAlpns(params.supportedAlpns);
   ctx->setDefaultShares(

diff --git a/third-party/proxygen/src/proxygen/lib/http/session/SecondaryAuthManager.h b/third-party/proxygen/src/proxygen/lib/http/session/SecondaryAuthManager.h
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include <fizz/protocol/CertUtils.h>
+#include <fizz/backend/openssl/certificate/CertUtils.h>
+#include <fizz/backend/openssl/certificate/OpenSSLPeerCertImpl.h>
+#include <fizz/backend/openssl/certificate/OpenSSLSelfCertImpl.h>
 #include <fizz/protocol/Certificate.h>
-#include <fizz/protocol/OpenSSLPeerCertImpl.h>
-#include <fizz/protocol/OpenSSLSelfCertImpl.h>
 #include <proxygen/lib/http/session/SecondaryAuthManagerBase.h>
 
 namespace proxygen {

diff --git a/third-party/proxygen/src/proxygen/lib/http/session/test/SecondaryAuthManagerTest.cpp b/third-party/proxygen/src/proxygen/lib/http/session/test/SecondaryAuthManagerTest.cpp
@@ -66,8 +66,8 @@ TEST(SecondaryAuthManagerTest, Authenticator) {
   std::vector<folly::ssl::X509UniquePtr> certs;
   certs.push_back(std::move(cert));
   std::unique_ptr<fizz::SelfCert> certPtr =
-      std::make_unique<OpenSSLSelfCertImpl<KeyType::P256>>(std::move(key),
-                                                           std::move(certs));
+      std::make_unique<openssl::OpenSSLSelfCertImpl<openssl::KeyType::P256>>(
+          std::move(key), std::move(certs));
   EXPECT_NE(certPtr, nullptr);
   SecondaryAuthManager authManager(std::move(certPtr));
   // Genearte an authenticator request.

diff --git a/third-party/proxygen/src/proxygen/lib/transport/H3DatagramAsyncSocket.cpp b/third-party/proxygen/src/proxygen/lib/transport/H3DatagramAsyncSocket.cpp
@@ -8,7 +8,7 @@
 
 #include <proxygen/lib/transport/H3DatagramAsyncSocket.h>
 
-#include <fizz/protocol/CertUtils.h>
+#include <fizz/backend/openssl/certificate/CertUtils.h>
 #include <folly/FileUtil.h>
 #include <quic/common/udpsocket/FollyQuicAsyncUDPSocket.h>
 #include <quic/fizz/client/handshake/FizzClientQuicHandshakeContext.h>
@@ -309,7 +309,7 @@ H3DatagramAsyncSocket::createFizzClientContext() {
     folly::readFile(options_.certAndKey_->first.c_str(), certData);
     std::string keyData;
     folly::readFile(options_.certAndKey_->second.c_str(), keyData);
-    auto cert = fizz::CertUtils::makeSelfCert(certData, keyData);
+    auto cert = fizz::openssl::CertUtils::makeSelfCert(certData, keyData);
     ctx->setClientCertificate(std::move(cert));
   }
 

diff --git a/third-party/proxygen/src/proxygen/lib/transport/PersistentFizzPskCache.h b/third-party/proxygen/src/proxygen/lib/transport/PersistentFizzPskCache.h
@@ -8,10 +8,10 @@
 
 #pragma once
 
+#include <fizz/backend/openssl/OpenSSLFactory.h>
 #include <fizz/client/PskCache.h>
 #include <fizz/client/PskSerializationUtils.h>
 #include <fizz/protocol/Factory.h>
-#include <fizz/protocol/OpenSSLFactory.h>
 #include <wangle/client/persistence/FilePersistentCache.h>
 
 namespace proxygen {
@@ -28,7 +28,7 @@ class PersistentFizzPskCache : public fizz::client::PskCache {
   PersistentFizzPskCache(const std::string& filename,
                          wangle::PersistentCacheConfig config,
                          std::unique_ptr<fizz::Factory> factory =
-                             std::make_unique<fizz::OpenSSLFactory>())
+                             std::make_unique<fizz::openssl::OpenSSLFactory>())
       : cache_(filename, std::move(config)), factory_(std::move(factory)) {
   }
 

diff --git a/third-party/proxygen/src/proxygen/lib/transport/PersistentQuicPskCache.h b/third-party/proxygen/src/proxygen/lib/transport/PersistentQuicPskCache.h
@@ -35,7 +35,7 @@ class PersistentQuicPskCache : public quic::QuicPskCache {
   PersistentQuicPskCache(const std::string& filename,
                          wangle::PersistentCacheConfig config,
                          std::unique_ptr<fizz::Factory> factory =
-                             std::make_unique<fizz::OpenSSLFactory>());
+                             std::make_unique<fizz::openssl::OpenSSLFactory>());
 
   void setMaxPskUses(size_t maxUses);