[pkg-opensc-commit] [pkcs11-helper] 251/253: Merge tag 'upstream/1.21'

[Eric Dorland]

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

eric pushed a commit to branch master
in repository pkcs11-helper.

commit 9dc89ad6b1ab842c1641745cec1ab846aff59858
Merge: 20d06fa 071d31f
Author: Eric Dorland <eric at debian.org>
Date:   Fri Jan 6 17:34:35 2017 -0500

    Merge tag 'upstream/1.21'
    
    Upstream version 1.21

 .gitattributes                                     |   1 -
 .gitignore                                         |  22 +-
 ChangeLog                                          |  13 +-
 configure.ac                                       |  95 +++++---
 include/pkcs11-helper-1.0/pkcs11h-core.h           |   4 +-
 include/pkcs11-helper-1.0/pkcs11h-engines.h        |   4 +-
 lib/Makefile.am                                    |   4 +-
 ...crypto-polarssl.c => _pkcs11h-crypto-mbedtls.c} |  75 +++----
 lib/pkcs11h-certificate.c                          |  19 +-
 lib/pkcs11h-core.c                                 |   4 +-
 lib/pkcs11h-crypto.c                               |  18 +-
 lib/pkcs11h-openssl.c                              | 238 +++++++++++++++++++--
 tests/test-basic/Makefile.am                       |   2 +-
 tests/test-certificate/Makefile.am                 |   2 +-
 tests/test-slotevent/Makefile.am                   |   2 +-
 15 files changed, 383 insertions(+), 120 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git