aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Becker <hanno.becker@arm.com>2018-11-23 12:48:22 +0000
committerJaeden Amero <jaeden@patater.com>2018-11-23 13:24:36 +0000
commite1089830af424b70ee410608038522d3ad0be41b (patch)
treeac689e33869d00238d1d063edd849f6eaed11846
parent3441d2e4a481e8aa4a862affbfd8146f0a3a0863 (diff)
downloadmbedtls-archive/development-psa-proposed-2.zip
mbedtls-archive/development-psa-proposed-2.tar.gz
mbedtls-archive/development-psa-proposed-2.tar.bz2
Temporarily update crypto-submodule target brancharchive/development-psa-proposed-2
This is a temporary commit to allow us to test this proposed branch against the sibling proposed branch on mbedtls-psa.
-rw-r--r--.gitmodules2
m---------crypto20
2 files changed, 1 insertions, 21 deletions
diff --git a/.gitmodules b/.gitmodules
index d25c9a6..3490a17 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
[submodule "crypto"]
path = crypto
url = git@github.com:ARMmbed/mbedtls-psa.git
- branch = feature-psa
+ branch = feature-psa-tls-integration-proposed
diff --git a/crypto b/crypto
-Subproject dbb83ac5f7b96077b21fc9fe72b2687986acf96
+Subproject 76cbe271b351d9e74efbd11872d6b244b2ed835