-
Notifications
You must be signed in to change notification settings - Fork 96
Merge development-psa from mbedTLS into development #42
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
AndrzejKurek
wants to merge
714
commits into
ARMmbed:development
from
AndrzejKurek:development-merged-dev-psa-409fdae
Closed
Merge development-psa from mbedTLS into development #42
AndrzejKurek
wants to merge
714
commits into
ARMmbed:development
from
AndrzejKurek:development-merged-dev-psa-409fdae
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The acceptance of NULL should be tested regardless of the setting of MBEDTLS_CHECK_PARAMS.
The test that mbedtls_aria_free() accepts NULL parameters can be performed even if MBEDTLS_CHECK_PARAMS is unset, but was previously included in the test case aria_invalid_params() which is only executed if MBEDTLS_CHECK_PARAMS is set.
We allow a NULL input buffer if the input length is zero, but we don't test it. As long as that's the case, we shouldn't promise to support it.
It should be tested regardless of the setting of MBEDTLS_CHECK_PARAMS.
It seems to work, but we don't test it currently, so we shouldn't promise it.
free() functions are documented as no-ops on NULL. Implement and test this correctly.
A 0-length buffer for the key is a legitimate edge case. Ensure that it works, even with buf=NULL. Document the key and keylen parameters. There are already test cases for parsing an empty buffer. A subsequent commit will add tests for writing to an empty buffer.
This needs a real key to test properly.
Add information about mbed TLS 2.15.0 and mbed TLS 2.15.1.
Already checked by parameter validation macros
Introduce MBEDTLS_PSA_HAS_ITS_IO, MBEDTLS_PSA_CRYPTO_SPM, MBEDTLS_PSA_CRYPTO_STORAGE_C, MBEDTLS_PSA_CRYPTO_STORAGE_FILE_C, MBEDTLS_PSA_CRYPTO_STORAGE_ITS_C. Disable crypto storage by default.
I've performed a merge of development into this PR (without conflicts) to include Hanno's changes to public key format adaption code. |
Adjust crypto submodule version to use new, forked crypto version accordingly.
Manually removed submodule-related changes
I've merged the Mbed-TLS/mbedtls#2395 branch into the branch used in this PR, to have the tests passing on MbedTLS side. |
Jaeden has created #51 which supersedes this. |
gilles-peskine-arm
pushed a commit
to gilles-peskine-arm/mbed-crypto
that referenced
this pull request
May 22, 2019
The fact that self-signed end-entity certs can be explicitly trusted by putting them in the CA list even if they don't have the CA bit was not documented though it's intentional, and tested by "Certificate verification ARMmbed#73 (selfsigned trusted without CA bit)" in test_suite_x509parse.data It is unclear to me whether the restriction that explicitly trusted end-entity certs must be self-signed is a good one. However, it seems intentional as it is tested in tests ARMmbed#42 and ARMmbed#43, so I'm not touching it for now.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
DO NOT MERGE
The PR is not intended to be merged (yet). Usually used for a review of worked in progress.
enhancement
New feature or request
needs: ci
Needs a passing full CI run
needs: design review
needs: review
The pull request is ready for review. This generally means that it has no known issues.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR supersedes #40.
It merges development_psa from mbedtls repository (commit 409fdae) into development.
The aim is to have a sibling PR to the big merge happening here: Mbed-TLS/mbedtls#2395 , to have the tests pass on the TLS side. Then, an updated PR with development -> mbed-crypto merge will be created.
I have performed the following tests:
make test
(passed);ssl-opt.sh
(passed).Following conflicts have been resolved:
Manual changes: