Gilles Peskine a0655c3501 Merge remote-tracking branch 'psa/pr/13' into feature-psa ... Conflicts: library/psa_crypto.c tests/suites/test_suite_psa_crypto.data tests/suites/test_suite_psa_crypto.function All the conflicts are concurrent additions where the order doesn't matter. I put the code from feature-psa (key policy) before the code from PR #13 (key lifetime).		2018-09-05 12:10:43 +03:00
..
data_files	Merge remote-tracking branch 'upstream-public/pr/1379' into development-proposed	2018-03-29 10:57:57 +01:00
git-scripts	Add check-files.py to pre-push.sh	2018-05-21 11:41:18 +01:00
scripts	Merge remote-tracking branch 'public/pr/1951' into development	2018-08-30 00:56:56 +01:00
suites	Merge remote-tracking branch 'psa/pr/13' into feature-psa	2018-09-05 12:10:43 +03:00
.gitignore
CMakeLists.txt	Fix generate_test_code.py argument --helpers-file in CMakeLists.txt	2018-08-06 11:42:56 +01:00
compat.sh	Add ChachaPoly ciphersuites to compat.sh	2018-06-19 13:16:30 +02:00
Descriptions.txt
Makefile	Wildcard possible targets and document	2018-08-06 11:42:56 +01:00
ssl-opt.sh	Merge remote-tracking branch 'public/pr/1988' into development	2018-08-30 00:57:28 +01:00