[gnome-keyring: 10/10] Merge branch 'unlock-objects'

[Stefan Walter <stefw src gnome org>]

commit a957c0ed1fbf61d355e8d0eed8fdfac969ec4e37
Merge: 40a9f2a... 5baf704...
Author: Stef Walter <stef memberwebs com>
Date:   Sun Jul 19 19:29:05 2009 +0000

    Merge branch 'unlock-objects'

 daemon/pkcs11/gkr-pkcs11-auth-ep.c             |  414 ++----------------------
 daemon/pkcs11/gkr-pkcs11-auth.c                |  167 ++---------
 daemon/pkcs11/gkr-pkcs11-auth.h                |   16 +-
 pkcs11/gck/Makefile.am                         |    1 +
 pkcs11/gck/gck-attributes.c                    |   17 +
 pkcs11/gck/gck-attributes.h                    |    5 +-
 pkcs11/gck/gck-authenticator.c                 |  402 +++++++++++++++++++++++
 pkcs11/gck/gck-authenticator.h                 |   77 +++++
 pkcs11/gck/gck-certificate-key.c               |   10 +-
 pkcs11/gck/gck-certificate-key.h               |    3 +-
 pkcs11/gck/gck-certificate-trust.c             |   18 +-
 pkcs11/gck/gck-certificate-trust.h             |    3 +-
 pkcs11/gck/gck-certificate.c                   |   11 +-
 pkcs11/gck/gck-key.c                           |    8 +-
 pkcs11/gck/gck-key.h                           |    5 +-
 pkcs11/gck/gck-login.c                         |    1 +
 pkcs11/gck/gck-manager.c                       |   15 +-
 pkcs11/gck/gck-module.c                        |  108 ++++++-
 pkcs11/gck/gck-object.c                        |  300 +++++++++++------
 pkcs11/gck/gck-object.h                        |   36 ++-
 pkcs11/gck/gck-private-key.c                   |   95 ++++--
 pkcs11/gck/gck-private-key.h                   |    9 +-
 pkcs11/gck/gck-public-key.c                    |   10 +-
 pkcs11/gck/gck-session.c                       |  149 +++++++--
 pkcs11/gck/gck-session.h                       |    8 +
 pkcs11/gck/gck-sexp.c                          |    3 +-
 pkcs11/gck/gck-sexp.h                          |    2 +-
 pkcs11/gck/gck-types.h                         |    1 +
 pkcs11/gck/gck-util.c                          |   11 +
 pkcs11/gck/gck-util.h                          |    2 +
 pkcs11/gck/tests/Makefile.am                   |    3 +
 pkcs11/gck/tests/mock-locked-object.c          |   88 +++++
 pkcs11/gck/tests/mock-locked-object.h          |   52 +++
 pkcs11/gck/tests/test-module.c                 |   34 ++-
 pkcs11/gck/tests/test-module.h                 |   10 +-
 pkcs11/gck/tests/unit-test-attributes.c        |   27 ++
 pkcs11/gck/tests/unit-test-authenticator.c     |  254 +++++++++++++++
 pkcs11/gck/tests/unit-test-memory-store.c      |   11 +-
 pkcs11/gck/tests/unit-test-object.c            |  245 ++++++++++++++
 pkcs11/gck/tests/unit-test-store.c             |    6 +
 pkcs11/gck/tests/unit-test-timer.c             |    8 +-
 pkcs11/pkcs11g.h                               |   25 +-
 pkcs11/plex-layer/gck-plex-layer.c             |  123 ++------
 pkcs11/roots-store/gck-roots-certificate.c     |   24 ++-
 pkcs11/roots-store/gck-roots-certificate.h     |    3 +-
 pkcs11/roots-store/gck-roots-module.c          |    2 +-
 pkcs11/ssh-agent/gck-ssh-agent-ops.c           |   32 ++-
 pkcs11/ssh-store/gck-ssh-module.c              |   10 +-
 pkcs11/ssh-store/gck-ssh-private-key.c         |   55 +++-
 pkcs11/ssh-store/gck-ssh-private-key.h         |    3 +-
 pkcs11/ssh-store/gck-ssh-public-key.c          |    9 +-
 pkcs11/ssh-store/gck-ssh-public-key.h          |    3 +-
 pkcs11/ssh-store/tests/Makefile.am             |    4 +-
 pkcs11/ssh-store/tests/test-ssh-module.c       |  105 ++++++
 pkcs11/ssh-store/tests/test-ssh-module.h       |   43 +++
 pkcs11/ssh-store/tests/unit-test-private-key.c |   97 ++++++
 pkcs11/user-store/gck-user-module.c            |    2 +-
 pkcs11/user-store/gck-user-private-key.c       |   12 +-
 pkcs11/user-store/gck-user-public-key.c        |    4 +-
 pkcs11/user-store/gck-user-storage.c           |   49 ++-
 pkcs11/user-store/gck-user-storage.h           |    2 +-
 pkcs11/user-store/tests/.gitignore             |    2 +
 pkcs11/user-store/tests/Makefile.am            |    7 +
 pkcs11/user-store/tests/p11-tests.conf         |    2 +
 64 files changed, 2289 insertions(+), 974 deletions(-)
---