[gnome-keyring: 100/102] Merge branch 'trust-store'
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring: 100/102] Merge branch 'trust-store'
- Date: Wed, 22 Dec 2010 18:04:12 +0000 (UTC)
commit f98b8d0cb814f5c5862a66b0182a6c67358551a6
Merge: f631b23 e3438dc
Author: Stef Walter <stefw collabora co uk>
Date: Wed Dec 22 16:36:37 2010 +0000
Merge branch 'trust-store'
.gitignore | 1 +
Makefile.am | 9 +
configure.in | 51 +-
daemon/Makefile.am | 3 +-
daemon/dbus/tests/test-secret-util.c | 2 +-
daemon/gkd-pkcs11.c | 14 +-
daemon/ssh-agent/gkd-ssh-agent-ops.c | 1 -
docs/reference/gck/gck-sections.txt | 1 +
docs/reference/gcr/gcr-docs.sgml | 49 +-
docs/reference/gcr/gcr-sections.txt | 131 ++--
docs/reference/gcr/gcr.types | 2 +
egg/Makefile.am | 1 +
egg/egg-asn1x.c | 413 +++++++--
egg/egg-asn1x.h | 21 +
egg/egg-byte-array.c | 65 ++
.../gkm-user-store.h => egg/egg-byte-array.h | 22 +-
egg/tests/Makefile.am | 14 +-
egg/tests/test-asn1.c | 306 ++++++-
egg/tests/test-dn.c | 12 +-
egg/tests/test-padding.c | 30 +-
egg/tests/test.asn | 20 +
egg/tests/unit-test-asn1.c | 58 +-
egg/tests/unit-test-cleanup.c | 8 +-
egg/tests/unit-test-dh.c | 20 +-
egg/tests/unit-test-hex.c | 8 +-
egg/tests/unit-test-oid.c | 2 +-
egg/tests/unit-test-openssl.c | 6 +-
egg/tests/unit-test-secmem.c | 14 +-
egg/tests/unit-test-spawn.c | 14 +-
egg/tests/unit-test-symkey.c | 12 +-
gck/Makefile.am | 1 +
gck/gck-dump.c | 349 ++++++++
gck/gck-enumerator.c | 121 ++--
gck/gck-mock.c | 23 +
gck/gck-mock.h | 15 +
gck/gck-modules.c | 2 +-
gck/gck-slot.c | 19 +
gck/gck.h | 7 +
gck/tests/Makefile.am | 6 +-
gck/tests/test-gck-attributes.c | 56 +-
gck/tests/test-gck-crypto.c | 22 +-
gck/tests/test-gck-enumerator.c | 56 +-
gck/tests/test-gck-module.c | 14 +-
gck/tests/test-gck-modules.c | 22 +-
gck/tests/test-gck-object.c | 20 +-
gck/tests/test-gck-session.c | 16 +-
gck/tests/test-gck-slot.c | 18 +-
gck/tests/test-gck-uri.c | 30 +-
gcr/Makefile.am | 27 +-
gcr/gcr-certificate-chain.c | 784 ++++++++++++++++
gcr/gcr-certificate-chain.h | 127 +++
gcr/gcr-certificate-renderer.c | 2 +-
gcr/gcr-certificate-renderer.h | 8 +-
gcr/gcr-certificate-widget.h | 8 +-
gcr/gcr-certificate.c | 157 +++-
gcr/gcr-certificate.h | 21 +-
gcr/gcr-import-dialog.c | 7 +-
gcr/gcr-importer.h | 14 +-
gcr/gcr-initializer.h | 4 +-
gcr/gcr-internal.h | 29 +-
gcr/gcr-key-renderer.h | 10 +-
gcr/gcr-key-widget.h | 10 +-
gcr/gcr-library.c | 300 ++++++-
gcr/gcr-library.h | 57 ++
gcr/gcr-parser.c | 1 +
gcr/gcr-parser.h | 6 +-
gcr/gcr-pkcs11-certificate.c | 424 +++++++++
gcr/gcr-pkcs11-certificate.h | 76 ++
gcr/gcr-renderer.h | 4 +-
gcr/gcr-simple-certificate.c | 44 +-
gcr/gcr-simple-certificate.h | 18 +-
gcr/gcr-trust.c | 945 ++++++++++++++++++++
gcr/gcr-trust.h | 102 +++
gcr/gcr-types.h | 51 +-
gcr/gcr-unlock-options-widget.h | 4 +
gcr/gcr.h | 40 +-
gcr/gcr.pc.in | 2 +
gcr/gkm-test.c | 60 ++
gcr/gkm-test.h | 62 ++
gcr/pkcs11.conf.defaults | 13 +
gcr/tests/Makefile.am | 8 +-
gcr/tests/test-certificate-chain.c | 590 ++++++++++++
gcr/tests/test-certificate.c | 210 +++++
gcr/tests/test-data/collabora-ca.cer | Bin 0 -> 1536 bytes
gcr/tests/test-data/der-certificate-dsa.cer | Bin 0 -> 1639 bytes
gcr/tests/test-data/dhansak-collabora.cer | Bin 0 -> 1200 bytes
gcr/tests/test-pkcs11-certificate.c | 251 ++++++
gcr/tests/test-simple-certificate.c | 84 ++
gcr/tests/test-trust.c | 291 ++++++
gcr/tests/ui-test-certificate.c | 25 +-
gcr/tests/ui-test-key.c | 25 +-
gcr/tests/ui-test-unlock-options.c | 24 +-
gcr/tests/unit-test-certificate.c | 135 ---
gcr/tests/unit-test-parser.c | 8 +-
pkcs11/Makefile.am | 7 +-
pkcs11/gkm/Makefile.am | 5 +-
pkcs11/gkm/gkm-assertion.c | 263 ++++++
pkcs11/gkm/gkm-assertion.h | 66 ++
pkcs11/gkm/gkm-attributes.c | 36 +
pkcs11/gkm/gkm-attributes.h | 5 +
pkcs11/gkm/gkm-certificate-trust.c | 377 --------
pkcs11/gkm/gkm-certificate-trust.h | 57 --
pkcs11/gkm/gkm-certificate.c | 180 +----
pkcs11/gkm/gkm-certificate.h | 2 +
pkcs11/gkm/gkm-data-der.c | 31 +-
pkcs11/gkm/gkm-data-file.h | 109 ---
pkcs11/gkm/gkm-module.c | 1 -
pkcs11/gkm/gkm-object.c | 1 -
.../gkm-user-store.h => gkm/gkm-oids.h} | 19 +-
pkcs11/gkm/gkm-serializable.c | 4 +-
pkcs11/gkm/gkm-serializable.h | 8 +-
pkcs11/gkm/gkm-session.c | 44 +-
pkcs11/gkm/gkm-transaction.c | 104 ++-
pkcs11/gkm/gkm-transaction.h | 6 +-
pkcs11/gkm/gkm-trust.c | 174 ++++
pkcs11/gkm/gkm-trust.h | 62 ++
pkcs11/gkm/gkm-types.h | 3 +-
pkcs11/gkm/gkm-util.c | 37 +
pkcs11/gkm/gkm-util.h | 15 +
pkcs11/gkm/tests/Makefile.am | 32 +-
pkcs11/gkm/tests/unit-test-attributes.c | 122 ++--
pkcs11/gkm/tests/unit-test-credential.c | 22 +-
pkcs11/gkm/tests/unit-test-data-asn1.c | 6 +-
pkcs11/gkm/tests/unit-test-data-der.c | 36 +-
pkcs11/gkm/tests/unit-test-file-tracker.c | 10 +-
pkcs11/gkm/tests/unit-test-memory-store.c | 34 +-
pkcs11/gkm/tests/unit-test-object.c | 18 +-
pkcs11/gkm/tests/unit-test-secret.c | 14 +-
pkcs11/gkm/tests/unit-test-sexp.c | 8 +-
pkcs11/gkm/tests/unit-test-store.c | 8 +-
pkcs11/gkm/tests/unit-test-timer.c | 16 +-
pkcs11/gkm/tests/unit-test-transaction.c | 134 +++-
pkcs11/{user-store => gnome2-store}/Makefile.am | 37 +-
.../gkm-gnome2-file.c} | 187 ++--
pkcs11/gnome2-store/gkm-gnome2-file.h | 109 +++
.../gkm-gnome2-module.c} | 144 ++--
pkcs11/gnome2-store/gkm-gnome2-module.h | 45 +
.../gkm-gnome2-private-key.c} | 76 +-
pkcs11/gnome2-store/gkm-gnome2-private-key.h | 52 ++
.../gkm-gnome2-public-key.c} | 52 +-
pkcs11/gnome2-store/gkm-gnome2-public-key.h | 51 ++
.../gkm-gnome2-standalone.c} | 6 +-
.../gkm-gnome2-storage.c} | 226 +++---
pkcs11/gnome2-store/gkm-gnome2-storage.h | 79 ++
.../gkm-gnome2-store.h} | 8 +-
pkcs11/gnome2-store/tests/.gitignore | 1 +
pkcs11/gnome2-store/tests/Makefile.am | 29 +
.../tests/dump-gnome2-file.c} | 13 +-
.../tests/p11-tests.conf | 0
.../tests/test-data/.gitempty | 0
.../tests/test-data/data-file-private.store | Bin 494 -> 494 bytes
.../tests/test-data/data-file-public.store | Bin 216 -> 216 bytes
.../tests/test-module.c | 6 +-
.../tests/unit-test-gnome2-file.c} | 241 +++---
pkcs11/pkcs11g.h | 97 --
pkcs11/pkcs11i.h | 21 +-
pkcs11/pkcs11x.h | 44 +
pkcs11/roots-store/Makefile.am | 7 +-
pkcs11/roots-store/gkm-roots-certificate.c | 28 +-
pkcs11/roots-store/gkm-roots-certificate.h | 3 +-
pkcs11/roots-store/gkm-roots-standalone.c | 15 +
pkcs11/roots-store/gkm-roots-trust.c | 427 +++++++++
pkcs11/roots-store/gkm-roots-trust.h | 60 ++
pkcs11/roots-store/tests/Makefile.am | 4 +-
pkcs11/roots-store/tests/test-module.c | 2 +-
pkcs11/rpc-layer/Makefile.am | 2 +-
pkcs11/rpc-layer/gkm-rpc-dispatch.c | 1 -
pkcs11/secret-store/Makefile.am | 4 +-
pkcs11/secret-store/gkm-secret-standalone.c | 15 +
pkcs11/secret-store/tests/Makefile.am | 12 +-
pkcs11/secret-store/tests/test-secret-module.c | 25 +-
.../secret-store/tests/unit-test-secret-binary.c | 16 +-
.../tests/unit-test-secret-collection.c | 44 +-
.../secret-store/tests/unit-test-secret-compat.c | 8 +-
pkcs11/secret-store/tests/unit-test-secret-data.c | 18 +-
.../secret-store/tests/unit-test-secret-fields.c | 44 +-
pkcs11/secret-store/tests/unit-test-secret-item.c | 40 +-
.../secret-store/tests/unit-test-secret-object.c | 30 +-
.../secret-store/tests/unit-test-secret-search.c | 22 +-
.../secret-store/tests/unit-test-secret-textual.c | 14 +-
pkcs11/ssh-store/Makefile.am | 4 +-
pkcs11/ssh-store/gkm-ssh-standalone.c | 15 +
pkcs11/ssh-store/tests/Makefile.am | 7 +-
pkcs11/ssh-store/tests/test-ssh-module.c | 2 +-
pkcs11/ssh-store/tests/unit-test-private-key.c | 10 +-
pkcs11/ssh-store/tests/unit-test-ssh-openssh.c | 4 +-
pkcs11/user-store/gkm-user-module.h | 45 -
pkcs11/user-store/gkm-user-private-key.h | 52 --
pkcs11/user-store/gkm-user-public-key.h | 51 --
pkcs11/user-store/gkm-user-storage.h | 79 --
pkcs11/user-store/tests/Makefile.am | 16 -
pkcs11/wrap-layer/gkm-wrap-layer.c | 1 -
pkcs11/wrap-layer/tests/Makefile.am | 4 +-
pkcs11/wrap-layer/tests/test-create-credential.c | 10 +-
pkcs11/wrap-layer/tests/test-init-pin.c | 6 +-
pkcs11/wrap-layer/tests/test-login-auto.c | 10 +-
pkcs11/wrap-layer/tests/test-login-hints.c | 2 +-
pkcs11/wrap-layer/tests/test-login-keyring.c | 28 +-
pkcs11/wrap-layer/tests/test-login-specific.c | 10 +-
pkcs11/wrap-layer/tests/test-login-user.c | 18 +-
pkcs11/wrap-layer/tests/test-set-pin.c | 6 +-
pkcs11/xdg-store/.gitignore | 3 +
pkcs11/xdg-store/Makefile.am | 64 ++
pkcs11/xdg-store/gkm-xdg-assertion.c | 233 +++++
pkcs11/xdg-store/gkm-xdg-assertion.h | 55 ++
pkcs11/xdg-store/gkm-xdg-module.c | 580 ++++++++++++
pkcs11/xdg-store/gkm-xdg-module.h | 45 +
.../gkm-xdg-standalone.c} | 21 +-
.../gkm-user-store.h => xdg-store/gkm-xdg-store.h} | 10 +-
pkcs11/xdg-store/gkm-xdg-trust.c | 892 ++++++++++++++++++
pkcs11/xdg-store/gkm-xdg-trust.h | 69 ++
pkcs11/xdg-store/tests/Makefile.am | 30 +
pkcs11/xdg-store/tests/diddle-trust-file.c | 233 +++++
pkcs11/xdg-store/tests/dump-trust-file.c | 201 +++++
.../{user-store => xdg-store}/tests/p11-tests.conf | 0
.../tests/test-data/test-certificate-1.cer | Bin 0 -> 813 bytes
.../tests/test-data/test-certificate-2.cer | Bin 0 -> 813 bytes
.../xdg-store/tests/test-data/test-refer-1.trust | Bin 0 -> 241 bytes
pkcs11/xdg-store/tests/test-xdg-module.c | 345 +++++++
.../tests/test-xdg-module.h} | 29 +-
pkcs11/xdg-store/tests/test-xdg-trust.c | 801 +++++++++++++++++
pkcs11/xdg-store/xdg.asn | 43 +
po/POTFILES.in | 2 +
po/el.po | 1 -
po/it.po | 2 +-
testing/testing-build.sh | 78 +-
testing/testing.c | 96 ++
testing/testing.h | 59 +-
testing/testing.make | 44 +-
tool/Makefile.am | 3 +-
tool/gkr-tool-import.c | 3 +-
tool/gkr-tool-trust.c | 236 +++++
tool/gkr-tool.c | 1 +
tool/gkr-tool.h | 2 +
ui/gku-prompt-tool.c | 2 +-
ui/tests/Makefile.am | 6 +-
ui/tests/unit-test-util.c | 14 +-
237 files changed, 13323 insertions(+), 2876 deletions(-)
---
diff --cc configure.in
index fd7cb24,ba7b445..13a9018
--- a/configure.in
+++ b/configure.in
@@@ -662,6 -681,12 +681,12 @@@ f
eval BINDIR="$bindir"
AC_SUBST(BINDIR)
+ pkcs11dir="${libdir}/pkcs11"
+ AC_SUBST(pkcs11dir)
+
-pkcs11standalonedir="${libdir}/gnome-keyring/standalone"
++pkcs11standalonedir="${libdir}/gnome-keyring/devel"
+ AC_SUBST(pkcs11standalonedir)
+
AC_OUTPUT([
Makefile
daemon/Makefile
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
