[gnome-keyring: 249/249] Merge branch 'dbus-api'



commit 31dd65410484ae760d77725697b6708985391466
Merge: 9ea4667... cbb8aad...
Author: Stef Walter <stef memberwebs com>
Date:   Mon Dec 14 15:00:29 2009 +0000

    Merge branch 'dbus-api'

 .gitignore                                         |   29 +-
 configure.in                                       |   34 +-
 daemon/.gitignore                                  |   12 +-
 daemon/Makefile.am                                 |    6 +-
 daemon/data/Makefile.am                            |   14 +-
 daemon/data/introspect-collection.xml              |   59 +
 daemon/data/introspect-item.xml                    |   46 +
 daemon/data/introspect-prompt.xml                  |   23 +
 daemon/data/introspect-service.xml                 |   93 ++
 daemon/data/introspect-session.xml                 |   16 +
 daemon/dbus/Makefile.am                            |   38 +
 daemon/dbus/gkd-dbus-environment.c                 |  114 ++
 daemon/dbus/gkd-dbus-private.h                     |   46 +
 daemon/dbus/gkd-dbus-secrets.c                     |  122 ++
 daemon/dbus/gkd-dbus-service.c                     |  162 +++
 daemon/dbus/gkd-dbus-session.c                     |  226 ++++
 daemon/dbus/gkd-dbus-util.c                        |   87 ++
 daemon/dbus/gkd-dbus-util.h                        |   39 +
 daemon/dbus/gkd-dbus.c                             |  104 ++
 daemon/dbus/gkd-dbus.h                             |   29 +
 daemon/dbus/gkd-secret-change.c                    |  313 +++++
 daemon/dbus/gkd-secret-change.h                    |   56 +
 daemon/dbus/gkd-secret-create.c                    |  327 +++++
 daemon/dbus/gkd-secret-create.h                    |   60 +
 daemon/dbus/gkd-secret-error.c                     |   48 +
 daemon/dbus/gkd-secret-error.h                     |   34 +
 daemon/dbus/gkd-secret-lock.c                      |   67 +
 daemon/dbus/gkd-secret-lock.h                      |   34 +
 daemon/dbus/gkd-secret-objects.c                   | 1332 ++++++++++++++++++++
 daemon/dbus/gkd-secret-objects.h                   |   84 ++
 daemon/dbus/gkd-secret-prompt.c                    |  511 ++++++++
 daemon/dbus/gkd-secret-prompt.h                    |   85 ++
 daemon/dbus/gkd-secret-property.c                  |  559 ++++++++
 daemon/dbus/gkd-secret-property.h                  |   50 +
 daemon/dbus/gkd-secret-secret.c                    |  183 +++
 daemon/dbus/gkd-secret-secret.h                    |   59 +
 daemon/dbus/gkd-secret-service.c                   | 1281 +++++++++++++++++++
 daemon/dbus/gkd-secret-service.h                   |   69 +
 daemon/dbus/gkd-secret-session.c                   |  735 +++++++++++
 daemon/dbus/gkd-secret-session.h                   |   84 ++
 daemon/dbus/gkd-secret-types.h                     |   61 +
 daemon/dbus/gkd-secret-unlock.c                    |  403 ++++++
 daemon/dbus/gkd-secret-unlock.h                    |   61 +
 daemon/dbus/gkd-secret-util.c                      |  149 +++
 daemon/dbus/gkd-secret-util.h                      |   39 +
 daemon/gkr-daemon-dbus.c                           |  462 -------
 daemon/gkr-daemon.c                                |   15 +-
 daemon/gkr-daemon.h                                |    2 -
 daemon/keyrings/tests/unit-test-keyring-file.c     |    6 +-
 daemon/pkcs11/gkr-pkcs11-auth-ep.c                 |   18 +-
 daemon/pkcs11/gkr-pkcs11-daemon.c                  |   14 +-
 daemon/pkcs11/gkr-pkcs11-daemon.h                  |    4 +
 daemon/prompt/Makefile.am                          |   74 ++
 daemon/prompt/gkd-prompt-marshal.list              |    1 +
 daemon/prompt/gkd-prompt-tool.c                    |  637 ++++++++++
 daemon/prompt/gkd-prompt-util.c                    |  222 ++++
 daemon/prompt/gkd-prompt-util.h                    |   49 +
 daemon/prompt/gkd-prompt.c                         |  999 +++++++++++++++
 daemon/prompt/gkd-prompt.h                         |  120 ++
 daemon/prompt/gkd-prompt.ui                        |  408 ++++++
 daemon/prompt/tests/Makefile.am                    |   14 +
 daemon/prompt/tests/test-data/prompt-empty         |    2 +
 daemon/prompt/tests/test-data/prompt-full          |   16 +
 daemon/prompt/tests/test-data/prompt-test          |    7 +
 daemon/prompt/tests/unit-test-util.c               |  136 ++
 daemon/util/gkr-daemon-async.c                     |    6 +
 daemon/util/gkr-daemon-util.c                      |  237 +----
 docs/reference/.gitignore                          |   15 +
 docs/reference/gcr/.gitignore                      |   17 -
 docs/reference/gnome-keyring/.gitignore            |   17 -
 docs/reference/gp11/.gitignore                     |   17 -
 egg/Makefile.am                                    |   25 +-
 egg/egg-asn1.h                                     |    3 +
 egg/egg-buffer.c                                   |   22 +-
 egg/egg-buffer.h                                   |   15 +-
 egg/egg-dh.c                                       |  359 ++++++
 egg/egg-dh.h                                       |   50 +
 egg/egg-mkdtemp.c                                  |  199 +++
 egg/egg-mkdtemp.h                                  |   27 +
 egg/egg-padding.c                                  |  302 +++++
 egg/egg-padding.h                                  |   88 ++
 egg/egg-secure-memory.c                            |   26 +-
 egg/egg-secure-memory.h                            |    2 +
 egg/egg-spawn.c                                    |  378 ++++++
 egg/egg-spawn.h                                    |   65 +
 egg/egg-unix-credentials.c                         |   27 +
 egg/egg-unix-credentials.h                         |    2 +
 egg/tests/Makefile.am                              |    3 +
 egg/tests/test-data/dh-params.pem                  |    5 +
 egg/tests/test-data/echo-script.sh                 |   11 +
 egg/tests/test-padding.c                           |  182 +++
 egg/tests/unit-test-asn1.c                         |    2 +-
 egg/tests/unit-test-dh.c                           |  172 +++
 egg/tests/unit-test-openssl.c                      |    2 +-
 egg/tests/unit-test-secmem.c                       |   31 +
 egg/tests/unit-test-spawn.c                        |  274 ++++
 gcr/gcr-importer.c                                 |    4 +-
 gcr/tests/unit-test-certificate.c                  |    2 +-
 gcr/tests/unit-test-parser.c                       |    4 +-
 gp11/gp11-attributes.c                             |   74 +-
 gp11/gp11-misc.c                                   |   83 ++
 gp11/gp11-object.c                                 |    5 +-
 gp11/gp11-session.c                                |  856 ++++++++++++-
 gp11/gp11-slot.c                                   |   20 +-
 gp11/gp11.h                                        |  178 ++--
 gp11/tests/Makefile.am                             |    1 +
 gp11/tests/gp11-test-module.c                      |  253 ++++-
 gp11/tests/gp11-test.h                             |   13 +
 gp11/tests/test-gp11-mechanism.c                   |   60 +
 gp11/tests/unit-test-gp11-crypto.c                 |  353 +++++-
 gp11/tests/unit-test-gp11-session.c                |    8 +-
 pkcs11/Makefile.am                                 |    1 +
 pkcs11/gck/Makefile.am                             |   21 +-
 pkcs11/gck/gck-aes-key.c                           |  266 ++++
 pkcs11/gck/gck-aes-key.h                           |   57 +
 pkcs11/gck/gck-aes-mechanism.c                     |  226 ++++
 pkcs11/gck/gck-aes-mechanism.h                     |   54 +
 pkcs11/gck/gck-attributes.c                        |   94 ++-
 pkcs11/gck/gck-attributes.h                        |   21 +-
 pkcs11/gck/gck-authenticator.c                     |  402 ------
 pkcs11/gck/gck-authenticator.h                     |   77 --
 pkcs11/gck/gck-certificate-key.c                   |    7 +-
 pkcs11/gck/gck-certificate-key.h                   |    7 +-
 pkcs11/gck/gck-certificate-trust.c                 |    5 +-
 pkcs11/gck/gck-certificate-trust.h                 |    1 +
 pkcs11/gck/gck-certificate.c                       |   41 +-
 pkcs11/gck/gck-certificate.h                       |    2 +-
 pkcs11/gck/gck-credential.c                        |  456 +++++++
 pkcs11/gck/gck-credential.h                        |   88 ++
 pkcs11/gck/gck-crypto.c                            |  900 ++++----------
 pkcs11/gck/gck-crypto.h                            |  213 ++--
 pkcs11/gck/gck-data-der.c                          |   50 +-
 pkcs11/gck/gck-data-file.c                         |   26 +-
 pkcs11/gck/gck-data-file.h                         |    6 +-
 pkcs11/gck/gck-dh-key.c                            |  155 +++
 pkcs11/gck/gck-dh-key.h                            |   59 +
 pkcs11/gck/gck-dh-mechanism.c                      |  270 ++++
 pkcs11/gck/gck-dh-mechanism.h                      |   52 +
 pkcs11/gck/gck-dh-private-key.c                    |  219 ++++
 pkcs11/gck/gck-dh-private-key.h                    |   59 +
 pkcs11/gck/gck-dh-public-key.c                     |  191 +++
 pkcs11/gck/gck-dh-public-key.h                     |   57 +
 pkcs11/gck/gck-factory.h                           |    8 +-
 pkcs11/gck/gck-key.h                               |   71 -
 pkcs11/gck/gck-login.c                             |  154 ---
 pkcs11/gck/gck-login.h                             |   56 -
 pkcs11/gck/gck-manager.c                           |   81 ++-
 pkcs11/gck/gck-manager.h                           |   21 +-
 pkcs11/gck/gck-marshal.list                        |    1 +
 pkcs11/gck/gck-mechanism-dsa.c                     |  144 +++
 pkcs11/gck/gck-mechanism-dsa.h                     |   49 +
 pkcs11/gck/gck-mechanism-rsa.c                     |  220 ++++
 pkcs11/gck/gck-mechanism-rsa.h                     |   67 +
 pkcs11/gck/gck-module-ep.h                         |    2 +-
 pkcs11/gck/gck-module.c                            |   88 +-
 pkcs11/gck/gck-module.h                            |    4 +-
 pkcs11/gck/gck-null-key.c                          |  130 ++
 pkcs11/gck/gck-null-key.h                          |   52 +
 pkcs11/gck/gck-null-mechanism.c                    |  153 +++
 pkcs11/gck/gck-null-mechanism.h                    |   55 +
 pkcs11/gck/gck-object.c                            |  204 +++-
 pkcs11/gck/gck-object.h                            |   33 +-
 pkcs11/gck/gck-private-key.h                       |   67 -
 .../{gck-private-key.c => gck-private-xsa-key.c}   |  333 +++---
 pkcs11/gck/gck-private-xsa-key.h                   |   67 +
 pkcs11/gck/gck-public-key.h                        |   59 -
 .../gck/{gck-public-key.c => gck-public-xsa-key.c} |  259 ++---
 pkcs11/gck/gck-public-xsa-key.h                    |   60 +
 pkcs11/gck/gck-secret-key.c                        |  160 +++
 pkcs11/gck/gck-secret-key.h                        |   51 +
 pkcs11/gck/gck-secret.c                            |  177 +++
 pkcs11/gck/gck-secret.h                            |   67 +
 pkcs11/gck/gck-serializable.c                      |    4 +-
 pkcs11/gck/gck-serializable.h                      |    8 +-
 pkcs11/gck/gck-session.c                           |  514 ++++++--
 pkcs11/gck/gck-session.h                           |   33 +-
 pkcs11/gck/{gck-key.c => gck-sexp-key.c}           |  191 ++--
 pkcs11/gck/gck-sexp-key.h                          |   71 +
 pkcs11/gck/gck-sexp.c                              |  203 +++
 pkcs11/gck/gck-sexp.h                              |   20 +-
 pkcs11/gck/gck-transaction.c                       |   14 +
 pkcs11/gck/gck-transaction.h                       |    2 +
 pkcs11/gck/gck-types.h                             |   18 +-
 pkcs11/gck/tests/Makefile.am                       |    6 +-
 pkcs11/gck/tests/dump-data-file.c                  |    4 +-
 pkcs11/gck/tests/mock-locked-object.c              |   15 +-
 pkcs11/gck/tests/mock-locked-object.h              |    2 +-
 pkcs11/gck/tests/test-module.c                     |   28 +
 pkcs11/gck/tests/test-module.h                     |    2 +
 pkcs11/gck/tests/unit-test-attributes.c            |  587 +++++++++-
 ...test-authenticator.c => unit-test-credential.c} |  214 ++--
 pkcs11/gck/tests/unit-test-data-asn1.c             |    2 +-
 pkcs11/gck/tests/unit-test-data-der.c              |   15 +-
 pkcs11/gck/tests/unit-test-data-file.c             |   10 +-
 pkcs11/gck/tests/unit-test-login.c                 |  120 --
 pkcs11/gck/tests/unit-test-object.c                |   59 +-
 pkcs11/gck/tests/unit-test-secret.c                |  178 +++
 .../tests/{unit-test-crypto.c => unit-test-sexp.c} |   29 +-
 pkcs11/gck/tests/unit-test-transaction.c           |   12 +-
 pkcs11/pkcs11g.h                                   |   18 +-
 pkcs11/pkcs11i.h                                   |   32 +-
 pkcs11/roots-store/gck-roots-certificate.c         |   16 +-
 pkcs11/roots-store/gck-roots-module.c              |    5 +-
 pkcs11/roots-store/tests/Makefile.am               |   21 +-
 pkcs11/roots-store/tests/test-module.c             |   34 +
 pkcs11/secret-store/Makefile.am                    |   61 +
 pkcs11/secret-store/gck-secret-binary.c            |  978 ++++++++++++++
 pkcs11/secret-store/gck-secret-binary.h            |   40 +
 pkcs11/secret-store/gck-secret-collection.c        |  829 ++++++++++++
 pkcs11/secret-store/gck-secret-collection.h        |   91 ++
 pkcs11/secret-store/gck-secret-compat.c            |   91 ++
 pkcs11/secret-store/gck-secret-compat.h            |   47 +
 pkcs11/secret-store/gck-secret-data.c              |  222 ++++
 pkcs11/secret-store/gck-secret-data.h              |   70 +
 pkcs11/secret-store/gck-secret-fields.c            |  494 ++++++++
 pkcs11/secret-store/gck-secret-fields.h            |  106 ++
 pkcs11/secret-store/gck-secret-item.c              |  417 ++++++
 pkcs11/secret-store/gck-secret-item.h              |   56 +
 pkcs11/secret-store/gck-secret-module.c            |  503 ++++++++
 pkcs11/secret-store/gck-secret-module.h            |   44 +
 pkcs11/secret-store/gck-secret-object.c            |  399 ++++++
 pkcs11/secret-store/gck-secret-object.h            |   81 ++
 pkcs11/secret-store/gck-secret-search.c            |  462 +++++++
 pkcs11/secret-store/gck-secret-search.h            |   54 +
 pkcs11/secret-store/gck-secret-standalone.c        |   60 +
 pkcs11/secret-store/gck-secret-store.h             |   29 +
 pkcs11/secret-store/gck-secret-textual.c           |  557 ++++++++
 pkcs11/secret-store/gck-secret-textual.h           |   39 +
 pkcs11/secret-store/gck-secret-types.h             |   35 +
 pkcs11/secret-store/tests/.gitignore               |    4 +
 pkcs11/secret-store/tests/Makefile.am              |   20 +
 .../secret-store/tests/test-data/encrypted.keyring |  Bin 0 -> 733 bytes
 .../tests/test-data/plain-bad-number.keyring       |   23 +
 pkcs11/secret-store/tests/test-data/plain.keyring  |   55 +
 pkcs11/secret-store/tests/test-secret-module.c     |  286 +++++
 pkcs11/secret-store/tests/test-secret-module.h     |   50 +
 .../secret-store/tests/unit-test-secret-binary.c   |  200 +++
 .../tests/unit-test-secret-collection.c            |  557 ++++++++
 .../secret-store/tests/unit-test-secret-compat.c   |  115 ++
 pkcs11/secret-store/tests/unit-test-secret-data.c  |  215 ++++
 .../secret-store/tests/unit-test-secret-fields.c   |  387 ++++++
 pkcs11/secret-store/tests/unit-test-secret-item.c  |  438 +++++++
 .../secret-store/tests/unit-test-secret-object.c   |  269 ++++
 .../secret-store/tests/unit-test-secret-search.c   |  351 +++++
 .../secret-store/tests/unit-test-secret-textual.c  |  184 +++
 pkcs11/ssh-agent/gck-ssh-agent-ops.c               |    4 +-
 pkcs11/ssh-store/gck-ssh-module.c                  |   14 +-
 pkcs11/ssh-store/gck-ssh-private-key.c             |   31 +-
 pkcs11/ssh-store/gck-ssh-private-key.h             |    4 +-
 pkcs11/ssh-store/gck-ssh-public-key.c              |    7 +-
 pkcs11/ssh-store/gck-ssh-public-key.h              |    4 +-
 pkcs11/ssh-store/tests/Makefile.am                 |    3 -
 pkcs11/ssh-store/tests/p11-tests.conf              |    6 +-
 pkcs11/ssh-store/tests/test-ssh-module.c           |    8 +
 pkcs11/ssh-store/tests/unit-test-private-key.c     |   18 +-
 pkcs11/ssh-store/tests/unit-test-ssh-openssh.c     |   16 +-
 pkcs11/user-store/Makefile.am                      |    8 +-
 pkcs11/user-store/gck-user-module.c                |   14 +-
 pkcs11/user-store/gck-user-private-key.c           |   65 +-
 pkcs11/user-store/gck-user-private-key.h           |    8 +-
 pkcs11/user-store/gck-user-public-key.c            |   37 +-
 pkcs11/user-store/gck-user-public-key.h            |    6 +-
 pkcs11/user-store/gck-user-storage.c               |   27 +-
 pkcs11/user-store/gck-user-storage.h               |   10 +-
 pkcs11/user-store/tests/Makefile.am                |   21 +-
 pkcs11/user-store/tests/test-module.c              |   34 +
 po/ChangeLog                                       |    2 +-
 tests/gtest-helpers.c                              |   99 ++-
 tests/gtest-helpers.h                              |   28 +-
 tests/gtest.make                                   |   10 +-
 tests/prep-gtest.sh                                |   12 +-
 271 files changed, 30619 insertions(+), 3943 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]