bd5cc3a0be
Add test in block_cipher_key_type test case
...
The test case uses a bit shift to check that the block
size is a power of 2
Fixes #4228
Signed-off-by: Joe Subbiani <joe.subbiani@arm.com >
2021-07-09 12:17:49 +01:00
7187953fc5
Raise max_content_len constraint by one in Connection ID tests
...
- Also incorporates the grammar fix commit in the development branch
Signed-off-by: Yuto Takano <yuto.takano@arm.com >
2021-07-09 11:33:39 +01:00
a49124e528
Add content length constraint to tests that use max_frag_len
...
Includes:
- handshake memory tests
- Connection ID (MFL) tests
- DTLS fragmenting tests
- SSLv3 with extensions test (backport only)
Signed-off-by: Yuto Takano <yuto.takano@arm.com >
2021-07-09 11:33:39 +01:00
8a693efe9b
Move repetitive equality check to requires_config_value_equals
...
Signed-off-by: Yuto Takano <yuto.takano@arm.com >
2021-07-09 11:33:39 +01:00
ccdd25cbc5
Reword and add explanatory comments for MAX_IM_CA tests
...
- Reword the comment on config.h to suggest that
`MAX_INTERMEDIATE_CA` may not exist in the config.
- Add a comment explaining why the tests are more restrictive
than necessary.
Signed-off-by: Yuto Takano <yuto.takano@arm.com >
2021-07-09 11:33:39 +01:00
bec7cf762d
Use requires_max_content_len, add check in Renegotiation
...
- Abstract out repetitive checks for IN and OUT content lens
- Remove unclear comment and redundant echo
- Add content length constraints in Renegotiation with fragment length test
Signed-off-by: Yuto Takano <yuto.takano@arm.com >
2021-07-09 11:33:39 +01:00
ab9e433376
Add space between command substitution braces and content
...
Signed-off-by: Yuto Takano <yuto.takano@arm.com >
2021-07-09 11:33:39 +01:00
d448545d2a
Add MAX_IM_CA requirement to int_max+1 chain as well
...
Signed-off-by: Yuto Takano <yuto.takano@arm.com >
2021-07-09 11:33:39 +01:00
05d43f49a1
Remove hard exit with MAX_INTERMEDIATE_CA in ssl-opt.sh
...
- Replace last remaining dependency on config.py with query_config
- Replace hard exit with `requires_config_value_at_least` and
`requires_config_value_at_most` to maintain the same effect
Signed-off-by: Yuto Takano <yuto.takano@arm.com >
2021-07-09 11:33:39 +01:00
18ddccc417
Remove hard exit in ssh-opt.sh, replace with requires functions
...
- Replace calls to config.py for MAX_IN_LEN and MAX_OUT_LEN with
`get_config_value_or_default`
- Remove hard exit when MAX_IN/OUT_LEN < 4096, replace with
`requires_config_value_at_least`
Signed-off-by: Yuto Takano <yuto.takano@arm.com >
2021-07-09 11:33:39 +01:00
008cd0c4d8
Merge pull request #4757 from gilles-peskine-arm/generate_psa_tests-speedup-2.27
...
Backport 2.x: Speed up the generation of storage format test cases
2021-07-07 15:27:21 +02:00
3008c58df9
Speed up the generation of storage format test cases
...
Restore the optimization done in
HEAD^{/Speed up the generation of storage format test cases}
which was lost during refactoring made when adding support for
implicit usage flags.
There are still more than one call to the C compiler, but the extra
calls are only for some key usage test cases.
This is an internal refactoring. This commit does not change the
output of generate_psa_tests.py
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com >
2021-07-06 21:08:46 +02:00
bece7374ce
Bump Library Version Number
...
Signed-off-by: Paul Elliott <paul.elliott@arm.com >
2021-07-01 17:52:07 +01:00
4128c2032e
Merge remote-tracking branch 'restricted/development_2.x-restricted' into mbedtls-2.27.0rc0-pr
2021-07-01 17:26:38 +01:00
ba940cc695
Merge pull request #4182 from gabor-mezei-arm/3258_implement_one-shot_MAC_and_cipher
...
[Backport 2.x] Implement one-shot cipher
2021-06-30 17:04:11 +01:00
af9b4841fb
Merge pull request #4605 from gabor-mezei-arm/3267_sign_verify_key_policies
...
[Backport 2.x] Key policy extension for PSA_KEY_USAGE_SIGN/VERIFY_HASH
2021-06-30 14:51:03 +01:00
0a4046e9ca
Merge pull request #4736 from daverodgman/alert_bugfixes_2.x
...
Backport 2.x: Fix alert raised for invalid fragment length
2021-06-30 09:02:49 +01:00
7ed75e21c9
Correct required config flag in ECJPAKE tests
...
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com >
2021-06-29 21:15:58 +01:00
a3669ac7e7
Restoring the multi-part cipher_verify_output() testing
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-29 18:58:42 +02:00
3ea27325c9
Fix pylint issue
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-29 17:21:21 +02:00
ea840dea61
Return iterator instead of list
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-29 15:42:57 +02:00
912eca3847
Rename function
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-29 15:39:56 +02:00
8930e14f3a
test_suite_pk.function: Do not use MD_MAX_SIZE
...
In order to for tests to pass from the previous commit (which it mandatory for all pk verify/sign
functions to be given a hash_len that is exactly equal to the message digest length of md_alg) the
hash_len that is supplied to the fucntion cannot be MBEDTLS_MD_MAX_SIZE. This would result in all tests failing. Since the md alg for all of these funtions are SHA256, we can use mbedtls functions to get
the required length of a SHA256 digest (32 bytes). Then that number can be used for allocating the
hash buffer.
Signed-off-by: Nick Child <nick.child@ibm.com >
2021-06-29 09:31:06 -04:00
e4b7499f74
Refactor handlibg of the key usage flags
...
Move implicit usage flags handling to the StorageKey class.
Create a subclass for test case data.
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-29 15:29:24 +02:00
7b302089b1
Update key policy testing test cases
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-29 11:08:47 +02:00
5eca4f2bb5
Rename test cases
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-29 11:07:34 +02:00
659af9e2f3
Remove unneeded test case parameter
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-29 11:06:16 +02:00
805c735a8b
Move key type validation to crypto_knowledge
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 21:36:58 +02:00
5ea30377d3
Refactor key generation
...
Remove the key builder and use iterator instead of lists.
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 21:36:58 +02:00
acfcc18697
Rename variables and funcions
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 19:39:31 +02:00
e84d321317
Use string in dict instead of Expr object
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 16:54:11 +02:00
4781263704
Remove unnecessary test cases
...
It is enough only one test case for a key type, algorithm pair when
testing the implicit usage flags.
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 16:41:36 +02:00
927742ec71
Add better name for variables
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 16:41:35 +02:00
705c452fd0
Simplify code
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 16:41:35 +02:00
79df41dfca
Remove unneeded test case parameter
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 15:37:36 +02:00
58e510f201
Simplify test function
...
Use the updated usage flags as expected.
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 15:37:36 +02:00
ff03fd6213
Rename function to conform to the library
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 15:37:36 +02:00
7907be3f32
Give better name for test cases
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 15:37:36 +02:00
7d2ec9a223
Fix generated file modification
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 15:28:36 +02:00
bce8527698
Fix test case duplication
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 15:28:36 +02:00
b92d61b7e6
Fix pylint issues
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 15:28:36 +02:00
de25402300
Fix tests
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 15:28:36 +02:00
044fefcdfb
Add test case generation for usage extensions when loading keys
...
Add test cases validating that if a stored key only had the hash policy,
then after loading it psa_get_key_attributes reports that it also has the
message policy, and the key can be used with message functions.
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 15:28:36 +02:00
15c1f03f78
Add key usage policy extension support for key generation
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 15:28:34 +02:00
4d9fb73c99
Use different subslasses for the test data files
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 15:27:55 +02:00
8b0c91c91f
Create a function for gather all the keys.
...
Prepare for using subclasses.
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 15:27:55 +02:00
d71659f447
Extend description generation
...
Add an extra optional parameter to generate a more detailed description
for test cases.
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 15:27:55 +02:00
0996080652
Use builder method pattern to generate a key
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-28 15:27:49 +02:00
9ac4847a5d
Unify multipart cipher operation tester functions
...
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com >
2021-06-25 18:30:38 +02:00
78c601b529
Merge pull request #4717 from daverodgman/psa_cipher_and_mac_abort_on_error_2.x
...
Backport 2.x: Psa cipher and mac abort on error
2021-06-25 15:39:43 +01:00
