[Cryptech-Commits] [sw/stm32] 03/03: Merge branch 'ft-ks_flash'

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

fredrik at thulin.net pushed a commit to branch master
in repository sw/stm32.

commit ad8efa487536158673d8e1a95b43aad8ef4762fe
Merge: 1865d6d 76a0f70
Author: Fredrik Thulin <fredrik at thulin.net>
AuthorDate: Fri Jun 24 13:13:56 2016 +0200

    Merge branch 'ft-ks_flash'

 projects/hsm/Makefile         |   9 +-
 projects/hsm/mgmt-cli.c       |   4 +
 projects/hsm/mgmt-keystore.c  | 286 ++++++++++++++++++++++++++++++++++++++++++
 projects/hsm/mgmt-keystore.h  |  43 +++++++
 projects/hsm/mgmt-masterkey.c | 209 ++++++++++++++++++++++++++++++
 projects/hsm/mgmt-masterkey.h |  43 +++++++
 6 files changed, 593 insertions(+), 1 deletion(-)