[pkg-opensc-commit] [pkcs11-helper] 02/06: Merge tag 'upstream/1.11'

[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 c1f9a333caabf4239d02d5df3795242b4ad4f98e
Merge: 99929ca ab6f62a
Author: Eric Dorland <eric at debian.org>
Date:   Sat Nov 16 14:59:03 2013 -0500

    Merge tag 'upstream/1.11'
    
    Upstream version 1.11

 ChangeLog                                       |   6 +
 configure.ac                                    |  54 +-
 include/pkcs11-helper-1.0/pkcs11h-certificate.h |   4 +-
 include/pkcs11-helper-1.0/pkcs11h-core.h        |   4 +-
 include/pkcs11-helper-1.0/pkcs11h-openssl.h     |  10 +
 lib/Makefile.am                                 |   3 +-
 lib/_pkcs11h-core.h                             |   2 +-
 lib/_pkcs11h-crypto-cryptoapi.c                 |   4 +-
 lib/_pkcs11h-crypto-gnutls.c                    |   2 +-
 lib/_pkcs11h-openssl.h                          |  70 ++
 lib/openssl.exports                             |   1 +
 lib/pkcs11h-certificate.c                       |  54 +-
 lib/pkcs11h-core.c                              |  41 +-
 lib/pkcs11h-data.c                              |   8 +-
 lib/pkcs11h-openssl.c                           | 859 +++++++++++++++++++-----
 lib/pkcs11h-session.c                           |  20 +-
 lib/pkcs11h-slotevent.c                         |  18 +-
 lib/pkcs11h-threading.c                         |   8 +-
 lib/pkcs11h-token.c                             |  14 +-
 lib/pkcs11h-util.c                              |   4 +-
 lib/token.exports                               |   1 +
 tests/test-certificate/test-certificate.c       |   4 +-
 22 files changed, 931 insertions(+), 260 deletions(-)

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