Revert D91249170: reland "[quic] use XSecCryptoBridge behind JK flag for FizzServerHandshake and FizzCryptoFactory"

Differential Revision:
D91249170

Original commit changeset: e7b8382bc15e

Original Phabricator Diff: D91249170

fbshipit-source-id: 615567a63d5250e5c39697afa81774a7c91197df

Author: anassinator

quic/fizz/handshake/BUCK

@@ -5,35 +5,38 @@ oncall("traffic_protocols")
 mvfst_cpp_library(
     name = "fizz_handshake",
     srcs = [
+        "FizzBridge.cpp",
         "FizzCryptoFactory.cpp",
         "FizzPacketNumberCipher.cpp",
         "FizzRetryIntegrityTagGenerator.cpp",
         "QuicFizzFactory.cpp",
     ],
     headers = [
+        "FizzBridge.h",
         "FizzCryptoFactory.h",
         "FizzPacketNumberCipher.h",
         "FizzRetryIntegrityTagGenerator.h",
         "FizzTransportParameters.h",
         "QuicFizzFactory.h",
     ],
     deps = [
-        ":fizz_bridge",
         "//fizz/backend:openssl",
         "//fizz/crypto:crypto",
         "//fizz/crypto:utils",
-        "//fizz/crypto/aead:aead",
         "//quic/common:optional",
     ],
     exported_deps = [
+        "//fizz/crypto/aead:aead",
         "//fizz/protocol:default_factory",
+        "//fizz/protocol:types",
         "//fizz/record:record",
         "//folly/ssl:openssl_ptr_types",
+        "//quic:constants",
         "//quic/codec:packet_number_cipher",
         "//quic/common:buf_util",
         "//quic/common:mvfst_logging",
-        "//quic/fizz/handshake:fizz_bridge",
         "//quic/folly_utils:folly_utils",
+        "//quic/handshake:aead",
         "//quic/handshake:handshake",
         "//quic/handshake:retry_integrity_tag_generator",
         "//quic/handshake:transport_parameters",
@@ -46,20 +49,3 @@ mvfst_cpp_library(
         }),  # @fb-only
     }),
 )
-
-mvfst_cpp_library(
-    name = "fizz_bridge",
-    srcs = [
-        "FizzBridge.cpp",
-    ],
-    headers = [
-        "FizzBridge.h",
-    ],
-    exported_deps = [
-        "//fizz/crypto/aead:aead",
-        "//fizz/protocol:types",
-        "//quic:constants",
-        "//quic/handshake:aead",
-        "//quic/handshake:handshake",
-    ],
-)

quic/fizz/handshake/FizzCryptoFactory.cpp

@@ -10,11 +10,8 @@
 
 #include <quic/fizz/handshake/FizzBridge.h>
 #include <quic/fizz/handshake/FizzPacketNumberCipher.h>
-#include QUIC_DEFAULT_AEAD_HEADER
 #include <quic/handshake/HandshakeLayer.h>
 
-using DefaultAead = QUIC_DEFAULT_AEAD;
-
 namespace quic {
 
 quic::Expected<BufPtr, QuicError> FizzCryptoFactory::makeInitialTrafficSecret(
@@ -65,7 +62,7 @@ FizzCryptoFactory::makeInitialAead(
   trafficKey.key = std::move(key);
   trafficKey.iv = std::move(iv);
   aead->setKey(std::move(trafficKey));
-  return DefaultAead::wrap(std::move(aead));
+  return FizzAead::wrap(std::move(aead));
 }
 
 quic::Expected<std::unique_ptr<PacketNumberCipher>, QuicError>

quic/fizz/server/handshake/BUCK

@@ -18,7 +18,6 @@ mvfst_cpp_library(
         "//fizz/server:replay_cache",
         "//quic:constants",
         "//quic/common:mvfst_logging",
-        "//quic/fizz/handshake:fizz_bridge",
         "//quic/server/state:server",
     ],
     exported_deps = [

quic/fizz/server/handshake/FizzServerHandshake.cpp

@@ -12,7 +12,6 @@
 #include <quic/fizz/handshake/FizzBridge.h>
 #include <quic/fizz/server/handshake/AppToken.h>
 #include <quic/fizz/server/handshake/FizzServerQuicHandshakeContext.h>
-#include QUIC_DEFAULT_AEAD_HEADER
 
 #include <fizz/protocol/Protocol.h>
 #include <fizz/server/ReplayCache.h>
@@ -23,8 +22,6 @@
 // QuicServerConnectionState.
 #include <quic/server/state/ServerStateMachine.h>
 
-using DefaultAead = QUIC_DEFAULT_AEAD;
-
 namespace fizz::server {
 struct ResumptionState;
 } // namespace fizz::server
@@ -107,7 +104,7 @@ void FizzServerHandshake::processSocketData(folly::IOBufQueue& queue) {
 }
 
 std::unique_ptr<Aead> FizzServerHandshake::buildAead(ByteRange secret) {
-  return DefaultAead::wrap(
+  return FizzAead::wrap(
       fizz::Protocol::deriveRecordAeadWithLabel(
           *state_.context()->getFactory(),
           *state_.keyScheduler(),

quic/server/handshake/BUCK

@@ -13,7 +13,7 @@ mvfst_cpp_library(
     ],
     deps = [
         "//quic/common:mvfst_logging",
-        "//quic/fizz/handshake:fizz_bridge",
+        "//quic/fizz/handshake:fizz_handshake",
         "//quic/state:stream_functions",
     ],
     exported_deps = [

quic/somerge_defs.bzl

@@ -2,7 +2,7 @@
 
 Generated by xplat/cross_plat_devx/somerge_maps/compute_merge_maps.py
 
-@generated SignedSource<<59705d72257a5a17ab646a1f082b1431>>
+@generated SignedSource<<e53ca29040530de04fe934295124939f>>
 """
 
 # Entry Points:
@@ -148,8 +148,6 @@ QUIC_NATIVE_LIBRARY_MERGE_MAP = [
     "fbsource//xplat/quic/fizz/client/handshake:psk_cacheAndroid$",
     "fbsource//xplat/quic/fizz/client/handshake:token_cache$",
     "fbsource//xplat/quic/fizz/client/handshake:token_cacheAndroid$",
-    "fbsource//xplat/quic/fizz/handshake:fizz_bridge$",
-    "fbsource//xplat/quic/fizz/handshake:fizz_bridgeAndroid$",
     "fbsource//xplat/quic/fizz/handshake:fizz_handshake$",
     "fbsource//xplat/quic/fizz/handshake:fizz_handshakeAndroid$",
     "fbsource//xplat/quic/flowcontrol:flow_control$",