Skip to content

Commit 0ecbfb9

Browse files
committed
Fix formatting and deps errors
Signed-off-by: James Jenkins <James.Jenkins@ibm.com>
1 parent b224c51 commit 0ecbfb9

File tree

6 files changed

+14
-5
lines changed

6 files changed

+14
-5
lines changed

bazel/external/BUILD

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
licenses(["notice"]) # Apache 2
22

3-
exports_files(["boringssl_fips.genrule_cmd", "aws_lc.genrule_cmd"])
3+
exports_files([
4+
"aws_lc.genrule_cmd",
5+
"boringssl_fips.genrule_cmd",
6+
])
47

58
# Use a wrapper cc_library with an empty source source file to force
69
# compilation of other cc_library targets that only list *.a sources.

bazel/repository_locations.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
173173
strip_prefix = "aws-lc-{version}",
174174
urls = ["https://github.com/aws/aws-lc/archive/{version}.tar.gz"],
175175
use_category = ["controlplane", "dataplane_core"],
176-
release_date = "2025-02-05",
176+
release_date = "2025-02-06",
177177
cpe = "cpe:2.3:a:google:boringssl:*",
178178
),
179179
aspect_bazel_lib = dict(

source/common/tls/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ envoy_cc_library(
246246
name = "utility_lib",
247247
srcs = ["utility.cc"],
248248
hdrs = [
249-
"utility.h",
250249
"aws_lc_compat.h",
250+
"utility.h",
251251
],
252252
external_deps = ["ssl"],
253253
deps = [

source/common/tls/aws_lc_compat.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1+
#pragma once
2+
13
// Aws-lc can be utilized as an alternative to boringssl
24
// This file provides API translation from boringssl to aws-lc when Envoy is compiled with aws-lc
35
// As of now, aws-lc is only compiled with Envoy for the ppc64le platform
46
// More information about aws-lc can be found here: https://github.com/aws/aws-lc
57
// This file should be included wherever the following identifiers are invoked by Envoy
68

9+
namespace Envoy {
10+
711
#ifdef OPENSSL_IS_AWSLC
812
#define sk_X509_NAME_find sk_X509_NAME_find_awslc
913
#endif
14+
15+
} // namespace Envoy

source/common/tls/cert_validator/default_validator.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
#include "source/common/runtime/runtime_features.h"
2828
#include "source/common/stats/symbol_table.h"
2929
#include "source/common/stats/utility.h"
30+
#include "source/common/tls/aws_lc_compat.h"
3031
#include "source/common/tls/cert_validator/cert_validator.h"
3132
#include "source/common/tls/cert_validator/factory.h"
3233
#include "source/common/tls/cert_validator/utility.h"
33-
#include "source/common/tls/aws_lc_compat.h"
3434
#include "source/common/tls/stats.h"
3535
#include "source/common/tls/utility.h"
3636

source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#include "source/common/json/json_loader.h"
1919
#include "source/common/protobuf/message_validator_impl.h"
2020
#include "source/common/stats/symbol_table.h"
21+
#include "source/common/tls/aws_lc_compat.h"
2122
#include "source/common/tls/cert_validator/factory.h"
2223
#include "source/common/tls/cert_validator/utility.h"
23-
#include "source/common/tls/aws_lc_compat.h"
2424
#include "source/common/tls/stats.h"
2525
#include "source/common/tls/utility.h"
2626

0 commit comments

Comments
 (0)