Andrzej Kurek
c470b6b021
Merge development commit 8e76332 into development-psa
...
Additional changes to temporarily enable running tests:
ssl_srv.c and test_suite_ecdh use mbedtls_ecp_group_load instead of
mbedtls_ecdh_setup
test_suite_ctr_drbg uses mbedtls_ctr_drbg_update instead of
mbedtls_ctr_drbg_update_ret
2019-01-31 08:20:20 -05:00
Jaeden Amero
7b9575c654
Merge remote-tracking branch 'origin/pr/2376' into development-psa
...
Resolve conflict in updating crypto submodule by manually pointing the
submodule to 2169a5e54d
2019-01-28 12:28:49 +00:00
Hanno Becker
2192c27720
Update crypto submodule to sibling PR
2019-01-25 15:18:46 +00:00
Hanno Becker
f99c2ec9d7
PSA: Adapt pk.c, pk_wrap.c, cipher.c to new key policy init API
2019-01-25 14:36:07 +00:00
Hanno Becker
e34f636f8d
PSA: Adapt cipher.c, pk.c, pk_wrap.c to new key slot allocation API
2019-01-25 14:31:06 +00:00
Hanno Becker
32809e8c70
PSA: Adapt ssl_server2 to modified key allocation API
2019-01-25 14:31:00 +00:00
Hanno Becker
9bd8842c77
PSA: Adapt ssl_server2 to hew key policy initialization API
2019-01-25 14:27:01 +00:00
Hanno Becker
1387124c89
PSA: Adapt ssl_client2 to new key policy initialization API
2019-01-25 14:26:26 +00:00
Hanno Becker
37519ea5f8
PSA: Adapt ssl_client2 to modified key slot allocation API
2019-01-25 14:26:01 +00:00
Hanno Becker
8d865dfe37
PSA: Adapt PK test suite to new key policy initialization API
2019-01-25 14:25:16 +00:00
Hanno Becker
353295ac70
PSA: Adapt PK test suite to modified key slot allocation mechanism
2019-01-25 14:25:00 +00:00
Hanno Becker
4a2949ba29
Update crypto submodule
...
Includes PRs #6 , #18 , #19 .
2019-01-25 14:23:06 +00:00
Andrzej Kurek
4b5686537f
Update crypto version to use new key allocation
2019-01-25 03:16:49 -05:00
Andrzej Kurek
4687ea0271
Revert .gitmodules update - point back to development
2019-01-25 03:15:37 -05:00
Andrzej Kurek
dae1768de7
Update .gitmodules file to point to a sibling branch in mbed-crypto
2019-01-23 06:38:45 -05:00
Simon Butcher
d253bb49e7
Merge remote-tracking branch 'public/pr/2352' into development-psa
2019-01-23 09:43:50 +01:00
Andrzej Kurek
c847d9ff8d
Change PSA submodule url
2019-01-22 07:13:10 -05:00
Andrzej Kurek
7deba18576
Remove unnecessary "#" sign from PSA macros
2019-01-22 06:29:45 -05:00
Andrzej Kurek
e57c1ea80a
Switch to the public crypto submodule url
2019-01-15 09:52:56 -05:00
Andrzej Kurek
c0a1be08a0
Fix indentation of documentation
2019-01-15 03:33:35 -05:00
Andrzej Kurek
62594a8b12
pk_wrap: pass curve size instead of a larger size of the exported key
...
Whitespace fixes
2019-01-14 05:14:18 -05:00
Andrzej Kurek
93a38a3101
pk: wrap curve_id before passing it to PSA
...
Add a helper function in PSA utils
2019-01-14 05:09:46 -05:00
Andrzej Kurek
a62a58ece5
cipher: fixed key ownership scope
...
Indicate key ownership earlier, so that it gets destroyed on faulty policy setting.
2019-01-14 05:01:28 -05:00
Simon Butcher
02b453e5b8
Update crypto submodule for PSA PR#229
...
Update the crypto submodule to include the PR#229 'storage: Correct typo of
PSA_PS_ERROR_OFFSET' which has a corresponding fix in Mbed OS 5.11, and is
required for Mbed OS to build.
2019-01-10 15:17:31 +00:00
Andrzej Kurek
2349c4db88
Adapt to the new key allocation mechanism
2019-01-08 09:36:01 -05:00
Andrzej Kurek
a49a94a536
Updating PSA submodule to commit 9e0feff
2019-01-04 05:15:20 -05:00
Jaeden Amero
3e24c26899
Merge remote-tracking branch 'upstream-public/pr/2218' into development-psa
2018-12-06 16:15:44 +00:00
Jaeden Amero
5dfca1e1bd
Update library version to 2.15.1
2018-12-01 18:44:29 +00:00
Simon Butcher
41f9519530
Update ChangeLog for Crypto submodule update
2018-12-01 18:44:29 +00:00
Gilles Peskine
7d6f48a058
Update crypto submodule with compilation guard fixes for CCM and GCM
2018-11-28 18:42:22 +01:00
Simon Butcher
5f62a5731c
Merge remote-tracking branch 'public/pr/2226' into development-psa-proposed
2018-11-23 22:11:37 +00:00
Jaeden Amero
3aad836e36
Update crypto submodule to mbedcrypto-0.1.0b
2018-11-23 21:39:32 +00:00
Simon Butcher
60ee838a8a
Merge remote-tracking branch 'public/pr/2224' into development-psa-proposed
2018-11-23 21:18:32 +00:00
Jaeden Amero
bb225f7914
Merge remote-tracking branch 'upstream-public/pr/2225' into development-psa-proposed
2018-11-23 17:37:04 +00:00
Jaeden Amero
720d9a6056
psa: Update submodule to include CMake fix
...
CMake with ASan would fail when building crypto as a submodule. The latest
version of the submodule has a fix for this error.
2018-11-23 16:06:29 +00:00
Jaeden Amero
b1c48d3d83
psa: Include PSA headers for tests and programs
...
Programs and tests need to be able to use PSA header files when
USE_CRYPTO_SUBMODULE and MBEDTLS_USE_PSA_CRYPTO are set. Add the crypto
submodule include folder, which contains psa headers, after the main
include folder so that psa headers can be found and crypto submodule
headers don't take precedence over mbedtls headers.
2018-11-23 15:22:44 +00:00
Hanno Becker
ee81756a51
Fix wrong cmake invocation in all.sh testing MBEDTLS_USE_PSA_CRYPTO
...
It should be `cmake -D VAR=1` instead of `cmake -D VAR`.
2018-11-23 15:08:32 +00:00
Simon Butcher
ebeb6cb446
Update library version to 2.15.0
2018-11-23 14:18:15 +00:00
Hanno Becker
46b79c14ad
Merge remote-tracking branch 'remote_jaeden/dev/patater/avoid-check-files-todo-dev' into development-psa-proposed
2018-11-23 13:40:44 +00:00
Hanno Becker
cdb31172e7
Temporarily update crypto-submodule target branch
...
This is a temporary commit to allow us to test this
proposed branch against the sibling proposed branch
on mbedtls-psa.
2018-11-23 13:38:38 +00:00
Jaeden Amero
80a23a5bc4
check-files: Don't check same-named files
...
The check-files script contains the strings "TODO" and "todo" in order to
search for files that contain TODO items. So, any check-files script would
need to be excluded from the list of files that gets checked for "TODO".
Normally, the script excludes itself from checks, but with the addition of
the crypto submodule, there is another copy of the script present from the
project root. We must avoid checking check-files scripts for TODO items.
This also helps if you run check-files from another working tree in your
working tree.
2018-11-23 13:14:38 +00:00
Hanno Becker
3441d2e4a4
Merge branch 'iotssl-2597-psa-hashing-x509' into development-psa-proposed
2018-11-23 11:42:07 +00:00
Hanno Becker
4ae8b497c0
Merge branch 'iotssl-2578-psa-sig-verification' into development-psa-proposed
2018-11-23 11:37:00 +00:00
Hanno Becker
a0a96a0c56
Merge branch 'psa_cipher_integration' into development-psa-proposed
2018-11-23 11:26:57 +00:00
Hanno Becker
f8b5f27bce
Merge branch 'psa_cipher' into development-psa-proposed
2018-11-23 11:18:02 +00:00
Hanno Becker
485529952f
Merge branch 'opaque_psk_implementation' into development-psa-proposed
2018-11-23 11:12:38 +00:00
Hanno Becker
b345ae64f1
Merge branch 'iotssl-2596-opaque-csr-creation' into development-psa-proposed
2018-11-23 11:05:04 +00:00
Hanno Becker
ee618f7241
Merge branch 'iotssl-2574-pk-opaque-tls' into development-psa-proposed
2018-11-23 10:31:00 +00:00
Hanno Becker
9aa921f336
Merge branch 'iotssl-2580-pk-opaque-psa' into development-psa-proposed
2018-11-23 10:17:36 +00:00
Andrzej Kurek
b7f3ac6504
pkwrite: add an explicit cast to size_t
2018-11-22 12:05:08 -05:00
