Skip to content

Commit

Permalink
fizz changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Naman Ahuja committed May 23, 2024
1 parent e4482e9 commit 10a94f3
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .buckconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ prelude = prelude
toolchains = shim
shim = shim
none = none
folly = folly/folly

[cell_aliases]
config = prelude
Expand All @@ -12,6 +13,7 @@ fbcode = none
fbsource = none
fbcode_macros = shim
buck = none
bazel_skylib = shim

[parser]
target_platform_detector_spec = target:root//...->prelude//platforms:default
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "folly"]
path = folly
url = [email protected]:facebook/folly.git
18 changes: 18 additions & 0 deletions fizz/facebook/fizz-config-fbcode.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/*
* Copyright (c) 2018-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#pragma once

#define FIZZ_BUILD_AEGIS 1
#define FIZZ_CERTIFICATE_USE_OPENSSL_CERT 1
#define FIZZ_HAVE_OQS 1
// Define below manually for httpclient/ssl/FizzUtilFunctions.h as liboqs
// exported_preprocessor_flags does not seem to propagate to fbcode
#define OQS_ENABLE_KEM_kyber_512 1
#define OQS_ENABLE_KEM_kyber_768 1
#define OQS_ENABLE_KEM_kyber_1024 1
13 changes: 13 additions & 0 deletions fizz/facebook/fizz-config-xplat.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/*
* Copyright (c) 2018-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#pragma once

#define FIZZ_BUILD_AEGIS 0
#define FIZZ_CERTIFICATE_USE_OPENSSL_CERT 1
#define FIZZ_HAVE_OQS 1
1 change: 1 addition & 0 deletions folly
Submodule folly added at df0d8d
2 changes: 2 additions & 0 deletions shim/shims.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,8 @@ def _fix_dep(x: str) -> [
return "root//" + x.removeprefix("//")
elif x.startswith("root//folly"):
return x
elif x.startswith("//fizz"):
return "root//" + x.removeprefix("//")
elif x.startswith("shim//"):
return x
else:
Expand Down

0 comments on commit 10a94f3

Please sign in to comment.