[gnome-keyring] pkcs11: Remove the roots-store now provided by p11-kit

[Stefan Walter <stefw src gnome org>]

commit 7afaae43f205c059163c3670169af302f1ba6de3
Author: Stef Walter <stefw gnome org>
Date:   Mon Mar 4 20:29:14 2013 +0100

    pkcs11: Remove the roots-store now provided by p11-kit
    
    This module is replaced by the p11-kit-trust module installed
    with p11-kit 0.16 and later.

 configure.ac                                       |   48 -
 daemon/Makefile.am                                 |    1 -
 daemon/gkd-pkcs11.c                                |    6 -
 pkcs11/Makefile.am                                 |    1 -
 pkcs11/roots-store/Makefile.am                     |   52 -
 pkcs11/roots-store/gkm-roots-certificate.c         |  200 --
 pkcs11/roots-store/gkm-roots-certificate.h         |   54 -
 pkcs11/roots-store/gkm-roots-module.c              |  408 ----
 pkcs11/roots-store/gkm-roots-module.h              |   45 -
 pkcs11/roots-store/gkm-roots-standalone.c          |   68 -
 pkcs11/roots-store/gkm-roots-store.h               |   29 -
 pkcs11/roots-store/gkm-roots-trust.c               |  426 ----
 pkcs11/roots-store/gkm-roots-trust.h               |   60 -
 pkcs11/roots-store/tests/Makefile.am               |   45 -
 pkcs11/roots-store/tests/check-roots-module.c      |   70 -
 .../tests/files/RSA_Root_Certificate_1.pem         |   19 -
 .../tests/files/RSA_Security_1024_v3.pem           |   16 -
 .../tests/files/RSA_Security_2048_v3.pem           |   22 -
 .../tests/files/Thawte_Personal_Basic_CA.pem       |   20 -
 .../tests/files/Thawte_Personal_Freemail_CA.pem    |   21 -
 .../tests/files/Thawte_Personal_Premium_CA.pem     |   21 -
 .../tests/files/Thawte_Premium_Server_CA.pem       |   21 -
 .../roots-store/tests/files/Thawte_Server_CA.pem   |   20 -
 .../tests/files/Thawte_Time_Stamping_CA.pem        |   18 -
 pkcs11/roots-store/tests/files/ca-certificates.crt | 2560 --------------------
 pkcs11/roots-store/tests/files/cacert.org.pem      |   41 -
 pkcs11/roots-store/tests/files/der-certificate.crt |  Bin 747 -> 0 bytes
 pkcs11/roots-store/tests/p11-tests.conf.in         |    2 -
 28 files changed, 0 insertions(+), 4294 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 953d318..1e9c144 100644
--- a/configure.ac
+++ b/configure.ac
@@ -349,52 +349,6 @@ fi
 AM_CONDITIONAL(WITH_GPG, test "$enable_gpg_agent" != "no")
 
 # --------------------------------------------------------------------
-# Trusted Root Certificates Directory
-#
-
-AC_MSG_CHECKING([location of system Certificate Authority list])
-
-AC_ARG_WITH(root-certs,
-            [AC_HELP_STRING([--with-root-certs=@<:@path@:>@],
-                            [directory for system Certificate Authorities])])
-
-AC_ARG_WITH(ca-certificates,
-            [AC_HELP_STRING([--with-ca-certificates=@<:@path@:>@],
-                            [file for system Certificate Authorities])])
-
-# Explicitly disabled root certificate authority list
-if test "$with_root_certs" = "no" -o "$with_ca_certificates" = "no"; then
-       root_status="disabled"
-
-# A directory specified for the root certificate authority list
-elif test -n "$with_root_certs"; then
-       AC_DEFINE_UNQUOTED(ROOT_CA_DIRECTORY, ["$with_root_certs"], [Directory path for CA list])
-       root_status="directory: $with_root_certs"
-
-# A file specified for the root certificate list
-elif test -n "$with_ca_certificates"; then
-       AC_DEFINE_UNQUOTED(ROOT_CA_FILE, ["$with_ca_certificates"], [File path for CA list])
-       root_status="file: $with_ca_certificates"
-
-# Automatically find certificate authority list
-else
-       for f in /etc/pki/tls/certs/ca-bundle.crt \
-                /etc/ssl/certs/ca-certificates.crt; do
-               if test -f "$f"; then
-                       with_ca_certificates="$f"
-               fi
-       done
-       if test -z "$with_ca_certificates"; then
-               AC_MSG_ERROR([could not find. Use --with-ca-certificates=path to set, or 
--without-ca-certificates to disable])
-       fi
-
-       AC_DEFINE_UNQUOTED(ROOT_CA_FILE, ["$with_ca_certificates"], [File path for CA list])
-       root_status="file: $with_ca_certificates"
-fi
-
-AC_MSG_RESULT(["$root_status"])
-
-# --------------------------------------------------------------------
 # libgcrypt
 #
 
