[Cryptech-Commits] [sw/stm32] 01/03: Merge branch 'master' into js_keywrap

[git at cryptech.is]

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

paul at psgd.org pushed a commit to branch auto_zeroise
in repository sw/stm32.

commit e60a67af1145e17f567c351e081c8546fbdcf6c8
Merge: 07af68c e203f79
Author: Paul Selkirk <paul at psgd.org>
AuthorDate: Tue Apr 9 17:45:13 2019 -0400

    Merge branch 'master' into js_keywrap

 libraries/libcli/Makefile                          |   3 +-
 libraries/libprof/Makefile                         |   6 +-
 libraries/libprof/gmon.c                           | 427 +++++++++------------
 libraries/libprof/gmon.h                           |  57 +--
 memfunc.c => libraries/libprof/memfunc.c           |  52 ++-
 libraries/libprof/profil.c                         |  96 -----
 libraries/libprof/profil.h                         |  60 ---
 libraries/libtfm/Makefile                          |   2 +-
 .../TARGET_CRYPTECH_ALPHA/stm32f4xx_it.c           |   7 -
 projects/board-test/fmc-perf.c                     |  20 +-
 projects/board-test/fmc-probe.c                    |   5 +-
 projects/board-test/fmc-test.c                     |  16 +-
 projects/cli-test/test-fmc.c                       |  12 +-
 projects/hsm/Makefile                              |   1 -
 projects/hsm/hsm.c                                 |  18 +-
 projects/hsm/mgmt-keystore.c                       |  35 +-
 projects/hsm/mgmt-masterkey.c                      |  90 +++--
 projects/hsm/mgmt-task.c                           |   6 +
 projects/libhal-test/main.c                        |   1 +
 stm-fmc.c                                          |  39 +-
 stm-fmc.h                                          |  61 +--
 21 files changed, 409 insertions(+), 605 deletions(-)