Finish side-porting commits from mbedtls-restricted that missed the split #318

Merged

gilles-peskine-arm merged 2 commits from prr_573-remainder-crypto into development

2019-11-13 08:31:35 -06:00

gilles-peskine-arm commented

2019-11-08 11:51:27 -06:00

(Migrated from github.com)

We're fixing this through 3 pull requests:

https://github.com/ARMmbed/mbed-crypto/pull/314, a straightforward port of #r503.
https://github.com/ARMmbed/mbed-crypto/pull/315, which fixes the same issue as #r573 in a more robust way.
The present PR has the bits of #r573 that are not covered by #315. Commit by commit:
- c4638cc6401a88124f9f54d60439eda6d2368641: entirely superseded by #315.
- 5dbe7caf2eeea340ad3a38b0280c772562d4edd4: cherry-picked here.
- 49bd3e897e4ff7dfc1c09351213b3e22470abc7e: superseded by #315 for pk.h, cherry-picked here for rsa.h.
- c1955559ad7bab3be5666d4687269e7d2ddc1edd and 69969ef088359b225eb955a40a8b842679fcc6e9: not useful because #315 adds unit tests which, when run with config-suite-b.h (through test-ref-configs.pl), provide the desired coverage, namely having some test fail if the maximum signature size is not calculated correctly, especially in a configuration where RSA is disabled and the smallest MPI is just large enough for ECC.

(#rNNN are private links.)

This pull request deliberately omits the addition of a run of programs/pkey/pk_sign to all.sh. While this would be desirable, it wasn't in scope of #r573, and was only added there as a non-regression test which is now performed through unit tests. A better approach to smoke-test sample programs would be through demo scripts as in https://github.com/ARMmbed/mbedtls/pull/2698.

Goal of this PR: all the commits that had gone missing are now present in Mbed Crypto.

Internal ref: IOTCRYPT-969

When we split Mbed Crypto from Mbed TLS, we missed the last few commits in the restricted branch of Mbed TLS which were quarantined security fixes. These commits are present in the git history of Mbed TLS, but their effect was cancelled by the removal of crypto files, and the commits never appeared in Mbed Crypto. We're fixing this through 3 pull requests: * https://github.com/ARMmbed/mbed-crypto/pull/314, a straightforward port of [#r503](https://github.com/ARMmbed/mbedtls-restricted/pull/503). * https://github.com/ARMmbed/mbed-crypto/pull/315, which fixes the same issue as [#r573](https://github.com/ARMmbed/mbedtls-restricted/pull/573) in a more robust way. * The present PR has the bits of [#r573](https://github.com/ARMmbed/mbedtls-restricted/pull/573) that are not covered by #315. Commit by commit: * [c4638cc6401a88124f9f54d60439eda6d2368641](https://github.com/ARMmbed/mbedtls/commit/c4638cc6401a88124f9f54d60439eda6d2368641): entirely superseded by #315. * [5dbe7caf2eeea340ad3a38b0280c772562d4edd4](https://github.com/ARMmbed/mbedtls/commit/5dbe7caf2eeea340ad3a38b0280c772562d4edd4): cherry-picked here. * [49bd3e897e4ff7dfc1c09351213b3e22470abc7e](https://github.com/ARMmbed/mbedtls/commit/49bd3e897e4ff7dfc1c09351213b3e22470abc7e): superseded by #315 for `pk.h`, cherry-picked here for `rsa.h`. * [c1955559ad7bab3be5666d4687269e7d2ddc1edd](https://github.com/ARMmbed/mbedtls/commit/c1955559ad7bab3be5666d4687269e7d2ddc1edd) and [69969ef088359b225eb955a40a8b842679fcc6e9](https://github.com/ARMmbed/mbedtls/commit/69969ef088359b225eb955a40a8b842679fcc6e9): not useful because #315 adds unit tests which, when run with `config-suite-b.h` (through `test-ref-configs.pl`), provide the desired coverage, namely having some test fail if the maximum signature size is not calculated correctly, especially in a configuration where RSA is disabled and the smallest MPI is just large enough for ECC. (`#rNNN` are private links.) This pull request deliberately omits the addition of a run of `programs/pkey/pk_sign` to `all.sh`. While this would be desirable, it wasn't in scope of #r573, and was only added there as a non-regression test which is now performed through unit tests. A better approach to smoke-test sample programs would be through demo scripts as in https://github.com/ARMmbed/mbedtls/pull/2698. **Goal of this PR: all the commits that had gone missing are now present in Mbed Crypto.** Internal ref: IOTCRYPT-969

AndrzejKurek (Migrated from github.com) approved these changes

2019-11-13 07:23:34 -06:00

dgreen-arm (Migrated from github.com) approved these changes

2019-11-13 08:28:49 -06:00