Move PasswordCollector out of SSLContext

Summary: Moves PasswordCollector to its own file. Reviewed By: Gownta Differential Revision: D54527808 fbshipit-source-id: 9958ed8e9ed87614b309c63a8cde2ba1dbf2df0d
facebook · Mar 14, 2024 · 8638b10 · 8638b10
1 parent 129781e
commit 8638b10
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/wangle/ssl/SSLUtil.cpp b/wangle/ssl/SSLUtil.cpp
@@ -20,9 +20,8 @@
 #include <folly/Format.h>
 #include <folly/Memory.h>
 #include <folly/io/async/AsyncSSLSocket.h>
-#include <folly/ssl/OpenSSLPtrTypes.h>
-
 #include <folly/portability/OpenSSL.h>
+#include <folly/ssl/OpenSSLPtrTypes.h>
 
 namespace wangle {
 
@@ -207,7 +206,7 @@ folly::Optional<std::string> SSLUtil::decryptOpenSSLEncFilePassString(
 
 folly::Optional<std::string> SSLUtil::decryptOpenSSLEncFilePassFile(
     const std::string& filename,
-    const folly::PasswordCollector& pwdCollector,
+    const folly::ssl::PasswordCollector& pwdCollector,
     const EVP_CIPHER* cipher,
     const EVP_MD* digest) {
   // Get password as a string and call decryptFilePasswordString()

diff --git a/wangle/ssl/SSLUtil.h b/wangle/ssl/SSLUtil.h
@@ -20,12 +20,12 @@
 #include <mutex>
 
 #include <folly/String.h>
-#include <folly/io/async/SSLContext.h>
 #include <folly/ssl/OpenSSLPtrTypes.h>
+#include <folly/ssl/PasswordCollector.h>
 
 namespace folly {
 class AsyncSSLSocket;
-}
+} // namespace folly
 
 namespace wangle {
 
@@ -222,7 +222,7 @@ class SSLUtil {
    */
   static folly::Optional<std::string> decryptOpenSSLEncFilePassFile(
       const std::string& filename,
-      const folly::PasswordCollector& pwdCollector,
+      const folly::ssl::PasswordCollector& pwdCollector,
       const EVP_CIPHER* cipher,
       const EVP_MD* digest);
 };