tree c9f0bbb7df01f0228a8f312b98346f992d25aee8
parent c63b6ba7548ae1c4ba6a7a224ca8daf556df3808
parent f0c9dd37d2b16a3d6e1e612d8a7ccf9ff208ae1a
author Gilles Peskine <Gilles.Peskine@arm.com> 1525100810 +0200
committer itayzafrir <itay.zafrir@arm.com> 1536138643 +0300

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).