[Cryptech-Commits] [sw/libhal] 01/01: Merge branch 'master' into ksng

[git at cryptech.is]

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

sra at hactrn.net pushed a commit to branch ksng
in repository sw/libhal.

commit 3bf4f4a1fae7040d743005a75bcbb8b6cd2acc28
Merge: 7dce4d6 1295f7e
Author: Rob Austein <sra at hactrn.net>
AuthorDate: Mon Dec 19 15:46:39 2016 -0500

    Merge branch 'master' into ksng

 Makefile        |   5 +-
 ecdsa.c         |   3 +-
 hash.c          | 145 +++++++++++++++++++++++++++++++++++++++++---------------
 pbkdf2.c        |   9 ----
 rpc_client.c    |   2 +-
 rsa.c           |   2 +-
 slip.c          |  46 ++++++++++--------
 slip_internal.h |   1 +
 8 files changed, 141 insertions(+), 72 deletions(-)