@@ -701,8 +655,6 @@ pkcs11/gkm/Makefile
 pkcs11/gkm/tests/Makefile
 pkcs11/gnome2-store/Makefile
 pkcs11/gnome2-store/tests/Makefile
-pkcs11/roots-store/Makefile
-pkcs11/roots-store/tests/Makefile
 pkcs11/rpc-layer/Makefile
 pkcs11/rpc-layer/gnome-keyring.module
 pkcs11/secret-store/Makefile
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 582c7db..1d631a5 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -35,7 +35,6 @@ gnome_keyring_daemon_LDADD = \
        $(top_builddir)/daemon/ssh-agent/libgkd-ssh-agent.la \
        $(top_builddir)/daemon/gpg-agent/libgkd-gpg-agent.la \
        $(top_builddir)/pkcs11/wrap-layer/libgkm-wrap-layer.la \
-       $(top_builddir)/pkcs11/roots-store/libgkm-roots-store.la \
        $(top_builddir)/pkcs11/rpc-layer/libgkm-rpc-layer.la \
        $(top_builddir)/pkcs11/secret-store/libgkm-secret-store.la \
        $(top_builddir)/pkcs11/ssh-store/libgkm-ssh-store.la \
diff --git a/daemon/gkd-pkcs11.c b/daemon/gkd-pkcs11.c
index 2e46742..c736f8a 100644
--- a/daemon/gkd-pkcs11.c
+++ b/daemon/gkd-pkcs11.c
@@ -27,7 +27,6 @@
 #include "egg/egg-cleanup.h"
 
 #include "pkcs11/wrap-layer/gkm-wrap-layer.h"
-#include "pkcs11/roots-store/gkm-roots-store.h"
 #include "pkcs11/rpc-layer/gkm-rpc-layer.h"
 #include "pkcs11/secret-store/gkm-secret-store.h"
 #include "pkcs11/ssh-store/gkm-ssh-store.h"
@@ -66,7 +65,6 @@ pkcs11_daemon_cleanup (gpointer unused)
 gboolean
 gkd_pkcs11_initialize (void)
 {
-       CK_FUNCTION_LIST_PTR roots_store;
        CK_FUNCTION_LIST_PTR secret_store;
        CK_FUNCTION_LIST_PTR ssh_store;
        CK_FUNCTION_LIST_PTR gnome2_store;
@@ -81,9 +79,6 @@ gkd_pkcs11_initialize (void)
        /* SSH storage */
        ssh_store = gkm_ssh_store_get_functions ();
 
-       /* Root certificates */
-       roots_store = gkm_roots_store_get_functions ();
-
        /* Old User certificates */
        gnome2_store = gkm_gnome2_store_get_functions ();
 
@@ -92,7 +87,6 @@ gkd_pkcs11_initialize (void)
 
        /* Add all of those into the wrapper layer */
        gkm_wrap_layer_add_module (ssh_store);
-       gkm_wrap_layer_add_module (roots_store);
        gkm_wrap_layer_add_module (secret_store);
        gkm_wrap_layer_add_module (gnome2_store);
        gkm_wrap_layer_add_module (xdg_store);
diff --git a/pkcs11/Makefile.am b/pkcs11/Makefile.am
index 4bdf398..ab4427b 100644
--- a/pkcs11/Makefile.am
+++ b/pkcs11/Makefile.am
@@ -8,7 +8,6 @@ EXTRA_DIST = \
 SUBDIRS = . \
        gkm \
        wrap-layer \
-       roots-store \
        rpc-layer \
        secret-store \
        ssh-store \