Skip to content

Commit 3f96333

Browse files
siemen11siemen11
committed
[pentest] Use general cryptolib target
Use the crypto target as a dependency for the pentest framework instead of the separate targets. Signed-off-by: Siemen Dhooghe <[email protected]>
1 parent 3424e7f commit 3f96333

File tree

4 files changed

+4
-34
lines changed

4 files changed

+4
-34
lines changed

‎sw/device/tests/penetrationtests/firmware/BUILD‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ FIRMWARE_DEPS_CRYPTOLIB_FI_SYM = [
111111
"//sw/device/tests/penetrationtests/firmware/lib:pentest_lib",
112112
"//sw/device/lib/base:csr",
113113
"//sw/device/lib/base:status",
114-
"//sw/device/lib/crypto/drivers:entropy",
115114
"//sw/device/lib/testing/test_framework:check",
116115
"//sw/device/lib/testing/test_framework:ottf_main",
117116
"//sw/device/lib/testing/test_framework:ujson_ottf",
@@ -127,7 +126,6 @@ FIRMWARE_DEPS_CRYPTOLIB_FI_ASYM = [
127126
"//sw/device/tests/penetrationtests/firmware/lib:pentest_lib",
128127
"//sw/device/lib/base:csr",
129128
"//sw/device/lib/base:status",
130-
"//sw/device/lib/crypto/drivers:entropy",
131129
"//sw/device/lib/testing/test_framework:check",
132130
"//sw/device/lib/testing/test_framework:ottf_main",
133131
"//sw/device/lib/testing/test_framework:ujson_ottf",
@@ -144,7 +142,6 @@ FIRMWARE_DEPS_CRYPTOLIB_SCA_SYM = [
144142
"//sw/device/tests/penetrationtests/firmware/sca:prng_sca",
145143
"//sw/device/lib/base:csr",
146144
"//sw/device/lib/base:status",
147-
"//sw/device/lib/crypto/drivers:entropy",
148145
"//sw/device/lib/testing/test_framework:check",
149146
"//sw/device/lib/testing/test_framework:ottf_main",
150147
"//sw/device/lib/testing/test_framework:ujson_ottf",
@@ -162,7 +159,6 @@ FIRMWARE_DEPS_CRYPTOLIB_SCA_ASYM = [
162159
"//sw/device/tests/penetrationtests/firmware/sca:prng_sca",
163160
"//sw/device/lib/base:csr",
164161
"//sw/device/lib/base:status",
165-
"//sw/device/lib/crypto/drivers:entropy",
166162
"//sw/device/lib/testing/test_framework:check",
167163
"//sw/device/lib/testing/test_framework:ottf_main",
168164
"//sw/device/lib/testing/test_framework:ujson_ottf",

‎sw/device/tests/penetrationtests/firmware/fi/BUILD‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,7 @@ cc_library(
7676
"//sw/device/lib/base:math",
7777
"//sw/device/lib/base:memory",
7878
"//sw/device/lib/base:status",
79-
"//sw/device/lib/crypto/impl:ecc_p256",
80-
"//sw/device/lib/crypto/impl:ecc_p384",
81-
"//sw/device/lib/crypto/impl:integrity",
82-
"//sw/device/lib/crypto/impl:key_transport",
83-
"//sw/device/lib/crypto/impl:keyblob",
84-
"//sw/device/lib/crypto/impl:rsa",
85-
"//sw/device/lib/crypto/impl:sha2",
79+
"//sw/device/lib/crypto",
8680
"//sw/device/lib/crypto/include:crypto_hdrs",
8781
"//sw/device/lib/crypto/include:datatypes",
8882
"//sw/device/lib/runtime:log",
@@ -103,12 +97,7 @@ cc_library(
10397
deps = [
10498
"//sw/device/lib/base:memory",
10599
"//sw/device/lib/base:status",
106-
"//sw/device/lib/crypto/impl:aes",
107-
"//sw/device/lib/crypto/impl:aes_gcm",
108-
"//sw/device/lib/crypto/impl:drbg",
109-
"//sw/device/lib/crypto/impl:hmac",
110-
"//sw/device/lib/crypto/impl:integrity",
111-
"//sw/device/lib/crypto/impl:keyblob",
100+
"//sw/device/lib/crypto",
112101
"//sw/device/lib/crypto/include:crypto_hdrs",
113102
"//sw/device/lib/crypto/include:datatypes",
114103
"//sw/device/lib/runtime:log",

‎sw/device/tests/penetrationtests/firmware/sca/BUILD‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,7 @@ cc_library(
7373
"//sw/device/lib/base:math",
7474
"//sw/device/lib/base:memory",
7575
"//sw/device/lib/base:status",
76-
"//sw/device/lib/crypto/impl:ecc_p256",
77-
"//sw/device/lib/crypto/impl:ecc_p384",
78-
"//sw/device/lib/crypto/impl:integrity",
79-
"//sw/device/lib/crypto/impl:key_transport",
80-
"//sw/device/lib/crypto/impl:keyblob",
81-
"//sw/device/lib/crypto/impl:rsa",
82-
"//sw/device/lib/crypto/impl:sha2",
76+
"//sw/device/lib/crypto",
8377
"//sw/device/lib/crypto/include:crypto_hdrs",
8478
"//sw/device/lib/crypto/include:datatypes",
8579
"//sw/device/lib/runtime:log",
@@ -100,12 +94,7 @@ cc_library(
10094
deps = [
10195
"//sw/device/lib/base:memory",
10296
"//sw/device/lib/base:status",
103-
"//sw/device/lib/crypto/impl:aes",
104-
"//sw/device/lib/crypto/impl:aes_gcm",
105-
"//sw/device/lib/crypto/impl:drbg",
106-
"//sw/device/lib/crypto/impl:hmac",
107-
"//sw/device/lib/crypto/impl:integrity",
108-
"//sw/device/lib/crypto/impl:keyblob",
97+
"//sw/device/lib/crypto",
10998
"//sw/device/lib/crypto/include:crypto_hdrs",
11099
"//sw/device/lib/crypto/include:datatypes",
111100
"//sw/device/lib/runtime:log",

‎sw/device/tests/penetrationtests/pentest.bzl‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ FIRMWARE_DEPS_CRYPTOLIB_FI_SYM = [
111111
"//sw/device/tests/penetrationtests/firmware/lib:pentest_lib",
112112
"//sw/device/lib/base:csr",
113113
"//sw/device/lib/base:status",
114-
"//sw/device/lib/crypto/drivers:entropy",
115114
"//sw/device/lib/testing/test_framework:check",
116115
"//sw/device/lib/testing/test_framework:ottf_main",
117116
"//sw/device/lib/testing/test_framework:ujson_ottf",
@@ -128,7 +127,6 @@ FIRMWARE_DEPS_CRYPTOLIB_FI_ASYM = [
128127
"//sw/device/tests/penetrationtests/firmware/lib:pentest_lib",
129128
"//sw/device/lib/base:csr",
130129
"//sw/device/lib/base:status",
131-
"//sw/device/lib/crypto/drivers:entropy",
132130
"//sw/device/lib/testing/test_framework:check",
133131
"//sw/device/lib/testing/test_framework:ottf_main",
134132
"//sw/device/lib/testing/test_framework:ujson_ottf",
@@ -145,7 +143,6 @@ FIRMWARE_DEPS_CRYPTOLIB_SCA_SYM = [
145143
"//sw/device/tests/penetrationtests/firmware/lib:pentest_lib",
146144
"//sw/device/lib/base:csr",
147145
"//sw/device/lib/base:status",
148-
"//sw/device/lib/crypto/drivers:entropy",
149146
"//sw/device/lib/testing/test_framework:check",
150147
"//sw/device/lib/testing/test_framework:ottf_main",
151148
"//sw/device/lib/testing/test_framework:ujson_ottf",
@@ -162,7 +159,6 @@ FIRMWARE_DEPS_CRYPTOLIB_SCA_ASYM = [
162159
"//sw/device/tests/penetrationtests/firmware/lib:pentest_lib",
163160
"//sw/device/lib/base:csr",
164161
"//sw/device/lib/base:status",
165-
"//sw/device/lib/crypto/drivers:entropy",
166162
"//sw/device/lib/testing/test_framework:check",
167163
"//sw/device/lib/testing/test_framework:ottf_main",
168164
"//sw/device/lib/testing/test_framework:ujson_ottf",

0 commit comments

Comments
 (0)