[gnome-keyring/trust-store: 2/7] [gnome2-store] Rename the user-store to gnome2-store
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring/trust-store: 2/7] [gnome2-store] Rename the user-store to gnome2-store
- Date: Sat, 18 Sep 2010 17:27:16 +0000 (UTC)
commit 820c10a52ebc8e0054873bf4919b90ba04a8b1e8
Author: Stef Walter <stef memberwebs com>
Date: Wed Sep 15 01:58:13 2010 +0000
[gnome2-store] Rename the user-store to gnome2-store
This is the old key store that stored stuff in .gnome2/keyrings
configure.in | 4 +-
daemon/Makefile.am | 2 +-
daemon/gkd-pkcs11.c | 8 +-
pkcs11/Makefile.am | 2 +-
pkcs11/{user-store => gnome2-store}/Makefile.am | 36 ++--
.../gkm-gnome2-file.c} | 176 ++++++++--------
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} | 222 ++++++++++----------
pkcs11/gnome2-store/gkm-gnome2-storage.h | 79 +++++++
.../gkm-gnome2-store.h} | 8 +-
pkcs11/gnome2-store/tests/.gitignore | 1 +
.../{user-store => gnome2-store}/tests/Makefile.am | 14 +-
.../tests/dump-gnome2-file.c} | 10 +-
.../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 | 4 +-
.../tests/unit-test-gnome2-file.c} | 194 +++++++++---------
pkcs11/user-store/gkm-user-file.h | 109 ----------
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/.gitignore | 1 -
32 files changed, 816 insertions(+), 816 deletions(-)
---
diff --git a/configure.in b/configure.in
index e931f26..9ae5645 100644
--- a/configure.in
+++ b/configure.in
@@ -689,6 +689,8 @@ pam/Makefile
pkcs11/Makefile
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
@@ -696,8 +698,6 @@ pkcs11/secret-store/Makefile
pkcs11/secret-store/tests/Makefile
pkcs11/ssh-store/Makefile
pkcs11/ssh-store/tests/Makefile
-pkcs11/user-store/Makefile
-pkcs11/user-store/tests/Makefile
pkcs11/wrap-layer/Makefile
pkcs11/wrap-layer/tests/Makefile
po/Makefile.in
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 6634d2c..6a8670d 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -41,7 +41,7 @@ gnome_keyring_daemon_LDADD = \
$(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 \
- $(top_builddir)/pkcs11/user-store/libgkm-user-store.la \
+ $(top_builddir)/pkcs11/gnome2-store/libgkm-gnome2-store.la \
$(top_builddir)/pkcs11/gkm/libgkm.la \
$(top_builddir)/gck/libgck.la \
$(top_builddir)/egg/libegg-dbus.la \
diff --git a/daemon/gkd-pkcs11.c b/daemon/gkd-pkcs11.c
index 354de7e..3553c37 100644
--- a/daemon/gkd-pkcs11.c
+++ b/daemon/gkd-pkcs11.c
@@ -31,7 +31,7 @@
#include "pkcs11/rpc-layer/gkm-rpc-layer.h"
#include "pkcs11/secret-store/gkm-secret-store.h"
#include "pkcs11/ssh-store/gkm-ssh-store.h"
-#include "pkcs11/user-store/gkm-user-store.h"
+#include "pkcs11/gnome2-store/gkm-gnome2-store.h"
#include "gpg-agent/gkd-gpg-agent.h"
#include "ssh-agent/gkd-ssh-agent.h"
@@ -68,7 +68,7 @@ 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 user_store;
+ CK_FUNCTION_LIST_PTR gnome2_store;
CK_C_INITIALIZE_ARGS init_args;
gboolean ret;
CK_RV rv;
@@ -83,7 +83,7 @@ gkd_pkcs11_initialize (void)
roots_store = gkm_roots_store_get_functions ();
/* User certificates */
- user_store = gkm_user_store_get_functions ();
+ gnome2_store = gkm_gnome2_store_get_functions ();
/* Add all of those into the wrapper layer */
gkm_wrap_layer_add_module (ssh_store);
@@ -91,7 +91,7 @@ gkd_pkcs11_initialize (void)
gkm_wrap_layer_add_module (roots_store);
#endif
gkm_wrap_layer_add_module (secret_store);
- gkm_wrap_layer_add_module (user_store);
+ gkm_wrap_layer_add_module (gnome2_store);
pkcs11_roof = gkm_wrap_layer_get_functions ();
pkcs11_base = gkm_wrap_layer_get_functions_no_prompts ();
diff --git a/pkcs11/Makefile.am b/pkcs11/Makefile.am
index a9b96da..c59d756 100644
--- a/pkcs11/Makefile.am
+++ b/pkcs11/Makefile.am
@@ -17,4 +17,4 @@ SUBDIRS = . \
rpc-layer \
secret-store \
ssh-store \
- user-store
+ gnome2-store
diff --git a/pkcs11/user-store/Makefile.am b/pkcs11/gnome2-store/Makefile.am
similarity index 53%
rename from pkcs11/user-store/Makefile.am
rename to pkcs11/gnome2-store/Makefile.am
index e357b81..1648893 100644
--- a/pkcs11/user-store/Makefile.am
+++ b/pkcs11/gnome2-store/Makefile.am
@@ -1,26 +1,26 @@
INCLUDES = \
-I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/pkcs11 \
- $(GOBJECT_CFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/pkcs11 \
+ $(GOBJECT_CFLAGS) \
$(LIBGCRYPT_CFLAGS) \
$(GLIB_CFLAGS)
# ------------------------------------------------------------------------------
-# The user-store component code
+# The gnome2-store component code
noinst_LTLIBRARIES = \
- libgkm-user-store.la
+ libgkm-gnome2-store.la
-libgkm_user_store_la_SOURCES = \
- gkm-user-store.h \
- gkm-user-file.c gkm-user-file.h \
- gkm-user-module.c gkm-user-module.h \
- gkm-user-private-key.c gkm-user-private-key.h \
- gkm-user-public-key.c gkm-user-public-key.h \
- gkm-user-storage.c gkm-user-storage.h
+libgkm_gnome2_store_la_SOURCES = \
+ gkm-gnome2-store.h \
+ gkm-gnome2-file.c gkm-gnome2-file.h \
+ gkm-gnome2-module.c gkm-gnome2-module.h \
+ gkm-gnome2-private-key.c gkm-gnome2-private-key.h \
+ gkm-gnome2-public-key.c gkm-gnome2-public-key.h \
+ gkm-gnome2-storage.c gkm-gnome2-storage.h
# ------------------------------------------------------------------------------
# The standalone module
@@ -28,17 +28,17 @@ libgkm_user_store_la_SOURCES = \
moduledir = $(libdir)/gnome-keyring/devel/
module_LTLIBRARIES = \
- gkm-user-store-standalone.la
+ gkm-gnome2-store-standalone.la
-gkm_user_store_standalone_la_LDFLAGS = \
+gkm_gnome2_store_standalone_la_LDFLAGS = \
-module -avoid-version \
-no-undefined -export-symbols-regex 'C_GetFunctionList'
-gkm_user_store_standalone_la_SOURCES = \
- gkm-user-standalone.c
+gkm_gnome2_store_standalone_la_SOURCES = \
+ gkm-gnome2-standalone.c
-gkm_user_store_standalone_la_LIBADD = \
- libgkm-user-store.la \
+gkm_gnome2_store_standalone_la_LIBADD = \
+ libgkm-gnome2-store.la \
$(top_builddir)/pkcs11/gkm/libgkm.la \
$(GOBJECT_LIBS) \
$(GTHREAD_LIBS) \
diff --git a/pkcs11/user-store/gkm-user-file.c b/pkcs11/gnome2-store/gkm-gnome2-file.c
similarity index 86%
rename from pkcs11/user-store/gkm-user-file.c
rename to pkcs11/gnome2-store/gkm-gnome2-file.c
index fd5afe9..35482dd 100644
--- a/pkcs11/user-store/gkm-user-file.c
+++ b/pkcs11/gnome2-store/gkm-gnome2-file.c
@@ -21,7 +21,7 @@
#include "config.h"
-#include "gkm-user-file.h"
+#include "gkm-gnome2-file.h"
#include "gkm/gkm-attributes.h"
#include "gkm/gkm-crypto.h"
@@ -52,7 +52,7 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
-struct _GkmUserFile {
+struct _GkmGnome2File {
GObject parent;
/* The data itself */
@@ -74,7 +74,7 @@ typedef struct _UnknownBlock {
EggBuffer buffer;
} UnknownBlock;
-G_DEFINE_TYPE (GkmUserFile, gkm_user_file, G_TYPE_OBJECT);
+G_DEFINE_TYPE (GkmGnome2File, gkm_gnome2_file, G_TYPE_OBJECT);
#define PUBLIC_ALLOC (EggBufferAllocator)g_realloc
#define PRIVATE_ALLOC (EggBufferAllocator)egg_secure_realloc
@@ -534,7 +534,7 @@ decrypt_buffer (EggBuffer *input, gsize *offset, GkmSecret *login, EggBuffer *ou
*/
static GkmDataResult
-update_entries_from_block (GkmUserFile *self, guint section, GHashTable *entries,
+update_entries_from_block (GkmGnome2File *self, guint section, GHashTable *entries,
EggBuffer *buffer, gsize *offset)
{
GHashTable *attributes;
@@ -551,7 +551,7 @@ update_entries_from_block (GkmUserFile *self, guint section, GHashTable *entries
gsize n_data;
guint64 type;
- g_assert (GKM_IS_USER_FILE (self));
+ g_assert (GKM_IS_GNOME2_FILE (self));
g_assert (entries);
g_assert (buffer);
g_assert (offset);
@@ -621,25 +621,25 @@ update_entries_from_block (GkmUserFile *self, guint section, GHashTable *entries
}
static GkmDataResult
-update_from_public_block (GkmUserFile *self, EggBuffer *buffer)
+update_from_public_block (GkmGnome2File *self, EggBuffer *buffer)
{
gsize offset = 0;
- g_assert (GKM_IS_USER_FILE (self));
+ g_assert (GKM_IS_GNOME2_FILE (self));
g_assert (buffer);
- self->sections |= GKM_USER_FILE_SECTION_PUBLIC;
+ self->sections |= GKM_GNOME2_FILE_SECTION_PUBLIC;
/* Validate the buffer hash, failure in this case is corruption */
if (!validate_buffer (buffer, &offset))
return GKM_DATA_FAILURE;
- return update_entries_from_block (self, GKM_USER_FILE_SECTION_PUBLIC,
+ return update_entries_from_block (self, GKM_GNOME2_FILE_SECTION_PUBLIC,
self->publics, buffer, &offset);
}
static GkmDataResult
-update_from_private_block (GkmUserFile *self, EggBuffer *buffer, GkmSecret *login)
+update_from_private_block (GkmGnome2File *self, EggBuffer *buffer, GkmSecret *login)
{
EggBuffer custom;
GkmDataResult res;
@@ -647,10 +647,10 @@ update_from_private_block (GkmUserFile *self, EggBuffer *buffer, GkmSecret *logi
gsize n_password;
gsize offset;
- g_assert (GKM_IS_USER_FILE (self));
+ g_assert (GKM_IS_GNOME2_FILE (self));
g_assert (buffer);
- self->sections |= GKM_USER_FILE_SECTION_PRIVATE;
+ self->sections |= GKM_GNOME2_FILE_SECTION_PRIVATE;
/* Skip private blocks when not unlocked */
if (login == NULL) {
@@ -682,7 +682,7 @@ update_from_private_block (GkmUserFile *self, EggBuffer *buffer, GkmSecret *logi
if (!self->privates)
self->privates = entries_new ();
- res = update_entries_from_block (self, GKM_USER_FILE_SECTION_PRIVATE,
+ res = update_entries_from_block (self, GKM_GNOME2_FILE_SECTION_PRIVATE,
self->privates, &custom, &offset);
egg_buffer_uninit (&custom);
return res;
@@ -697,17 +697,17 @@ copy_each_identifier (gpointer key, gpointer value, gpointer data)
static void
remove_each_identifier (gpointer key, gpointer value, gpointer data)
{
- GkmUserFile *self = GKM_USER_FILE (data);
+ GkmGnome2File *self = GKM_GNOME2_FILE (data);
GHashTable *entries;
guint section;
- g_assert (GKM_IS_USER_FILE (self));
+ g_assert (GKM_IS_GNOME2_FILE (self));
g_assert (key);
- if (!gkm_user_file_lookup_entry (self, key, §ion))
+ if (!gkm_gnome2_file_lookup_entry (self, key, §ion))
g_assert_not_reached ();
- if (section == GKM_USER_FILE_SECTION_PRIVATE)
+ if (section == GKM_GNOME2_FILE_SECTION_PRIVATE)
entries = self->privates;
else
entries = self->publics;
@@ -729,7 +729,7 @@ remove_each_identifier (gpointer key, gpointer value, gpointer data)
}
static GkmDataResult
-update_from_index_block (GkmUserFile *self, EggBuffer *buffer)
+update_from_index_block (GkmGnome2File *self, EggBuffer *buffer)
{
gchar *identifier;
gsize offset;
@@ -737,7 +737,7 @@ update_from_index_block (GkmUserFile *self, EggBuffer *buffer)
guint count, i;
guint value;
- g_assert (GKM_IS_USER_FILE (self));
+ g_assert (GKM_IS_GNOME2_FILE (self));
g_assert (buffer);
offset = 0;
@@ -777,11 +777,11 @@ static GkmDataResult
update_from_any_block (guint block, EggBuffer *buffer, GkmSecret *login, gpointer user_data)
{
UnknownBlock *unknown;
- GkmUserFile *self;
+ GkmGnome2File *self;
GkmDataResult res;
- g_assert (GKM_IS_USER_FILE (user_data));
- self = GKM_USER_FILE (user_data);
+ g_assert (GKM_IS_GNOME2_FILE (user_data));
+ self = GKM_GNOME2_FILE (user_data);
switch (block) {
case FILE_BLOCK_INDEX:
@@ -834,11 +834,11 @@ write_each_entry (gpointer key, gpointer value, gpointer data)
}
static GkmDataResult
-write_entries_to_block (GkmUserFile *self, GHashTable *entries, EggBuffer *buffer)
+write_entries_to_block (GkmGnome2File *self, GHashTable *entries, EggBuffer *buffer)
{
gsize offset;
- g_assert (GKM_USER_FILE (self));
+ g_assert (GKM_GNOME2_FILE (self));
g_assert (entries);
g_assert (buffer);
@@ -865,12 +865,12 @@ write_entries_to_block (GkmUserFile *self, GHashTable *entries, EggBuffer *buffe
}
static GkmDataResult
-write_private_to_block (GkmUserFile *self, EggBuffer *buffer, GkmSecret *login)
+write_private_to_block (GkmGnome2File *self, EggBuffer *buffer, GkmSecret *login)
{
EggBuffer secure;
GkmDataResult res;
- g_assert (GKM_IS_USER_FILE (self));
+ g_assert (GKM_IS_GNOME2_FILE (self));
g_assert (buffer);
if (login == NULL) {
@@ -898,9 +898,9 @@ write_private_to_block (GkmUserFile *self, EggBuffer *buffer, GkmSecret *login)
}
static GkmDataResult
-write_public_to_block (GkmUserFile *self, EggBuffer *buffer)
+write_public_to_block (GkmGnome2File *self, EggBuffer *buffer)
{
- g_assert (GKM_IS_USER_FILE (self));
+ g_assert (GKM_IS_GNOME2_FILE (self));
g_assert (buffer);
return write_entries_to_block (self, self->publics, buffer);
@@ -914,9 +914,9 @@ write_each_index_identifier (gpointer key, gpointer value, gpointer data)
}
static GkmDataResult
-write_index_to_block (GkmUserFile *self, EggBuffer *buffer)
+write_index_to_block (GkmGnome2File *self, EggBuffer *buffer)
{
- g_assert (GKM_IS_USER_FILE (self));
+ g_assert (GKM_IS_GNOME2_FILE (self));
g_assert (buffer);
/* The number of entries */
@@ -929,13 +929,13 @@ write_index_to_block (GkmUserFile *self, EggBuffer *buffer)
}
static GkmDataResult
-identifier_to_attributes (GkmUserFile *self, const gchar *identifier, GHashTable **attributes)
+identifier_to_attributes (GkmGnome2File *self, const gchar *identifier, GHashTable **attributes)
{
GHashTable *entries;
gpointer value;
guint section;
- g_assert (GKM_IS_USER_FILE (self));
+ g_assert (GKM_IS_GNOME2_FILE (self));
g_assert (identifier);
g_assert (attributes);
@@ -943,7 +943,7 @@ identifier_to_attributes (GkmUserFile *self, const gchar *identifier, GHashTable
return GKM_DATA_UNRECOGNIZED;
section = GPOINTER_TO_UINT (value);
- if (section == GKM_USER_FILE_SECTION_PRIVATE)
+ if (section == GKM_GNOME2_FILE_SECTION_PRIVATE)
entries = self->privates;
else
entries = self->publics;
@@ -989,8 +989,8 @@ sort_unknowns_by_type (gconstpointer a, gconstpointer b)
}
typedef struct _ForeachArgs {
- GkmUserFile *self;
- GkmUserFileFunc func;
+ GkmGnome2File *self;
+ GkmGnome2FileFunc func;
gpointer user_data;
} ForeachArgs;
@@ -998,7 +998,7 @@ static void
foreach_identifier (gpointer key, gpointer value, gpointer data)
{
ForeachArgs *args = data;
- g_assert (GKM_IS_USER_FILE (args->self));
+ g_assert (GKM_IS_GNOME2_FILE (args->self));
(args->func) (args->self, key, args->user_data);
}
@@ -1022,14 +1022,14 @@ dump_attributes (gpointer key, gpointer value, gpointer user_data)
}
static void
-dump_identifier_and_attributes (GkmUserFile *self, const gchar *identifier, gpointer user_data)
+dump_identifier_and_attributes (GkmGnome2File *self, const gchar *identifier, gpointer user_data)
{
GHashTable *attributes;
guint section;
- g_assert (GKM_IS_USER_FILE (self));
+ g_assert (GKM_IS_GNOME2_FILE (self));
- if (!gkm_user_file_lookup_entry (self, identifier, §ion))
+ if (!gkm_gnome2_file_lookup_entry (self, identifier, §ion))
g_assert_not_reached ();
if (GPOINTER_TO_UINT (user_data) == section) {
@@ -1047,7 +1047,7 @@ dump_identifier_and_attributes (GkmUserFile *self, const gchar *identifier, gpoi
*/
static void
-gkm_user_file_init (GkmUserFile *self)
+gkm_gnome2_file_init (GkmGnome2File *self)
{
self->identifiers = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
self->publics = entries_new ();
@@ -1059,9 +1059,9 @@ gkm_user_file_init (GkmUserFile *self)
}
static void
-gkm_user_file_finalize (GObject *obj)
+gkm_gnome2_file_finalize (GObject *obj)
{
- GkmUserFile *self = GKM_USER_FILE (obj);
+ GkmGnome2File *self = GKM_GNOME2_FILE (obj);
g_assert (self->identifiers);
g_hash_table_destroy (self->identifiers);
@@ -1080,11 +1080,11 @@ gkm_user_file_finalize (GObject *obj)
free_unknown_block_list (self->unknowns);
self->unknowns = NULL;
- G_OBJECT_CLASS (gkm_user_file_parent_class)->finalize (obj);
+ G_OBJECT_CLASS (gkm_gnome2_file_parent_class)->finalize (obj);
}
static void
-gkm_user_file_set_property (GObject *obj, guint prop_id, const GValue *value,
+gkm_gnome2_file_set_property (GObject *obj, guint prop_id, const GValue *value,
GParamSpec *pspec)
{
switch (prop_id) {
@@ -1095,7 +1095,7 @@ gkm_user_file_set_property (GObject *obj, guint prop_id, const GValue *value,
}
static void
-gkm_user_file_get_property (GObject *obj, guint prop_id, GValue *value,
+gkm_gnome2_file_get_property (GObject *obj, guint prop_id, GValue *value,
GParamSpec *pspec)
{
switch (prop_id) {
@@ -1106,26 +1106,26 @@ gkm_user_file_get_property (GObject *obj, guint prop_id, GValue *value,
}
static void
-gkm_user_file_class_init (GkmUserFileClass *klass)
+gkm_gnome2_file_class_init (GkmGnome2FileClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = gkm_user_file_finalize;
- gobject_class->set_property = gkm_user_file_set_property;
- gobject_class->get_property = gkm_user_file_get_property;
+ gobject_class->finalize = gkm_gnome2_file_finalize;
+ gobject_class->set_property = gkm_gnome2_file_set_property;
+ gobject_class->get_property = gkm_gnome2_file_get_property;
- signals[ENTRY_ADDED] = g_signal_new ("entry-added", GKM_TYPE_USER_FILE,
- G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GkmUserFileClass, entry_added),
+ signals[ENTRY_ADDED] = g_signal_new ("entry-added", GKM_TYPE_GNOME2_FILE,
+ G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GkmGnome2FileClass, entry_added),
NULL, NULL, g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
- signals[ENTRY_CHANGED] = g_signal_new ("entry-changed", GKM_TYPE_USER_FILE,
- G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GkmUserFileClass, entry_changed),
+ signals[ENTRY_CHANGED] = g_signal_new ("entry-changed", GKM_TYPE_GNOME2_FILE,
+ G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GkmGnome2FileClass, entry_changed),
NULL, NULL, gkm_marshal_VOID__STRING_ULONG,
G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_ULONG);
- signals[ENTRY_REMOVED] = g_signal_new ("entry-removed", GKM_TYPE_USER_FILE,
- G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GkmUserFileClass, entry_removed),
+ signals[ENTRY_REMOVED] = g_signal_new ("entry-removed", GKM_TYPE_GNOME2_FILE,
+ G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GkmGnome2FileClass, entry_removed),
NULL, NULL, g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
}
@@ -1134,18 +1134,18 @@ gkm_user_file_class_init (GkmUserFileClass *klass)
* PUBLIC
*/
-GkmUserFile*
-gkm_user_file_new (void)
+GkmGnome2File*
+gkm_gnome2_file_new (void)
{
- return g_object_new (GKM_TYPE_USER_FILE, NULL);
+ return g_object_new (GKM_TYPE_GNOME2_FILE, NULL);
}
GkmDataResult
-gkm_user_file_read_fd (GkmUserFile *self, int fd, GkmSecret *login)
+gkm_gnome2_file_read_fd (GkmGnome2File *self, int fd, GkmSecret *login)
{
GkmDataResult res;
- g_return_val_if_fail (GKM_IS_USER_FILE (self), GKM_DATA_FAILURE);
+ g_return_val_if_fail (GKM_IS_GNOME2_FILE (self), GKM_DATA_FAILURE);
/* Reads are not reentrant for a single data file */
g_return_val_if_fail (self->checks == NULL, GKM_DATA_FAILURE);
@@ -1175,7 +1175,7 @@ gkm_user_file_read_fd (GkmUserFile *self, int fd, GkmSecret *login)
* time around).
*/
- if (self->privates == NULL && !(self->sections & GKM_USER_FILE_SECTION_PRIVATE))
+ if (self->privates == NULL && !(self->sections & GKM_GNOME2_FILE_SECTION_PRIVATE))
self->privates = entries_new ();
/* Note that our last read failed */
@@ -1190,7 +1190,7 @@ gkm_user_file_read_fd (GkmUserFile *self, int fd, GkmSecret *login)
}
GkmDataResult
-gkm_user_file_write_fd (GkmUserFile *self, int fd, GkmSecret *login)
+gkm_gnome2_file_write_fd (GkmGnome2File *self, int fd, GkmSecret *login)
{
guint types[3] = { FILE_BLOCK_INDEX, FILE_BLOCK_PRIVATE, FILE_BLOCK_PUBLIC };
GList *unknowns, *unk;
@@ -1200,7 +1200,7 @@ gkm_user_file_write_fd (GkmUserFile *self, int fd, GkmSecret *login)
guint type;
gint i;
- g_return_val_if_fail (GKM_IS_USER_FILE (self), GKM_DATA_FAILURE);
+ g_return_val_if_fail (GKM_IS_GNOME2_FILE (self), GKM_DATA_FAILURE);
g_return_val_if_fail (!self->incomplete, GKM_DATA_FAILURE);
/* Write out the header */
@@ -1271,11 +1271,11 @@ gkm_user_file_write_fd (GkmUserFile *self, int fd, GkmSecret *login)
}
gboolean
-gkm_user_file_lookup_entry (GkmUserFile *self, const gchar *identifier, guint *section)
+gkm_gnome2_file_lookup_entry (GkmGnome2File *self, const gchar *identifier, guint *section)
{
gpointer value;
- g_return_val_if_fail (GKM_IS_USER_FILE (self), FALSE);
+ g_return_val_if_fail (GKM_IS_GNOME2_FILE (self), FALSE);
g_return_val_if_fail (identifier, FALSE);
if (!g_hash_table_lookup_extended (self->identifiers, identifier, NULL, &value))
@@ -1288,28 +1288,28 @@ gkm_user_file_lookup_entry (GkmUserFile *self, const gchar *identifier, guint *s
}
void
-gkm_user_file_foreach_entry (GkmUserFile *self, GkmUserFileFunc func, gpointer user_data)
+gkm_gnome2_file_foreach_entry (GkmGnome2File *self, GkmGnome2FileFunc func, gpointer user_data)
{
ForeachArgs args = { self, func, user_data };
- g_return_if_fail (GKM_IS_USER_FILE (self));
+ g_return_if_fail (GKM_IS_GNOME2_FILE (self));
g_return_if_fail (func);
g_hash_table_foreach (self->identifiers, foreach_identifier, &args);
}
GkmDataResult
-gkm_user_file_unique_entry (GkmUserFile *self, gchar **identifier)
+gkm_gnome2_file_unique_entry (GkmGnome2File *self, gchar **identifier)
{
gchar *base, *ext;
guint seed = 1;
- g_return_val_if_fail (GKM_IS_USER_FILE (self), GKM_DATA_FAILURE);
+ g_return_val_if_fail (GKM_IS_GNOME2_FILE (self), GKM_DATA_FAILURE);
g_return_val_if_fail (identifier, GKM_DATA_FAILURE);
/* Check if original is unique */
if (*identifier != NULL) {
- if (!gkm_user_file_lookup_entry (self, *identifier, NULL))
+ if (!gkm_gnome2_file_lookup_entry (self, *identifier, NULL))
return GKM_DATA_SUCCESS;
}
@@ -1325,7 +1325,7 @@ gkm_user_file_unique_entry (GkmUserFile *self, gchar **identifier)
for (seed = 0; TRUE; ++seed) {
*identifier = g_strdup_printf ("%s-%d%s%s", base, seed, ext ? "." : "", ext ? ext : "");
- if (!gkm_user_file_lookup_entry (self, *identifier, NULL))
+ if (!gkm_gnome2_file_lookup_entry (self, *identifier, NULL))
break;
if (seed < 1000000) {
@@ -1343,15 +1343,15 @@ gkm_user_file_unique_entry (GkmUserFile *self, gchar **identifier)
}
GkmDataResult
-gkm_user_file_create_entry (GkmUserFile *self, const gchar *identifier, guint section)
+gkm_gnome2_file_create_entry (GkmGnome2File *self, const gchar *identifier, guint section)
{
GHashTable *attributes;
GHashTable *entries;
- g_return_val_if_fail (GKM_IS_USER_FILE (self), GKM_DATA_FAILURE);
+ g_return_val_if_fail (GKM_IS_GNOME2_FILE (self), GKM_DATA_FAILURE);
g_return_val_if_fail (identifier, GKM_DATA_FAILURE);
- if (section == GKM_USER_FILE_SECTION_PRIVATE) {
+ if (section == GKM_GNOME2_FILE_SECTION_PRIVATE) {
if (!self->privates)
return GKM_DATA_LOCKED;
entries = self->privates;
@@ -1372,18 +1372,18 @@ gkm_user_file_create_entry (GkmUserFile *self, const gchar *identifier, guint se
}
GkmDataResult
-gkm_user_file_destroy_entry (GkmUserFile *self, const gchar *identifier)
+gkm_gnome2_file_destroy_entry (GkmGnome2File *self, const gchar *identifier)
{
GHashTable *entries;
guint section;
- g_return_val_if_fail (GKM_IS_USER_FILE (self), GKM_DATA_FAILURE);
+ g_return_val_if_fail (GKM_IS_GNOME2_FILE (self), GKM_DATA_FAILURE);
g_return_val_if_fail (identifier, GKM_DATA_FAILURE);
- if (!gkm_user_file_lookup_entry (self, identifier, §ion))
+ if (!gkm_gnome2_file_lookup_entry (self, identifier, §ion))
return GKM_DATA_UNRECOGNIZED;
- if (section == GKM_USER_FILE_SECTION_PRIVATE) {
+ if (section == GKM_GNOME2_FILE_SECTION_PRIVATE) {
if (!self->privates)
return GKM_DATA_LOCKED;
entries = self->privates;
@@ -1401,7 +1401,7 @@ gkm_user_file_destroy_entry (GkmUserFile *self, const gchar *identifier)
}
GkmDataResult
-gkm_user_file_write_value (GkmUserFile *self, const gchar *identifier,
+gkm_gnome2_file_write_value (GkmGnome2File *self, const gchar *identifier,
gulong type, gconstpointer value, gsize n_value)
{
GHashTable *attributes;
@@ -1409,7 +1409,7 @@ gkm_user_file_write_value (GkmUserFile *self, const gchar *identifier,
CK_ATTRIBUTE attr;
GkmDataResult res;
- g_return_val_if_fail (GKM_IS_USER_FILE (self), GKM_DATA_FAILURE);
+ g_return_val_if_fail (GKM_IS_GNOME2_FILE (self), GKM_DATA_FAILURE);
g_return_val_if_fail (identifier, GKM_DATA_FAILURE);
g_return_val_if_fail (value || !n_value, GKM_DATA_FAILURE);
@@ -1434,14 +1434,14 @@ gkm_user_file_write_value (GkmUserFile *self, const gchar *identifier,
}
GkmDataResult
-gkm_user_file_read_value (GkmUserFile *self, const gchar *identifier,
+gkm_gnome2_file_read_value (GkmGnome2File *self, const gchar *identifier,
gulong type, gconstpointer *value, gsize *n_value)
{
CK_ATTRIBUTE_PTR attr;
GHashTable *attributes;
GkmDataResult res;
- g_return_val_if_fail (GKM_IS_USER_FILE (self), GKM_DATA_FAILURE);
+ g_return_val_if_fail (GKM_IS_GNOME2_FILE (self), GKM_DATA_FAILURE);
g_return_val_if_fail (identifier, GKM_DATA_FAILURE);
g_return_val_if_fail (value, GKM_DATA_FAILURE);
g_return_val_if_fail (n_value, GKM_DATA_FAILURE);
@@ -1462,18 +1462,18 @@ gkm_user_file_read_value (GkmUserFile *self, const gchar *identifier,
}
gboolean
-gkm_user_file_have_section (GkmUserFile *self, guint section)
+gkm_gnome2_file_have_section (GkmGnome2File *self, guint section)
{
return (self->sections & section) ? TRUE : FALSE;
}
void
-gkm_user_file_dump (GkmUserFile *self)
+gkm_gnome2_file_dump (GkmGnome2File *self)
{
g_print ("PUBLIC:\n\n");
- gkm_user_file_foreach_entry (self, dump_identifier_and_attributes,
- GUINT_TO_POINTER (GKM_USER_FILE_SECTION_PUBLIC));
+ gkm_gnome2_file_foreach_entry (self, dump_identifier_and_attributes,
+ GUINT_TO_POINTER (GKM_GNOME2_FILE_SECTION_PUBLIC));
g_print ("PRIVATE:\n\n");
- gkm_user_file_foreach_entry (self, dump_identifier_and_attributes,
- GUINT_TO_POINTER (GKM_USER_FILE_SECTION_PRIVATE));
+ gkm_gnome2_file_foreach_entry (self, dump_identifier_and_attributes,
+ GUINT_TO_POINTER (GKM_GNOME2_FILE_SECTION_PRIVATE));
}
diff --git a/pkcs11/gnome2-store/gkm-gnome2-file.h b/pkcs11/gnome2-store/gkm-gnome2-file.h
new file mode 100644
index 0000000..caa4973
--- /dev/null
+++ b/pkcs11/gnome2-store/gkm-gnome2-file.h
@@ -0,0 +1,109 @@
+/*
+ * gnome-keyring
+ *
+ * Copyright (C) 2008 Stefan Walter
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef __GKM_GNOME2_FILE_H__
+#define __GKM_GNOME2_FILE_H__
+
+#include <glib-object.h>
+
+#include "gkm/gkm-data-types.h"
+#include "gkm/gkm-secret.h"
+
+enum {
+ GKM_GNOME2_FILE_SECTION_PUBLIC = 0x01,
+ GKM_GNOME2_FILE_SECTION_PRIVATE = 0x02,
+};
+
+#define GKM_TYPE_GNOME2_FILE (gkm_gnome2_file_get_type ())
+#define GKM_GNOME2_FILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GKM_TYPE_GNOME2_FILE, GkmGnome2File))
+#define GKM_GNOME2_FILE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GKM_TYPE_GNOME2_FILE, GkmGnome2FileClass))
+#define GKM_IS_GNOME2_FILE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GKM_TYPE_GNOME2_FILE))
+#define GKM_IS_GNOME2_FILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GKM_TYPE_GNOME2_FILE))
+#define GKM_GNOME2_FILE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GKM_TYPE_GNOME2_FILE, GkmGnome2FileClass))
+
+typedef struct _GkmGnome2File GkmGnome2File;
+typedef struct _GkmGnome2FileClass GkmGnome2FileClass;
+
+struct _GkmGnome2FileClass {
+ GObjectClass parent_class;
+
+ /* signals */
+
+ void (*entry_added) (GkmGnome2File *store, const gchar *identifier);
+
+ void (*entry_changed) (GkmGnome2File *store, const gchar *identifier, CK_ATTRIBUTE_TYPE type);
+
+ void (*entry_removed) (GkmGnome2File *store, const gchar *identifier);
+};
+
+typedef void (*GkmGnome2FileFunc) (GkmGnome2File *file, const gchar *identifier, gpointer user_data);
+
+GType gkm_gnome2_file_get_type (void);
+
+GkmGnome2File* gkm_gnome2_file_new (void);
+
+GkmDataResult gkm_gnome2_file_read_fd (GkmGnome2File *self,
+ int fd,
+ GkmSecret *login);
+
+GkmDataResult gkm_gnome2_file_write_fd (GkmGnome2File *self,
+ int fd,
+ GkmSecret *login);
+
+gboolean gkm_gnome2_file_have_section (GkmGnome2File *self,
+ guint section);
+
+gboolean gkm_gnome2_file_lookup_entry (GkmGnome2File *self,
+ const gchar *identifier,
+ guint *section);
+
+void gkm_gnome2_file_foreach_entry (GkmGnome2File *self,
+ GkmGnome2FileFunc func,
+ gpointer user_data);
+
+GkmDataResult gkm_gnome2_file_unique_entry (GkmGnome2File *self,
+ gchar **identifier);
+
+GkmDataResult gkm_gnome2_file_create_entry (GkmGnome2File *self,
+ const gchar *identifier,
+ guint section);
+
+GkmDataResult gkm_gnome2_file_destroy_entry (GkmGnome2File *self,
+ const gchar *identifier);
+
+GkmDataResult gkm_gnome2_file_write_value (GkmGnome2File *self,
+ const gchar *identifier,
+ gulong type,
+ gconstpointer value,
+ gsize n_value);
+
+GkmDataResult gkm_gnome2_file_read_value (GkmGnome2File *self,
+ const gchar *identifier,
+ gulong type,
+ gconstpointer *value,
+ gsize *n_value);
+
+void gkm_gnome2_file_foreach_value (GkmGnome2File *self,
+ const gchar *identifier);
+
+void gkm_gnome2_file_dump (GkmGnome2File *self);
+
+#endif /* __GKM_GNOME2_FILE_H__ */
diff --git a/pkcs11/user-store/gkm-user-module.c b/pkcs11/gnome2-store/gkm-gnome2-module.c
similarity index 57%
rename from pkcs11/user-store/gkm-user-module.c
rename to pkcs11/gnome2-store/gkm-gnome2-module.c
index 18af745..6067b9d 100644
--- a/pkcs11/user-store/gkm-user-module.c
+++ b/pkcs11/gnome2-store/gkm-gnome2-module.c
@@ -21,11 +21,11 @@
#include "config.h"
-#include "gkm-user-module.h"
-#include "gkm-user-private-key.h"
-#include "gkm-user-public-key.h"
-#include "gkm-user-storage.h"
-#include "gkm-user-store.h"
+#include "gkm-gnome2-module.h"
+#include "gkm-gnome2-private-key.h"
+#include "gkm-gnome2-public-key.h"
+#include "gkm-gnome2-storage.h"
+#include "gkm-gnome2-store.h"
#include "gkm/gkm-certificate.h"
#include "gkm/gkm-data-asn1.h"
@@ -36,16 +36,16 @@
#include <string.h>
-struct _GkmUserModule {
+struct _GkmGnome2Module {
GkmModule parent;
- GkmUserStorage *storage;
+ GkmGnome2Storage *storage;
gchar *directory;
GHashTable *unlocked_apps;
CK_TOKEN_INFO token_info;
};
static const CK_SLOT_INFO user_module_slot_info = {
- "User Keys",
+ "Gnome2 Key Storage",
"Gnome Keyring",
CKF_TOKEN_PRESENT,
{ 0, 0 },
@@ -53,7 +53,7 @@ static const CK_SLOT_INFO user_module_slot_info = {
};
static const CK_TOKEN_INFO user_module_token_info = {
- "User Keys",
+ "Gnome2 Key Storage",
"Gnome Keyring",
"1.0",
"1:USER:DEFAULT", /* Unique serial number for manufacturer */
@@ -75,7 +75,7 @@ static const CK_TOKEN_INFO user_module_token_info = {
#define UNUSED_VALUE (GUINT_TO_POINTER (1))
-G_DEFINE_TYPE (GkmUserModule, gkm_user_module, GKM_TYPE_MODULE);
+G_DEFINE_TYPE (GkmGnome2Module, gkm_gnome2_module, GKM_TYPE_MODULE);
/* -----------------------------------------------------------------------------
* ACTUAL PKCS#11 Module Implementation
@@ -83,7 +83,7 @@ G_DEFINE_TYPE (GkmUserModule, gkm_user_module, GKM_TYPE_MODULE);
/* Include all the module entry points */
#include "gkm/gkm-module-ep.h"
-GKM_DEFINE_MODULE (gkm_user_module, GKM_TYPE_USER_MODULE);
+GKM_DEFINE_MODULE (gkm_gnome2_module, GKM_TYPE_GNOME2_MODULE);
/* -----------------------------------------------------------------------------
* INTERNAL
@@ -94,26 +94,26 @@ GKM_DEFINE_MODULE (gkm_user_module, GKM_TYPE_USER_MODULE);
*/
static const CK_SLOT_INFO*
-gkm_user_module_real_get_slot_info (GkmModule *base)
+gkm_gnome2_module_real_get_slot_info (GkmModule *base)
{
return &user_module_slot_info;
}
static const CK_TOKEN_INFO*
-gkm_user_module_real_get_token_info (GkmModule *base)
+gkm_gnome2_module_real_get_token_info (GkmModule *base)
{
- GkmUserModule *self = GKM_USER_MODULE (base);
+ GkmGnome2Module *self = GKM_GNOME2_MODULE (base);
/* Update the info with current info */
- self->token_info.flags = gkm_user_storage_token_flags (self->storage);
+ self->token_info.flags = gkm_gnome2_storage_token_flags (self->storage);
return &self->token_info;
}
static void
-gkm_user_module_real_parse_argument (GkmModule *base, const gchar *name, const gchar *value)
+gkm_gnome2_module_real_parse_argument (GkmModule *base, const gchar *name, const gchar *value)
{
- GkmUserModule *self = GKM_USER_MODULE (base);
+ GkmGnome2Module *self = GKM_GNOME2_MODULE (base);
if (g_str_equal (name, "directory")) {
g_free (self->directory);
self->directory = g_strdup (value);
@@ -121,38 +121,38 @@ gkm_user_module_real_parse_argument (GkmModule *base, const gchar *name, const g
}
static CK_RV
-gkm_user_module_real_refresh_token (GkmModule *base)
+gkm_gnome2_module_real_refresh_token (GkmModule *base)
{
- GkmUserModule *self = GKM_USER_MODULE (base);
- gkm_user_storage_refresh (self->storage);
+ GkmGnome2Module *self = GKM_GNOME2_MODULE (base);
+ gkm_gnome2_storage_refresh (self->storage);
return CKR_OK;
}
static void
-gkm_user_module_real_add_token_object (GkmModule *base, GkmTransaction *transaction, GkmObject *object)
+gkm_gnome2_module_real_add_token_object (GkmModule *base, GkmTransaction *transaction, GkmObject *object)
{
- GkmUserModule *self = GKM_USER_MODULE (base);
- gkm_user_storage_create (self->storage, transaction, object);
+ GkmGnome2Module *self = GKM_GNOME2_MODULE (base);
+ gkm_gnome2_storage_create (self->storage, transaction, object);
}
static void
-gkm_user_module_real_store_token_object (GkmModule *base, GkmTransaction *transaction, GkmObject *object)
+gkm_gnome2_module_real_store_token_object (GkmModule *base, GkmTransaction *transaction, GkmObject *object)
{
/* Not necessary */
}
static void
-gkm_user_module_real_remove_token_object (GkmModule *base, GkmTransaction *transaction, GkmObject *object)
+gkm_gnome2_module_real_remove_token_object (GkmModule *base, GkmTransaction *transaction, GkmObject *object)
{
- GkmUserModule *self = GKM_USER_MODULE (base);
- gkm_user_storage_destroy (self->storage, transaction, object);
+ GkmGnome2Module *self = GKM_GNOME2_MODULE (base);
+ gkm_gnome2_storage_destroy (self->storage, transaction, object);
}
static CK_RV
-gkm_user_module_real_login_change (GkmModule *base, CK_SLOT_ID slot_id, CK_UTF8CHAR_PTR old_pin,
+gkm_gnome2_module_real_login_change (GkmModule *base, CK_SLOT_ID slot_id, CK_UTF8CHAR_PTR old_pin,
CK_ULONG n_old_pin, CK_UTF8CHAR_PTR new_pin, CK_ULONG n_new_pin)
{
- GkmUserModule *self = GKM_USER_MODULE (base);
+ GkmGnome2Module *self = GKM_GNOME2_MODULE (base);
GkmSecret *old_login, *new_login;
GkmTransaction *transaction;
CK_RV rv;
@@ -167,7 +167,7 @@ gkm_user_module_real_login_change (GkmModule *base, CK_SLOT_ID slot_id, CK_UTF8C
transaction = gkm_transaction_new ();
- gkm_user_storage_relock (self->storage, transaction, old_login, new_login);
+ gkm_gnome2_storage_relock (self->storage, transaction, old_login, new_login);
g_object_unref (old_login);
g_object_unref (new_login);
@@ -180,9 +180,9 @@ gkm_user_module_real_login_change (GkmModule *base, CK_SLOT_ID slot_id, CK_UTF8C
}
static CK_RV
-gkm_user_module_real_login_user (GkmModule *base, CK_SLOT_ID slot_id, CK_UTF8CHAR_PTR pin, CK_ULONG n_pin)
+gkm_gnome2_module_real_login_user (GkmModule *base, CK_SLOT_ID slot_id, CK_UTF8CHAR_PTR pin, CK_ULONG n_pin)
{
- GkmUserModule *self = GKM_USER_MODULE (base);
+ GkmGnome2Module *self = GKM_GNOME2_MODULE (base);
GkmSecret *login;
CK_RV rv;
@@ -190,7 +190,7 @@ gkm_user_module_real_login_user (GkmModule *base, CK_SLOT_ID slot_id, CK_UTF8CHA
if (g_hash_table_lookup (self->unlocked_apps, &slot_id))
return CKR_USER_ALREADY_LOGGED_IN;
- login = gkm_user_storage_get_login (self->storage);
+ login = gkm_gnome2_storage_get_login (self->storage);
/* No application is logged in */
if (g_hash_table_size (self->unlocked_apps) == 0) {
@@ -199,7 +199,7 @@ gkm_user_module_real_login_user (GkmModule *base, CK_SLOT_ID slot_id, CK_UTF8CHA
/* So actually unlock the store */
login = gkm_secret_new_from_login (pin, n_pin);
- rv = gkm_user_storage_unlock (self->storage, login);
+ rv = gkm_gnome2_storage_unlock (self->storage, login);
g_object_unref (login);
/* An application is already logged in */
@@ -217,16 +217,16 @@ gkm_user_module_real_login_user (GkmModule *base, CK_SLOT_ID slot_id, CK_UTF8CHA
/* Note that this application logged in */
if (rv == CKR_OK) {
g_hash_table_insert (self->unlocked_apps, gkm_util_ulong_alloc (slot_id), UNUSED_VALUE);
- rv = GKM_MODULE_CLASS (gkm_user_module_parent_class)->login_user (base, slot_id, pin, n_pin);
+ rv = GKM_MODULE_CLASS (gkm_gnome2_module_parent_class)->login_user (base, slot_id, pin, n_pin);
}
return rv;
}
static CK_RV
-gkm_user_module_real_login_so (GkmModule *base, CK_SLOT_ID slot_id, CK_UTF8CHAR_PTR pin, CK_ULONG n_pin)
+gkm_gnome2_module_real_login_so (GkmModule *base, CK_SLOT_ID slot_id, CK_UTF8CHAR_PTR pin, CK_ULONG n_pin)
{
- GkmUserModule *self = GKM_USER_MODULE (base);
+ GkmGnome2Module *self = GKM_GNOME2_MODULE (base);
/* See if this application has unlocked, in which case we can't login */
if (g_hash_table_lookup (self->unlocked_apps, &slot_id))
@@ -236,13 +236,13 @@ gkm_user_module_real_login_so (GkmModule *base, CK_SLOT_ID slot_id, CK_UTF8CHAR_
if (n_pin != 0)
return CKR_PIN_INCORRECT;
- return GKM_MODULE_CLASS (gkm_user_module_parent_class)->login_so (base, slot_id, pin, n_pin);
+ return GKM_MODULE_CLASS (gkm_gnome2_module_parent_class)->login_so (base, slot_id, pin, n_pin);
}
static CK_RV
-gkm_user_module_real_logout_user (GkmModule *base, CK_SLOT_ID slot_id)
+gkm_gnome2_module_real_logout_user (GkmModule *base, CK_SLOT_ID slot_id)
{
- GkmUserModule *self = GKM_USER_MODULE (base);
+ GkmGnome2Module *self = GKM_GNOME2_MODULE (base);
CK_RV rv;
if (!g_hash_table_remove (self->unlocked_apps, &slot_id))
@@ -251,28 +251,28 @@ gkm_user_module_real_logout_user (GkmModule *base, CK_SLOT_ID slot_id)
if (g_hash_table_size (self->unlocked_apps) > 0)
return CKR_OK;
- rv = gkm_user_storage_lock (self->storage);
+ rv = gkm_gnome2_storage_lock (self->storage);
if (rv == CKR_OK)
- rv = GKM_MODULE_CLASS (gkm_user_module_parent_class)->logout_user (base, slot_id);
+ rv = GKM_MODULE_CLASS (gkm_gnome2_module_parent_class)->logout_user (base, slot_id);
return rv;
}
static GObject*
-gkm_user_module_constructor (GType type, guint n_props, GObjectConstructParam *props)
+gkm_gnome2_module_constructor (GType type, guint n_props, GObjectConstructParam *props)
{
- GkmUserModule *self = GKM_USER_MODULE (G_OBJECT_CLASS (gkm_user_module_parent_class)->constructor(type, n_props, props));
+ GkmGnome2Module *self = GKM_GNOME2_MODULE (G_OBJECT_CLASS (gkm_gnome2_module_parent_class)->constructor(type, n_props, props));
g_return_val_if_fail (self, NULL);
if (!self->directory)
self->directory = g_build_filename (g_get_home_dir (), ".gnome2", "keyrings", NULL);
- self->storage = gkm_user_storage_new (GKM_MODULE (self), self->directory);
+ self->storage = gkm_gnome2_storage_new (GKM_MODULE (self), self->directory);
return G_OBJECT (self);
}
static void
-gkm_user_module_init (GkmUserModule *self)
+gkm_gnome2_module_init (GkmGnome2Module *self)
{
self->unlocked_apps = g_hash_table_new_full (gkm_util_ulong_hash, gkm_util_ulong_equal, gkm_util_ulong_free, NULL);
@@ -280,14 +280,14 @@ gkm_user_module_init (GkmUserModule *self)
memcpy (&self->token_info, &user_module_token_info, sizeof (CK_TOKEN_INFO));
/* For creating stored keys */
- gkm_module_register_factory (GKM_MODULE (self), GKM_FACTORY_USER_PRIVATE_KEY);
- gkm_module_register_factory (GKM_MODULE (self), GKM_FACTORY_USER_PUBLIC_KEY);
+ gkm_module_register_factory (GKM_MODULE (self), GKM_FACTORY_GNOME2_PRIVATE_KEY);
+ gkm_module_register_factory (GKM_MODULE (self), GKM_FACTORY_GNOME2_PUBLIC_KEY);
}
static void
-gkm_user_module_dispose (GObject *obj)
+gkm_gnome2_module_dispose (GObject *obj)
{
- GkmUserModule *self = GKM_USER_MODULE (obj);
+ GkmGnome2Module *self = GKM_GNOME2_MODULE (obj);
if (self->storage)
g_object_unref (self->storage);
@@ -295,13 +295,13 @@ gkm_user_module_dispose (GObject *obj)
g_hash_table_remove_all (self->unlocked_apps);
- G_OBJECT_CLASS (gkm_user_module_parent_class)->dispose (obj);
+ G_OBJECT_CLASS (gkm_gnome2_module_parent_class)->dispose (obj);
}
static void
-gkm_user_module_finalize (GObject *obj)
+gkm_gnome2_module_finalize (GObject *obj)
{
- GkmUserModule *self = GKM_USER_MODULE (obj);
+ GkmGnome2Module *self = GKM_GNOME2_MODULE (obj);
g_assert (self->storage == NULL);
@@ -312,30 +312,30 @@ gkm_user_module_finalize (GObject *obj)
g_free (self->directory);
self->directory = NULL;
- G_OBJECT_CLASS (gkm_user_module_parent_class)->finalize (obj);
+ G_OBJECT_CLASS (gkm_gnome2_module_parent_class)->finalize (obj);
}
static void
-gkm_user_module_class_init (GkmUserModuleClass *klass)
+gkm_gnome2_module_class_init (GkmGnome2ModuleClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GkmModuleClass *module_class = GKM_MODULE_CLASS (klass);
- gobject_class->constructor = gkm_user_module_constructor;
- gobject_class->dispose = gkm_user_module_dispose;
- gobject_class->finalize = gkm_user_module_finalize;
-
- module_class->get_slot_info = gkm_user_module_real_get_slot_info;
- module_class->get_token_info = gkm_user_module_real_get_token_info;
- module_class->parse_argument = gkm_user_module_real_parse_argument;
- module_class->refresh_token = gkm_user_module_real_refresh_token;
- module_class->add_token_object = gkm_user_module_real_add_token_object;
- module_class->store_token_object = gkm_user_module_real_store_token_object;
- module_class->remove_token_object = gkm_user_module_real_remove_token_object;
- module_class->login_user = gkm_user_module_real_login_user;
- module_class->login_so = gkm_user_module_real_login_so;
- module_class->logout_user = gkm_user_module_real_logout_user;
- module_class->login_change = gkm_user_module_real_login_change;
+ gobject_class->constructor = gkm_gnome2_module_constructor;
+ gobject_class->dispose = gkm_gnome2_module_dispose;
+ gobject_class->finalize = gkm_gnome2_module_finalize;
+
+ module_class->get_slot_info = gkm_gnome2_module_real_get_slot_info;
+ module_class->get_token_info = gkm_gnome2_module_real_get_token_info;
+ module_class->parse_argument = gkm_gnome2_module_real_parse_argument;
+ module_class->refresh_token = gkm_gnome2_module_real_refresh_token;
+ module_class->add_token_object = gkm_gnome2_module_real_add_token_object;
+ module_class->store_token_object = gkm_gnome2_module_real_store_token_object;
+ module_class->remove_token_object = gkm_gnome2_module_real_remove_token_object;
+ module_class->login_user = gkm_gnome2_module_real_login_user;
+ module_class->login_so = gkm_gnome2_module_real_login_so;
+ module_class->logout_user = gkm_gnome2_module_real_logout_user;
+ module_class->login_change = gkm_gnome2_module_real_login_change;
}
/* ----------------------------------------------------------------------------
@@ -343,8 +343,8 @@ gkm_user_module_class_init (GkmUserModuleClass *klass)
*/
CK_FUNCTION_LIST_PTR
-gkm_user_store_get_functions (void)
+gkm_gnome2_store_get_functions (void)
{
gkm_crypto_initialize ();
- return gkm_user_module_function_list;
+ return gkm_gnome2_module_function_list;
}
diff --git a/pkcs11/gnome2-store/gkm-gnome2-module.h b/pkcs11/gnome2-store/gkm-gnome2-module.h
new file mode 100644
index 0000000..c952c57
--- /dev/null
+++ b/pkcs11/gnome2-store/gkm-gnome2-module.h
@@ -0,0 +1,45 @@
+/*
+ * gnome-keyring
+ *
+ * Copyright (C) 2008 Stefan Walter
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef __GKM_GNOME2_MODULE_H__
+#define __GKM_GNOME2_MODULE_H__
+
+#include <glib-object.h>
+
+#include "gkm/gkm-module.h"
+
+#define GKM_TYPE_GNOME2_MODULE (gkm_gnome2_module_get_type ())
+#define GKM_GNOME2_MODULE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GKM_TYPE_GNOME2_MODULE, GkmGnome2Module))
+#define GKM_GNOME2_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GKM_TYPE_GNOME2_MODULE, GkmGnome2ModuleClass))
+#define GKM_IS_GNOME2_MODULE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GKM_TYPE_GNOME2_MODULE))
+#define GKM_IS_GNOME2_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GKM_TYPE_GNOME2_MODULE))
+#define GKM_GNOME2_MODULE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GKM_TYPE_GNOME2_MODULE, GkmGnome2ModuleClass))
+
+typedef struct _GkmGnome2Module GkmGnome2Module;
+typedef struct _GkmGnome2ModuleClass GkmGnome2ModuleClass;
+
+struct _GkmGnome2ModuleClass {
+ GkmModuleClass parent_class;
+};
+
+GType gkm_gnome2_module_get_type (void);
+
+#endif /* __GKM_GNOME2_MODULE_H__ */
diff --git a/pkcs11/user-store/gkm-user-private-key.c b/pkcs11/gnome2-store/gkm-gnome2-private-key.c
similarity index 74%
rename from pkcs11/user-store/gkm-user-private-key.c
rename to pkcs11/gnome2-store/gkm-gnome2-private-key.c
index eb7d156..31163cf 100644
--- a/pkcs11/user-store/gkm-user-private-key.c
+++ b/pkcs11/gnome2-store/gkm-gnome2-private-key.c
@@ -21,7 +21,7 @@
#include "config.h"
-#include "gkm-user-private-key.h"
+#include "gkm-gnome2-private-key.h"
#include "gkm/gkm-attributes.h"
#include "gkm/gkm-crypto.h"
@@ -43,7 +43,7 @@ enum {
PROP_0,
};
-struct _GkmUserPrivateKey {
+struct _GkmGnome2PrivateKey {
GkmPrivateXsaKey parent;
guchar *private_data;
@@ -54,10 +54,10 @@ struct _GkmUserPrivateKey {
GkmSecret *login;
};
-static void gkm_user_private_key_serializable (GkmSerializableIface *iface);
+static void gkm_gnome2_private_key_serializable (GkmSerializableIface *iface);
-G_DEFINE_TYPE_EXTENDED (GkmUserPrivateKey, gkm_user_private_key, GKM_TYPE_PRIVATE_XSA_KEY, 0,
- G_IMPLEMENT_INTERFACE (GKM_TYPE_SERIALIZABLE, gkm_user_private_key_serializable));
+G_DEFINE_TYPE_EXTENDED (GkmGnome2PrivateKey, gkm_gnome2_private_key, GKM_TYPE_PRIVATE_XSA_KEY, 0,
+ G_IMPLEMENT_INTERFACE (GKM_TYPE_SERIALIZABLE, gkm_gnome2_private_key_serializable));
/* -----------------------------------------------------------------------------
* INTERNAL
@@ -67,7 +67,7 @@ static GkmObject*
factory_create_private_key (GkmSession *session, GkmTransaction *transaction,
CK_ATTRIBUTE_PTR attrs, CK_ULONG n_attrs)
{
- GkmUserPrivateKey *key;
+ GkmGnome2PrivateKey *key;
GkmSexp *sexp;
g_return_val_if_fail (attrs || !n_attrs, NULL);
@@ -76,7 +76,7 @@ factory_create_private_key (GkmSession *session, GkmTransaction *transaction,
if (sexp == NULL)
return NULL;
- key = g_object_new (GKM_TYPE_USER_PRIVATE_KEY, "base-sexp", sexp,
+ key = g_object_new (GKM_TYPE_GNOME2_PRIVATE_KEY, "base-sexp", sexp,
"module", gkm_session_get_module (session),
"manager", gkm_manager_for_template (attrs, n_attrs, session),
NULL);
@@ -95,20 +95,20 @@ factory_create_private_key (GkmSession *session, GkmTransaction *transaction,
*/
static CK_RV
-gkm_user_private_key_real_get_attribute (GkmObject *base, GkmSession *session, CK_ATTRIBUTE_PTR attr)
+gkm_gnome2_private_key_real_get_attribute (GkmObject *base, GkmSession *session, CK_ATTRIBUTE_PTR attr)
{
switch (attr->type) {
case CKA_ALWAYS_AUTHENTICATE:
return gkm_attribute_set_bool (attr, FALSE);
}
- return GKM_OBJECT_CLASS (gkm_user_private_key_parent_class)->get_attribute (base, session, attr);
+ return GKM_OBJECT_CLASS (gkm_gnome2_private_key_parent_class)->get_attribute (base, session, attr);
}
static GkmSexp*
-gkm_user_private_key_real_acquire_crypto_sexp (GkmSexpKey *base, GkmSession *unused)
+gkm_gnome2_private_key_real_acquire_crypto_sexp (GkmSexpKey *base, GkmSession *unused)
{
- GkmUserPrivateKey *self = GKM_USER_PRIVATE_KEY (base);
+ GkmGnome2PrivateKey *self = GKM_GNOME2_PRIVATE_KEY (base);
gcry_sexp_t sexp;
GkmDataResult res;
const gchar *password;
@@ -130,27 +130,27 @@ gkm_user_private_key_real_acquire_crypto_sexp (GkmSexpKey *base, GkmSession *unu
}
static void
-gkm_user_private_key_init (GkmUserPrivateKey *self)
+gkm_gnome2_private_key_init (GkmGnome2PrivateKey *self)
{
}
static void
-gkm_user_private_key_dispose (GObject *obj)
+gkm_gnome2_private_key_dispose (GObject *obj)
{
- GkmUserPrivateKey *self = GKM_USER_PRIVATE_KEY (obj);
+ GkmGnome2PrivateKey *self = GKM_GNOME2_PRIVATE_KEY (obj);
if (self->login)
g_object_unref (self->login);
self->login = NULL;
- G_OBJECT_CLASS (gkm_user_private_key_parent_class)->dispose (obj);
+ G_OBJECT_CLASS (gkm_gnome2_private_key_parent_class)->dispose (obj);
}
static void
-gkm_user_private_key_finalize (GObject *obj)
+gkm_gnome2_private_key_finalize (GObject *obj)
{
- GkmUserPrivateKey *self = GKM_USER_PRIVATE_KEY (obj);
+ GkmGnome2PrivateKey *self = GKM_GNOME2_PRIVATE_KEY (obj);
g_assert (self->login == NULL);
@@ -161,11 +161,11 @@ gkm_user_private_key_finalize (GObject *obj)
gkm_sexp_unref (self->private_sexp);
self->private_sexp = NULL;
- G_OBJECT_CLASS (gkm_user_private_key_parent_class)->finalize (obj);
+ G_OBJECT_CLASS (gkm_gnome2_private_key_parent_class)->finalize (obj);
}
static void
-gkm_user_private_key_set_property (GObject *obj, guint prop_id, const GValue *value,
+gkm_gnome2_private_key_set_property (GObject *obj, guint prop_id, const GValue *value,
GParamSpec *pspec)
{
switch (prop_id) {
@@ -176,7 +176,7 @@ gkm_user_private_key_set_property (GObject *obj, guint prop_id, const GValue *va
}
static void
-gkm_user_private_key_get_property (GObject *obj, guint prop_id, GValue *value,
+gkm_gnome2_private_key_get_property (GObject *obj, guint prop_id, GValue *value,
GParamSpec *pspec)
{
switch (prop_id) {
@@ -187,33 +187,33 @@ gkm_user_private_key_get_property (GObject *obj, guint prop_id, GValue *value,
}
static void
-gkm_user_private_key_class_init (GkmUserPrivateKeyClass *klass)
+gkm_gnome2_private_key_class_init (GkmGnome2PrivateKeyClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GkmObjectClass *gkm_class = GKM_OBJECT_CLASS (klass);
GkmSexpKeyClass *key_class = GKM_SEXP_KEY_CLASS (klass);
- gobject_class->dispose = gkm_user_private_key_dispose;
- gobject_class->finalize = gkm_user_private_key_finalize;
- gobject_class->set_property = gkm_user_private_key_set_property;
- gobject_class->get_property = gkm_user_private_key_get_property;
+ gobject_class->dispose = gkm_gnome2_private_key_dispose;
+ gobject_class->finalize = gkm_gnome2_private_key_finalize;
+ gobject_class->set_property = gkm_gnome2_private_key_set_property;
+ gobject_class->get_property = gkm_gnome2_private_key_get_property;
- gkm_class->get_attribute = gkm_user_private_key_real_get_attribute;
+ gkm_class->get_attribute = gkm_gnome2_private_key_real_get_attribute;
- key_class->acquire_crypto_sexp = gkm_user_private_key_real_acquire_crypto_sexp;
+ key_class->acquire_crypto_sexp = gkm_gnome2_private_key_real_acquire_crypto_sexp;
}
static gboolean
-gkm_user_private_key_real_load (GkmSerializable *base, GkmSecret *login, const guchar *data, gsize n_data)
+gkm_gnome2_private_key_real_load (GkmSerializable *base, GkmSecret *login, const guchar *data, gsize n_data)
{
- GkmUserPrivateKey *self = GKM_USER_PRIVATE_KEY (base);
+ GkmGnome2PrivateKey *self = GKM_GNOME2_PRIVATE_KEY (base);
GkmDataResult res;
gcry_sexp_t sexp, pub;
GkmSexp *wrapper;
const gchar *password;
gsize n_password;
- g_return_val_if_fail (GKM_IS_USER_PRIVATE_KEY (self), FALSE);
+ g_return_val_if_fail (GKM_IS_GNOME2_PRIVATE_KEY (self), FALSE);
g_return_val_if_fail (data, FALSE);
res = gkm_data_der_read_private_pkcs8 (data, n_data, NULL, 0, &sexp);
@@ -290,19 +290,19 @@ gkm_user_private_key_real_load (GkmSerializable *base, GkmSecret *login, const g
}
static gboolean
-gkm_user_private_key_real_save (GkmSerializable *base, GkmSecret *login, guchar **data, gsize *n_data)
+gkm_gnome2_private_key_real_save (GkmSerializable *base, GkmSecret *login, guchar **data, gsize *n_data)
{
- GkmUserPrivateKey *self = GKM_USER_PRIVATE_KEY (base);
+ GkmGnome2PrivateKey *self = GKM_GNOME2_PRIVATE_KEY (base);
const gchar *password;
gsize n_password;
GkmSexp *sexp;
guchar *key;
- g_return_val_if_fail (GKM_IS_USER_PRIVATE_KEY (self), FALSE);
+ g_return_val_if_fail (GKM_IS_GNOME2_PRIVATE_KEY (self), FALSE);
g_return_val_if_fail (data, FALSE);
g_return_val_if_fail (n_data, FALSE);
- sexp = gkm_user_private_key_real_acquire_crypto_sexp (GKM_SEXP_KEY (self), NULL);
+ sexp = gkm_gnome2_private_key_real_acquire_crypto_sexp (GKM_SEXP_KEY (self), NULL);
g_return_val_if_fail (sexp, FALSE);
password = gkm_secret_get_password (login, &n_password);
@@ -325,11 +325,11 @@ gkm_user_private_key_real_save (GkmSerializable *base, GkmSecret *login, guchar
}
static void
-gkm_user_private_key_serializable (GkmSerializableIface *iface)
+gkm_gnome2_private_key_serializable (GkmSerializableIface *iface)
{
iface->extension = ".pkcs8";
- iface->load = gkm_user_private_key_real_load;
- iface->save = gkm_user_private_key_real_save;
+ iface->load = gkm_gnome2_private_key_real_load;
+ iface->save = gkm_gnome2_private_key_real_save;
}
/* -----------------------------------------------------------------------------
@@ -337,7 +337,7 @@ gkm_user_private_key_serializable (GkmSerializableIface *iface)
*/
GkmFactory*
-gkm_user_private_key_get_factory (void)
+gkm_gnome2_private_key_get_factory (void)
{
static CK_OBJECT_CLASS klass = CKO_PRIVATE_KEY;
static CK_BBOOL token = CK_TRUE;
diff --git a/pkcs11/gnome2-store/gkm-gnome2-private-key.h b/pkcs11/gnome2-store/gkm-gnome2-private-key.h
new file mode 100644
index 0000000..dc9f59c
--- /dev/null
+++ b/pkcs11/gnome2-store/gkm-gnome2-private-key.h
@@ -0,0 +1,52 @@
+/*
+ * gnome-keyring
+ *
+ * Copyright (C) 2008 Stefan Walter
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef __GKM_GNOME2_PRIVATE_KEY_H__
+#define __GKM_GNOME2_PRIVATE_KEY_H__
+
+#include <glib-object.h>
+
+#include "gkm-gnome2-private-key.h"
+
+#include "gkm/gkm-secret.h"
+#include "gkm/gkm-private-xsa-key.h"
+
+#define GKM_FACTORY_GNOME2_PRIVATE_KEY (gkm_gnome2_private_key_get_factory ())
+
+#define GKM_TYPE_GNOME2_PRIVATE_KEY (gkm_gnome2_private_key_get_type ())
+#define GKM_GNOME2_PRIVATE_KEY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GKM_TYPE_GNOME2_PRIVATE_KEY, GkmGnome2PrivateKey))
+#define GKM_GNOME2_PRIVATE_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GKM_TYPE_GNOME2_PRIVATE_KEY, GkmGnome2PrivateKeyClass))
+#define GKM_IS_GNOME2_PRIVATE_KEY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GKM_TYPE_GNOME2_PRIVATE_KEY))
+#define GKM_IS_GNOME2_PRIVATE_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GKM_TYPE_GNOME2_PRIVATE_KEY))
+#define GKM_GNOME2_PRIVATE_KEY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GKM_TYPE_GNOME2_PRIVATE_KEY, GkmGnome2PrivateKeyClass))
+
+typedef struct _GkmGnome2PrivateKey GkmGnome2PrivateKey;
+typedef struct _GkmGnome2PrivateKeyClass GkmGnome2PrivateKeyClass;
+
+struct _GkmGnome2PrivateKeyClass {
+ GkmPrivateXsaKeyClass parent_class;
+};
+
+GType gkm_gnome2_private_key_get_type (void);
+
+GkmFactory* gkm_gnome2_private_key_get_factory (void);
+
+#endif /* __GKM_GNOME2_PRIVATE_KEY_H__ */
diff --git a/pkcs11/user-store/gkm-user-public-key.c b/pkcs11/gnome2-store/gkm-gnome2-public-key.c
similarity index 70%
rename from pkcs11/user-store/gkm-user-public-key.c
rename to pkcs11/gnome2-store/gkm-gnome2-public-key.c
index 1761c74..c5fd5cf 100644
--- a/pkcs11/user-store/gkm-user-public-key.c
+++ b/pkcs11/gnome2-store/gkm-gnome2-public-key.c
@@ -21,7 +21,7 @@
#include "config.h"
-#include "gkm-user-public-key.h"
+#include "gkm-gnome2-public-key.h"
#include "gkm/gkm-attributes.h"
#include "gkm/gkm-data-der.h"
@@ -33,14 +33,14 @@
#include <glib/gi18n.h>
-struct _GkmUserPublicKey {
+struct _GkmGnome2PublicKey {
GkmPublicXsaKey parent;
};
-static void gkm_user_public_key_serializable (GkmSerializableIface *iface);
+static void gkm_gnome2_public_key_serializable (GkmSerializableIface *iface);
-G_DEFINE_TYPE_EXTENDED (GkmUserPublicKey, gkm_user_public_key, GKM_TYPE_PUBLIC_XSA_KEY, 0,
- G_IMPLEMENT_INTERFACE (GKM_TYPE_SERIALIZABLE, gkm_user_public_key_serializable));
+G_DEFINE_TYPE_EXTENDED (GkmGnome2PublicKey, gkm_gnome2_public_key, GKM_TYPE_PUBLIC_XSA_KEY, 0,
+ G_IMPLEMENT_INTERFACE (GKM_TYPE_SERIALIZABLE, gkm_gnome2_public_key_serializable));
/* -----------------------------------------------------------------------------
* INTERNAL
@@ -57,7 +57,7 @@ factory_create_public_key (GkmSession *session, GkmTransaction *transaction,
sexp = gkm_public_xsa_key_create_sexp (session, transaction, attrs, n_attrs);
if (sexp != NULL) {
- object = g_object_new (GKM_TYPE_USER_PUBLIC_KEY, "base-sexp", sexp,
+ object = g_object_new (GKM_TYPE_GNOME2_PUBLIC_KEY, "base-sexp", sexp,
"module", gkm_session_get_module (session),
"manager", gkm_manager_for_template (attrs, n_attrs, session),
NULL);
@@ -74,20 +74,20 @@ factory_create_public_key (GkmSession *session, GkmTransaction *transaction,
*/
static void
-gkm_user_public_key_init (GkmUserPublicKey *self)
+gkm_gnome2_public_key_init (GkmGnome2PublicKey *self)
{
}
static void
-gkm_user_public_key_finalize (GObject *obj)
+gkm_gnome2_public_key_finalize (GObject *obj)
{
- /* GkmUserPublicKey *self = GKM_USER_PUBLIC_KEY (obj); */
- G_OBJECT_CLASS (gkm_user_public_key_parent_class)->finalize (obj);
+ /* GkmGnome2PublicKey *self = GKM_GNOME2_PUBLIC_KEY (obj); */
+ G_OBJECT_CLASS (gkm_gnome2_public_key_parent_class)->finalize (obj);
}
static void
-gkm_user_public_key_set_property (GObject *obj, guint prop_id, const GValue *value,
+gkm_gnome2_public_key_set_property (GObject *obj, guint prop_id, const GValue *value,
GParamSpec *pspec)
{
switch (prop_id) {
@@ -98,7 +98,7 @@ gkm_user_public_key_set_property (GObject *obj, guint prop_id, const GValue *val
}
static void
-gkm_user_public_key_get_property (GObject *obj, guint prop_id, GValue *value,
+gkm_gnome2_public_key_get_property (GObject *obj, guint prop_id, GValue *value,
GParamSpec *pspec)
{
switch (prop_id) {
@@ -109,25 +109,25 @@ gkm_user_public_key_get_property (GObject *obj, guint prop_id, GValue *value,
}
static void
-gkm_user_public_key_class_init (GkmUserPublicKeyClass *klass)
+gkm_gnome2_public_key_class_init (GkmGnome2PublicKeyClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = gkm_user_public_key_finalize;
- gobject_class->set_property = gkm_user_public_key_set_property;
- gobject_class->get_property = gkm_user_public_key_get_property;
+ gobject_class->finalize = gkm_gnome2_public_key_finalize;
+ gobject_class->set_property = gkm_gnome2_public_key_set_property;
+ gobject_class->get_property = gkm_gnome2_public_key_get_property;
}
static gboolean
-gkm_user_public_key_real_load (GkmSerializable *base, GkmSecret *login, const guchar *data, gsize n_data)
+gkm_gnome2_public_key_real_load (GkmSerializable *base, GkmSecret *login, const guchar *data, gsize n_data)
{
- GkmUserPublicKey *self = GKM_USER_PUBLIC_KEY (base);
+ GkmGnome2PublicKey *self = GKM_GNOME2_PUBLIC_KEY (base);
GkmDataResult res;
GkmSexp *wrapper;
gcry_sexp_t sexp;
- g_return_val_if_fail (GKM_IS_USER_PUBLIC_KEY (self), FALSE);
+ g_return_val_if_fail (GKM_IS_GNOME2_PUBLIC_KEY (self), FALSE);
g_return_val_if_fail (data, FALSE);
res = gkm_data_der_read_public_key (data, n_data, &sexp);
@@ -156,12 +156,12 @@ gkm_user_public_key_real_load (GkmSerializable *base, GkmSecret *login, const gu
}
static gboolean
-gkm_user_public_key_real_save (GkmSerializable *base, GkmSecret *login, guchar **data, gsize *n_data)
+gkm_gnome2_public_key_real_save (GkmSerializable *base, GkmSecret *login, guchar **data, gsize *n_data)
{
- GkmUserPublicKey *self = GKM_USER_PUBLIC_KEY (base);
+ GkmGnome2PublicKey *self = GKM_GNOME2_PUBLIC_KEY (base);
GkmSexp *wrapper;
- g_return_val_if_fail (GKM_IS_USER_PUBLIC_KEY (self), FALSE);
+ g_return_val_if_fail (GKM_IS_GNOME2_PUBLIC_KEY (self), FALSE);
g_return_val_if_fail (data, FALSE);
g_return_val_if_fail (n_data, FALSE);
@@ -173,11 +173,11 @@ gkm_user_public_key_real_save (GkmSerializable *base, GkmSecret *login, guchar *
}
static void
-gkm_user_public_key_serializable (GkmSerializableIface *iface)
+gkm_gnome2_public_key_serializable (GkmSerializableIface *iface)
{
iface->extension = ".pub";
- iface->load = gkm_user_public_key_real_load;
- iface->save = gkm_user_public_key_real_save;
+ iface->load = gkm_gnome2_public_key_real_load;
+ iface->save = gkm_gnome2_public_key_real_save;
}
/* -----------------------------------------------------------------------------
@@ -185,7 +185,7 @@ gkm_user_public_key_serializable (GkmSerializableIface *iface)
*/
GkmFactory*
-gkm_user_public_key_get_factory (void)
+gkm_gnome2_public_key_get_factory (void)
{
static CK_OBJECT_CLASS klass = CKO_PUBLIC_KEY;
static CK_BBOOL token = CK_TRUE;
diff --git a/pkcs11/gnome2-store/gkm-gnome2-public-key.h b/pkcs11/gnome2-store/gkm-gnome2-public-key.h
new file mode 100644
index 0000000..86e16de
--- /dev/null
+++ b/pkcs11/gnome2-store/gkm-gnome2-public-key.h
@@ -0,0 +1,51 @@
+/*
+ * gnome-keyring
+ *
+ * Copyright (C) 2008 Stefan Walter
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef __GKM_GNOME2_PUBLIC_KEY_H__
+#define __GKM_GNOME2_PUBLIC_KEY_H__
+
+#include <glib-object.h>
+
+#include "gkm/gkm-public-xsa-key.h"
+
+#define GKM_FACTORY_GNOME2_PUBLIC_KEY (gkm_gnome2_public_key_get_factory ())
+
+#define GKM_TYPE_GNOME2_PUBLIC_KEY (gkm_gnome2_public_key_get_type ())
+#define GKM_GNOME2_PUBLIC_KEY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GKM_TYPE_GNOME2_PUBLIC_KEY, GkmGnome2PublicKey))
+#define GKM_GNOME2_PUBLIC_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GKM_TYPE_GNOME2_PUBLIC_KEY, GkmGnome2PublicKeyClass))
+#define GKM_IS_GNOME2_PUBLIC_KEY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GKM_TYPE_GNOME2_PUBLIC_KEY))
+#define GKM_IS_GNOME2_PUBLIC_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GKM_TYPE_GNOME2_PUBLIC_KEY))
+#define GKM_GNOME2_PUBLIC_KEY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GKM_TYPE_GNOME2_PUBLIC_KEY, GkmGnome2PublicKeyClass))
+
+typedef struct _GkmGnome2PublicKey GkmGnome2PublicKey;
+typedef struct _GkmGnome2PublicKeyClass GkmGnome2PublicKeyClass;
+
+struct _GkmGnome2PublicKeyClass {
+ GkmPublicXsaKeyClass parent_class;
+};
+
+GType gkm_gnome2_public_key_get_type (void);
+
+GkmFactory* gkm_gnome2_public_key_get_factory (void);
+
+GkmGnome2PublicKey* gkm_gnome2_public_key_new (const gchar *unique);
+
+#endif /* __GKM_GNOME2_PUBLIC_KEY_H__ */
diff --git a/pkcs11/user-store/gkm-user-standalone.c b/pkcs11/gnome2-store/gkm-gnome2-standalone.c
similarity index 89%
rename from pkcs11/user-store/gkm-user-standalone.c
rename to pkcs11/gnome2-store/gkm-gnome2-standalone.c
index d8dd496..21ad2c6 100644
--- a/pkcs11/user-store/gkm-user-standalone.c
+++ b/pkcs11/gnome2-store/gkm-gnome2-standalone.c
@@ -1,5 +1,5 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* gkm-user-standalone.h - The user-store PKCS#11 code as a standalone module
+/* gkm-gnome2-standalone.h - The user-store PKCS#11 code as a standalone module
Copyright (C) 2008, Stef Walter
@@ -23,7 +23,7 @@
#include "config.h"
-#include "gkm-user-store.h"
+#include "gkm-gnome2-store.h"
#include "gkm/gkm-crypto.h"
@@ -46,6 +46,6 @@ C_GetFunctionList (CK_FUNCTION_LIST_PTR_PTR list)
if (!g_thread_supported ())
g_thread_init (NULL);
- *list = gkm_user_store_get_functions ();
+ *list = gkm_gnome2_store_get_functions ();
return CKR_OK;
}
diff --git a/pkcs11/user-store/gkm-user-storage.c b/pkcs11/gnome2-store/gkm-gnome2-storage.c
similarity index 81%
rename from pkcs11/user-store/gkm-user-storage.c
rename to pkcs11/gnome2-store/gkm-gnome2-storage.c
index 6ea47ff..1244181 100644
--- a/pkcs11/user-store/gkm-user-storage.c
+++ b/pkcs11/gnome2-store/gkm-gnome2-storage.c
@@ -21,10 +21,10 @@
#include "config.h"
-#include "gkm-user-file.h"
-#include "gkm-user-private-key.h"
-#include "gkm-user-public-key.h"
-#include "gkm-user-storage.h"
+#include "gkm-gnome2-file.h"
+#include "gkm-gnome2-private-key.h"
+#include "gkm-gnome2-public-key.h"
+#include "gkm-gnome2-storage.h"
#include "gkm/gkm-certificate.h"
#include "gkm/gkm-data-asn1.h"
@@ -58,7 +58,7 @@ enum {
PROP_LOGIN
};
-struct _GkmUserStorage {
+struct _GkmGnome2Storage {
GkmStore parent;
GkmModule *module;
@@ -67,7 +67,7 @@ struct _GkmUserStorage {
/* Information about file data */
gchar *directory;
gchar *filename;
- GkmUserFile *file;
+ GkmGnome2File *file;
time_t last_mtime;
GkmSecret *login;
@@ -82,7 +82,7 @@ struct _GkmUserStorage {
gint read_fd;
};
-G_DEFINE_TYPE (GkmUserStorage, gkm_user_storage, GKM_TYPE_STORE);
+G_DEFINE_TYPE (GkmGnome2Storage, gkm_gnome2_storage, GKM_TYPE_STORE);
#define MAX_LOCK_TRIES 20
@@ -194,9 +194,9 @@ type_from_extension (const gchar *extension)
g_assert (extension);
if (strcmp (extension, ".pkcs8") == 0)
- return GKM_TYPE_USER_PRIVATE_KEY;
+ return GKM_TYPE_GNOME2_PRIVATE_KEY;
else if (strcmp (extension, ".pub") == 0)
- return GKM_TYPE_USER_PUBLIC_KEY;
+ return GKM_TYPE_GNOME2_PUBLIC_KEY;
else if (strcmp (extension, ".cer") == 0)
return GKM_TYPE_CERTIFICATE;
@@ -231,7 +231,7 @@ complete_lock_file (GkmTransaction *transaction, GObject *object, gpointer data)
}
static gint
-begin_lock_file (GkmUserStorage *self, GkmTransaction *transaction)
+begin_lock_file (GkmGnome2Storage *self, GkmTransaction *transaction)
{
guint tries = 0;
gint fd = -1;
@@ -241,7 +241,7 @@ begin_lock_file (GkmUserStorage *self, GkmTransaction *transaction)
* that's the callers job if necessary.
*/
- g_assert (GKM_IS_USER_STORAGE (self));
+ g_assert (GKM_IS_GNOME2_STORAGE (self));
g_assert (GKM_IS_TRANSACTION (transaction));
g_return_val_if_fail (!gkm_transaction_get_failed (transaction), -1);
@@ -286,11 +286,11 @@ begin_lock_file (GkmUserStorage *self, GkmTransaction *transaction)
static gboolean
complete_write_state (GkmTransaction *transaction, GObject *object, gpointer unused)
{
- GkmUserStorage *self = GKM_USER_STORAGE (object);
+ GkmGnome2Storage *self = GKM_GNOME2_STORAGE (object);
gboolean ret = TRUE;
struct stat sb;
- g_return_val_if_fail (GKM_IS_USER_STORAGE (object), FALSE);
+ g_return_val_if_fail (GKM_IS_GNOME2_STORAGE (object), FALSE);
g_return_val_if_fail (GKM_IS_TRANSACTION (transaction), FALSE);
g_return_val_if_fail (self->transaction == transaction, FALSE);
@@ -322,9 +322,9 @@ complete_write_state (GkmTransaction *transaction, GObject *object, gpointer unu
}
static gboolean
-begin_write_state (GkmUserStorage *self, GkmTransaction *transaction)
+begin_write_state (GkmGnome2Storage *self, GkmTransaction *transaction)
{
- g_assert (GKM_IS_USER_STORAGE (self));
+ g_assert (GKM_IS_GNOME2_STORAGE (self));
g_assert (GKM_IS_TRANSACTION (transaction));
g_return_val_if_fail (!gkm_transaction_get_failed (transaction), FALSE);
@@ -359,11 +359,11 @@ begin_write_state (GkmUserStorage *self, GkmTransaction *transaction)
static gboolean
complete_modification_state (GkmTransaction *transaction, GObject *object, gpointer unused)
{
- GkmUserStorage *self = GKM_USER_STORAGE (object);
+ GkmGnome2Storage *self = GKM_GNOME2_STORAGE (object);
GkmDataResult res;
if (!gkm_transaction_get_failed (transaction)) {
- res = gkm_user_file_write_fd (self->file, self->write_fd, self->login);
+ res = gkm_gnome2_file_write_fd (self->file, self->write_fd, self->login);
switch(res) {
case GKM_DATA_FAILURE:
case GKM_DATA_UNRECOGNIZED:
@@ -383,7 +383,7 @@ complete_modification_state (GkmTransaction *transaction, GObject *object, gpoin
}
static gboolean
-begin_modification_state (GkmUserStorage *self, GkmTransaction *transaction)
+begin_modification_state (GkmGnome2Storage *self, GkmTransaction *transaction)
{
GkmDataResult res;
struct stat sb;
@@ -395,7 +395,7 @@ begin_modification_state (GkmUserStorage *self, GkmTransaction *transaction)
/* See if file needs updating */
if (fstat (self->read_fd, &sb) >= 0 && sb.st_mtime != self->last_mtime) {
- res = gkm_user_file_read_fd (self->file, self->read_fd, self->login);
+ res = gkm_gnome2_file_read_fd (self->file, self->read_fd, self->login);
switch (res) {
case GKM_DATA_FAILURE:
g_message ("failure updating user store file: %s", self->filename);
@@ -429,11 +429,11 @@ begin_modification_state (GkmUserStorage *self, GkmTransaction *transaction)
}
static void
-take_object_ownership (GkmUserStorage *self, const gchar *identifier, GkmObject *object)
+take_object_ownership (GkmGnome2Storage *self, const gchar *identifier, GkmObject *object)
{
gchar *str;
- g_assert (GKM_IS_USER_STORAGE (self));
+ g_assert (GKM_IS_GNOME2_STORAGE (self));
g_assert (GKM_IS_OBJECT (object));
g_assert (g_hash_table_lookup (self->identifier_to_object, identifier) == NULL);
@@ -450,7 +450,7 @@ take_object_ownership (GkmUserStorage *self, const gchar *identifier, GkmObject
}
static gboolean
-check_object_hash (GkmUserStorage *self, const gchar *identifier, const guchar *data, gsize n_data)
+check_object_hash (GkmGnome2Storage *self, const gchar *identifier, const guchar *data, gsize n_data)
{
gconstpointer value;
GkmDataResult res;
@@ -458,14 +458,14 @@ check_object_hash (GkmUserStorage *self, const gchar *identifier, const guchar *
gsize n_value;
gchar *digest;
- g_assert (GKM_IS_USER_STORAGE (self));
+ g_assert (GKM_IS_GNOME2_STORAGE (self));
g_assert (identifier);
g_assert (data);
digest = g_compute_checksum_for_data (G_CHECKSUM_SHA1, data, n_data);
g_return_val_if_fail (digest, FALSE);
- res = gkm_user_file_read_value (self->file, identifier, CKA_GNOME_INTERNAL_SHA1, &value, &n_value);
+ res = gkm_gnome2_file_read_value (self->file, identifier, CKA_GNOME_INTERNAL_SHA1, &value, &n_value);
g_return_val_if_fail (res == GKM_DATA_SUCCESS, FALSE);
result = (strlen (digest) == n_value && memcmp (digest, value, n_value) == 0);
@@ -475,13 +475,13 @@ check_object_hash (GkmUserStorage *self, const gchar *identifier, const guchar *
}
static void
-store_object_hash (GkmUserStorage *self, GkmTransaction *transaction, const gchar *identifier,
+store_object_hash (GkmGnome2Storage *self, GkmTransaction *transaction, const gchar *identifier,
const guchar *data, gsize n_data)
{
GkmDataResult res;
gchar *digest;
- g_assert (GKM_IS_USER_STORAGE (self));
+ g_assert (GKM_IS_GNOME2_STORAGE (self));
g_assert (GKM_IS_TRANSACTION (transaction));
g_assert (identifier);
g_assert (data);
@@ -492,7 +492,7 @@ store_object_hash (GkmUserStorage *self, GkmTransaction *transaction, const gcha
g_return_if_reached ();
}
- res = gkm_user_file_write_value (self->file, identifier, CKA_GNOME_INTERNAL_SHA1, digest, strlen (digest));
+ res = gkm_gnome2_file_write_value (self->file, identifier, CKA_GNOME_INTERNAL_SHA1, digest, strlen (digest));
g_free (digest);
if (res != GKM_DATA_SUCCESS)
@@ -500,7 +500,7 @@ store_object_hash (GkmUserStorage *self, GkmTransaction *transaction, const gcha
}
static void
-data_file_entry_added (GkmUserFile *store, const gchar *identifier, GkmUserStorage *self)
+data_file_entry_added (GkmGnome2File *store, const gchar *identifier, GkmGnome2Storage *self)
{
GError *error = NULL;
GkmObject *object;
@@ -510,7 +510,7 @@ data_file_entry_added (GkmUserFile *store, const gchar *identifier, GkmUserStora
GType type;
gchar *path;
- g_return_if_fail (GKM_IS_USER_STORAGE (self));
+ g_return_if_fail (GKM_IS_GNOME2_STORAGE (self));
g_return_if_fail (identifier);
/* Already have this object? */
@@ -560,11 +560,11 @@ data_file_entry_added (GkmUserFile *store, const gchar *identifier, GkmUserStora
}
static void
-data_file_entry_changed (GkmUserFile *store, const gchar *identifier, CK_ATTRIBUTE_TYPE type, GkmUserStorage *self)
+data_file_entry_changed (GkmGnome2File *store, const gchar *identifier, CK_ATTRIBUTE_TYPE type, GkmGnome2Storage *self)
{
GkmObject *object;
- g_return_if_fail (GKM_IS_USER_STORAGE (self));
+ g_return_if_fail (GKM_IS_GNOME2_STORAGE (self));
g_return_if_fail (identifier);
object = g_hash_table_lookup (self->identifier_to_object, identifier);
@@ -573,11 +573,11 @@ data_file_entry_changed (GkmUserFile *store, const gchar *identifier, CK_ATTRIBU
}
static void
-data_file_entry_removed (GkmUserFile *store, const gchar *identifier, GkmUserStorage *self)
+data_file_entry_removed (GkmGnome2File *store, const gchar *identifier, GkmGnome2Storage *self)
{
GkmObject *object;
- g_return_if_fail (GKM_IS_USER_STORAGE (self));
+ g_return_if_fail (GKM_IS_GNOME2_STORAGE (self));
g_return_if_fail (identifier);
object = g_hash_table_lookup (self->identifier_to_object, identifier);
@@ -591,7 +591,7 @@ data_file_entry_removed (GkmUserFile *store, const gchar *identifier, GkmUserSto
}
static void
-relock_object (GkmUserStorage *self, GkmTransaction *transaction, const gchar *path,
+relock_object (GkmGnome2Storage *self, GkmTransaction *transaction, const gchar *path,
const gchar *identifier, GkmSecret *old_login, GkmSecret *new_login)
{
GError *error = NULL;
@@ -600,7 +600,7 @@ relock_object (GkmUserStorage *self, GkmTransaction *transaction, const gchar *p
gsize n_data;
GType type;
- g_assert (GKM_IS_USER_STORAGE (self));
+ g_assert (GKM_IS_GNOME2_STORAGE (self));
g_assert (GKM_IS_TRANSACTION (transaction));
g_assert (identifier);
g_assert (path);
@@ -675,28 +675,28 @@ relock_object (GkmUserStorage *self, GkmTransaction *transaction, const gchar *p
}
typedef struct _RelockArgs {
- GkmUserStorage *self;
+ GkmGnome2Storage *self;
GkmTransaction *transaction;
GkmSecret *old_login;
GkmSecret *new_login;
} RelockArgs;
static void
-relock_each_object (GkmUserFile *file, const gchar *identifier, gpointer data)
+relock_each_object (GkmGnome2File *file, const gchar *identifier, gpointer data)
{
RelockArgs *args = data;
gchar *path;
guint section;
- g_assert (GKM_IS_USER_STORAGE (args->self));
+ g_assert (GKM_IS_GNOME2_STORAGE (args->self));
if (gkm_transaction_get_failed (args->transaction))
return;
- if (!gkm_user_file_lookup_entry (file, identifier, §ion))
+ if (!gkm_gnome2_file_lookup_entry (file, identifier, §ion))
g_return_if_reached ();
/* Only operate on private files */
- if (section != GKM_USER_FILE_SECTION_PRIVATE)
+ if (section != GKM_GNOME2_FILE_SECTION_PRIVATE)
return;
path = g_build_filename (args->self->directory, identifier, NULL);
@@ -705,14 +705,14 @@ relock_each_object (GkmUserFile *file, const gchar *identifier, gpointer data)
}
static CK_RV
-refresh_with_login (GkmUserStorage *self, GkmSecret *login)
+refresh_with_login (GkmGnome2Storage *self, GkmSecret *login)
{
GkmDataResult res;
struct stat sb;
CK_RV rv;
int fd;
- g_assert (GKM_USER_STORAGE (self));
+ g_assert (GKM_GNOME2_STORAGE (self));
/* Open the file for reading */
fd = open (self->filename, O_RDONLY, 0);
@@ -728,7 +728,7 @@ refresh_with_login (GkmUserStorage *self, GkmSecret *login)
if (fstat (fd, &sb) >= 0)
self->last_mtime = sb.st_mtime;
- res = gkm_user_file_read_fd (self->file, fd, login);
+ res = gkm_gnome2_file_read_fd (self->file, fd, login);
switch (res) {
case GKM_DATA_FAILURE:
g_message ("failure reading from file: %s", self->filename);
@@ -762,16 +762,16 @@ refresh_with_login (GkmUserStorage *self, GkmSecret *login)
*/
static CK_RV
-gkm_user_storage_real_read_value (GkmStore *base, GkmObject *object, CK_ATTRIBUTE_PTR attr)
+gkm_gnome2_storage_real_read_value (GkmStore *base, GkmObject *object, CK_ATTRIBUTE_PTR attr)
{
- GkmUserStorage *self = GKM_USER_STORAGE (base);
+ GkmGnome2Storage *self = GKM_GNOME2_STORAGE (base);
const gchar *identifier;
GkmDataResult res;
gconstpointer value;
gsize n_value;
CK_RV rv;
- g_return_val_if_fail (GKM_IS_USER_STORAGE (self), CKR_GENERAL_ERROR);
+ g_return_val_if_fail (GKM_IS_GNOME2_STORAGE (self), CKR_GENERAL_ERROR);
g_return_val_if_fail (GKM_IS_OBJECT (object), CKR_GENERAL_ERROR);
g_return_val_if_fail (attr, CKR_GENERAL_ERROR);
@@ -780,12 +780,12 @@ gkm_user_storage_real_read_value (GkmStore *base, GkmObject *object, CK_ATTRIBUT
return CKR_ATTRIBUTE_TYPE_INVALID;
if (self->last_mtime == 0) {
- rv = gkm_user_storage_refresh (self);
+ rv = gkm_gnome2_storage_refresh (self);
if (rv != CKR_OK)
return rv;
}
- res = gkm_user_file_read_value (self->file, identifier, attr->type, &value, &n_value);
+ res = gkm_gnome2_file_read_value (self->file, identifier, attr->type, &value, &n_value);
switch (res) {
case GKM_DATA_FAILURE:
g_return_val_if_reached (CKR_GENERAL_ERROR);
@@ -804,14 +804,14 @@ gkm_user_storage_real_read_value (GkmStore *base, GkmObject *object, CK_ATTRIBUT
}
static void
-gkm_user_storage_real_write_value (GkmStore *base, GkmTransaction *transaction, GkmObject *object, CK_ATTRIBUTE_PTR attr)
+gkm_gnome2_storage_real_write_value (GkmStore *base, GkmTransaction *transaction, GkmObject *object, CK_ATTRIBUTE_PTR attr)
{
- GkmUserStorage *self = GKM_USER_STORAGE (base);
+ GkmGnome2Storage *self = GKM_GNOME2_STORAGE (base);
const gchar *identifier;
GkmDataResult res;
CK_RV rv;
- g_return_if_fail (GKM_IS_USER_STORAGE (self));
+ g_return_if_fail (GKM_IS_GNOME2_STORAGE (self));
g_return_if_fail (GKM_IS_OBJECT (object));
g_return_if_fail (GKM_IS_TRANSACTION (transaction));
g_return_if_fail (!gkm_transaction_get_failed (transaction));
@@ -824,14 +824,14 @@ gkm_user_storage_real_write_value (GkmStore *base, GkmTransaction *transaction,
}
if (self->last_mtime == 0) {
- rv = gkm_user_storage_refresh (self);
+ rv = gkm_gnome2_storage_refresh (self);
if (rv != CKR_OK) {
gkm_transaction_fail (transaction, rv);
return;
}
}
- res = gkm_user_file_write_value (self->file, identifier, attr->type, attr->pValue, attr->ulValueLen);
+ res = gkm_gnome2_file_write_value (self->file, identifier, attr->type, attr->pValue, attr->ulValueLen);
switch (res) {
case GKM_DATA_FAILURE:
rv = CKR_FUNCTION_FAILED;
@@ -854,9 +854,9 @@ gkm_user_storage_real_write_value (GkmStore *base, GkmTransaction *transaction,
}
static GObject*
-gkm_user_storage_constructor (GType type, guint n_props, GObjectConstructParam *props)
+gkm_gnome2_storage_constructor (GType type, guint n_props, GObjectConstructParam *props)
{
- GkmUserStorage *self = GKM_USER_STORAGE (G_OBJECT_CLASS (gkm_user_storage_parent_class)->constructor(type, n_props, props));
+ GkmGnome2Storage *self = GKM_GNOME2_STORAGE (G_OBJECT_CLASS (gkm_gnome2_storage_parent_class)->constructor(type, n_props, props));
g_return_val_if_fail (self, NULL);
g_return_val_if_fail (self->directory, NULL);
@@ -869,9 +869,9 @@ gkm_user_storage_constructor (GType type, guint n_props, GObjectConstructParam *
}
static void
-gkm_user_storage_init (GkmUserStorage *self)
+gkm_gnome2_storage_init (GkmGnome2Storage *self)
{
- self->file = gkm_user_file_new ();
+ self->file = gkm_gnome2_file_new ();
g_signal_connect (self->file, "entry-added", G_CALLBACK (data_file_entry_added), self);
g_signal_connect (self->file, "entry-changed", G_CALLBACK (data_file_entry_changed), self);
g_signal_connect (self->file, "entry-removed", G_CALLBACK (data_file_entry_removed), self);
@@ -885,9 +885,9 @@ gkm_user_storage_init (GkmUserStorage *self)
}
static void
-gkm_user_storage_dispose (GObject *obj)
+gkm_gnome2_storage_dispose (GObject *obj)
{
- GkmUserStorage *self = GKM_USER_STORAGE (obj);
+ GkmGnome2Storage *self = GKM_GNOME2_STORAGE (obj);
if (self->manager)
g_object_unref (self->manager);
@@ -900,13 +900,13 @@ gkm_user_storage_dispose (GObject *obj)
g_hash_table_remove_all (self->object_to_identifier);
g_hash_table_remove_all (self->identifier_to_object);
- G_OBJECT_CLASS (gkm_user_storage_parent_class)->dispose (obj);
+ G_OBJECT_CLASS (gkm_gnome2_storage_parent_class)->dispose (obj);
}
static void
-gkm_user_storage_finalize (GObject *obj)
+gkm_gnome2_storage_finalize (GObject *obj)
{
- GkmUserStorage *self = GKM_USER_STORAGE (obj);
+ GkmGnome2Storage *self = GKM_GNOME2_STORAGE (obj);
g_assert (self->file);
g_object_unref (self->file);
@@ -923,14 +923,14 @@ gkm_user_storage_finalize (GObject *obj)
g_hash_table_destroy (self->object_to_identifier);
g_hash_table_destroy (self->identifier_to_object);
- G_OBJECT_CLASS (gkm_user_storage_parent_class)->finalize (obj);
+ G_OBJECT_CLASS (gkm_gnome2_storage_parent_class)->finalize (obj);
}
static void
-gkm_user_storage_set_property (GObject *obj, guint prop_id, const GValue *value,
+gkm_gnome2_storage_set_property (GObject *obj, guint prop_id, const GValue *value,
GParamSpec *pspec)
{
- GkmUserStorage *self = GKM_USER_STORAGE (obj);
+ GkmGnome2Storage *self = GKM_GNOME2_STORAGE (obj);
switch (prop_id) {
case PROP_DIRECTORY:
@@ -954,23 +954,23 @@ gkm_user_storage_set_property (GObject *obj, guint prop_id, const GValue *value,
}
static void
-gkm_user_storage_get_property (GObject *obj, guint prop_id, GValue *value,
+gkm_gnome2_storage_get_property (GObject *obj, guint prop_id, GValue *value,
GParamSpec *pspec)
{
- GkmUserStorage *self = GKM_USER_STORAGE (obj);
+ GkmGnome2Storage *self = GKM_GNOME2_STORAGE (obj);
switch (prop_id) {
case PROP_DIRECTORY:
- g_value_set_string (value, gkm_user_storage_get_directory (self));
+ g_value_set_string (value, gkm_gnome2_storage_get_directory (self));
break;
case PROP_MODULE:
g_value_set_object (value, self->module);
break;
case PROP_MANAGER:
- g_value_set_object (value, gkm_user_storage_get_manager (self));
+ g_value_set_object (value, gkm_gnome2_storage_get_manager (self));
break;
case PROP_LOGIN:
- g_value_set_object (value, gkm_user_storage_get_login (self));
+ g_value_set_object (value, gkm_gnome2_storage_get_login (self));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
@@ -979,19 +979,19 @@ gkm_user_storage_get_property (GObject *obj, guint prop_id, GValue *value,
}
static void
-gkm_user_storage_class_init (GkmUserStorageClass *klass)
+gkm_gnome2_storage_class_init (GkmGnome2StorageClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GkmStoreClass *store_class = GKM_STORE_CLASS (klass);
- gobject_class->constructor = gkm_user_storage_constructor;
- gobject_class->dispose = gkm_user_storage_dispose;
- gobject_class->finalize = gkm_user_storage_finalize;
- gobject_class->set_property = gkm_user_storage_set_property;
- gobject_class->get_property = gkm_user_storage_get_property;
+ gobject_class->constructor = gkm_gnome2_storage_constructor;
+ gobject_class->dispose = gkm_gnome2_storage_dispose;
+ gobject_class->finalize = gkm_gnome2_storage_finalize;
+ gobject_class->set_property = gkm_gnome2_storage_set_property;
+ gobject_class->get_property = gkm_gnome2_storage_get_property;
- store_class->read_value = gkm_user_storage_real_read_value;
- store_class->write_value = gkm_user_storage_real_write_value;
+ store_class->read_value = gkm_gnome2_storage_real_read_value;
+ store_class->write_value = gkm_gnome2_storage_real_write_value;
g_object_class_install_property (gobject_class, PROP_DIRECTORY,
g_param_spec_string ("directory", "Storage Directory", "Directory for storage",
@@ -1014,8 +1014,8 @@ gkm_user_storage_class_init (GkmUserStorageClass *klass)
* PUBLIC
*/
-GkmUserStorage*
-gkm_user_storage_new (GkmModule *module, const gchar *directory)
+GkmGnome2Storage*
+gkm_gnome2_storage_new (GkmModule *module, const gchar *directory)
{
GkmManager *manager;
@@ -1025,7 +1025,7 @@ gkm_user_storage_new (GkmModule *module, const gchar *directory)
manager = gkm_module_get_manager (module);
g_return_val_if_fail (GKM_IS_MANAGER (manager), NULL);
- return g_object_new (GKM_TYPE_USER_STORAGE,
+ return g_object_new (GKM_TYPE_GNOME2_STORAGE,
"module", module,
"manager", manager,
"directory", directory,
@@ -1033,14 +1033,14 @@ gkm_user_storage_new (GkmModule *module, const gchar *directory)
}
CK_RV
-gkm_user_storage_refresh (GkmUserStorage *self)
+gkm_gnome2_storage_refresh (GkmGnome2Storage *self)
{
- g_return_val_if_fail (GKM_USER_STORAGE (self), CKR_GENERAL_ERROR);
+ g_return_val_if_fail (GKM_GNOME2_STORAGE (self), CKR_GENERAL_ERROR);
return refresh_with_login (self, self->login);
}
void
-gkm_user_storage_create (GkmUserStorage *self, GkmTransaction *transaction, GkmObject *object)
+gkm_gnome2_storage_create (GkmGnome2Storage *self, GkmTransaction *transaction, GkmObject *object)
{
gboolean is_private;
GkmDataResult res;
@@ -1049,7 +1049,7 @@ gkm_user_storage_create (GkmUserStorage *self, GkmTransaction *transaction, GkmO
gsize n_data;
gchar *path;
- g_return_if_fail (GKM_IS_USER_STORAGE (self));
+ g_return_if_fail (GKM_IS_GNOME2_STORAGE (self));
g_return_if_fail (GKM_IS_TRANSACTION (transaction));
g_return_if_fail (!gkm_transaction_get_failed (transaction));
g_return_if_fail (GKM_IS_OBJECT (object));
@@ -1081,7 +1081,7 @@ gkm_user_storage_create (GkmUserStorage *self, GkmTransaction *transaction, GkmO
/* Create an identifier guaranteed unique by this transaction */
identifier = identifier_for_object (object);
- if (gkm_user_file_unique_entry (self->file, &identifier) != GKM_DATA_SUCCESS) {
+ if (gkm_gnome2_file_unique_entry (self->file, &identifier) != GKM_DATA_SUCCESS) {
gkm_transaction_fail (transaction, CKR_FUNCTION_FAILED);
g_return_if_reached ();
}
@@ -1090,8 +1090,8 @@ gkm_user_storage_create (GkmUserStorage *self, GkmTransaction *transaction, GkmO
g_signal_handlers_block_by_func (self->file, data_file_entry_added, self);
g_signal_handlers_block_by_func (self->file, data_file_entry_changed, self);
- res = gkm_user_file_create_entry (self->file, identifier,
- is_private ? GKM_USER_FILE_SECTION_PRIVATE : GKM_USER_FILE_SECTION_PUBLIC);
+ res = gkm_gnome2_file_create_entry (self->file, identifier,
+ is_private ? GKM_GNOME2_FILE_SECTION_PRIVATE : GKM_GNOME2_FILE_SECTION_PUBLIC);
g_signal_handlers_unblock_by_func (self->file, data_file_entry_added, self);
g_signal_handlers_unblock_by_func (self->file, data_file_entry_changed, self);
@@ -1135,13 +1135,13 @@ gkm_user_storage_create (GkmUserStorage *self, GkmTransaction *transaction, GkmO
}
void
-gkm_user_storage_destroy (GkmUserStorage *self, GkmTransaction *transaction, GkmObject *object)
+gkm_gnome2_storage_destroy (GkmGnome2Storage *self, GkmTransaction *transaction, GkmObject *object)
{
GkmDataResult res;
gchar *identifier;
gchar *path;
- g_return_if_fail (GKM_IS_USER_STORAGE (self));
+ g_return_if_fail (GKM_IS_GNOME2_STORAGE (self));
g_return_if_fail (GKM_IS_TRANSACTION (transaction));
g_return_if_fail (!gkm_transaction_get_failed (transaction));
g_return_if_fail (object);
@@ -1162,7 +1162,7 @@ gkm_user_storage_destroy (GkmUserStorage *self, GkmTransaction *transaction, Gkm
return;
/* Now delete the entry from our store */
- res = gkm_user_file_destroy_entry (self->file, identifier);
+ res = gkm_gnome2_file_destroy_entry (self->file, identifier);
switch(res) {
case GKM_DATA_FAILURE:
case GKM_DATA_UNRECOGNIZED:
@@ -1182,24 +1182,24 @@ gkm_user_storage_destroy (GkmUserStorage *self, GkmTransaction *transaction, Gkm
}
void
-gkm_user_storage_relock (GkmUserStorage *self, GkmTransaction *transaction,
+gkm_gnome2_storage_relock (GkmGnome2Storage *self, GkmTransaction *transaction,
GkmSecret *old_login, GkmSecret *new_login)
{
- GkmUserFile *file;
+ GkmGnome2File *file;
GkmDataResult res;
RelockArgs args;
- g_return_if_fail (GKM_IS_USER_STORAGE (self));
+ g_return_if_fail (GKM_IS_GNOME2_STORAGE (self));
g_return_if_fail (GKM_IS_TRANSACTION (transaction));
/* Reload the file with the old password and start transaction */
if (!begin_write_state (self, transaction))
return;
- file = gkm_user_file_new ();
+ file = gkm_gnome2_file_new ();
/* Read in from the old file */
- res = gkm_user_file_read_fd (file, self->read_fd, old_login);
+ res = gkm_gnome2_file_read_fd (file, self->read_fd, old_login);
switch(res) {
case GKM_DATA_FAILURE:
case GKM_DATA_UNRECOGNIZED:
@@ -1215,7 +1215,7 @@ gkm_user_storage_relock (GkmUserStorage *self, GkmTransaction *transaction,
}
/* Write out to new path as new file */
- res = gkm_user_file_write_fd (file, self->write_fd, new_login);
+ res = gkm_gnome2_file_write_fd (file, self->write_fd, new_login);
switch(res) {
case GKM_DATA_FAILURE:
case GKM_DATA_UNRECOGNIZED:
@@ -1234,7 +1234,7 @@ gkm_user_storage_relock (GkmUserStorage *self, GkmTransaction *transaction,
args.transaction = transaction;
args.old_login = old_login;
args.new_login = new_login;
- gkm_user_file_foreach_entry (file, relock_each_object, &args);
+ gkm_gnome2_file_foreach_entry (file, relock_each_object, &args);
if (!gkm_transaction_get_failed (transaction) && self->login) {
if (new_login)
@@ -1248,11 +1248,11 @@ gkm_user_storage_relock (GkmUserStorage *self, GkmTransaction *transaction,
}
CK_RV
-gkm_user_storage_unlock (GkmUserStorage *self, GkmSecret *login)
+gkm_gnome2_storage_unlock (GkmGnome2Storage *self, GkmSecret *login)
{
CK_RV rv;
- g_return_val_if_fail (GKM_IS_USER_STORAGE (self), CKR_GENERAL_ERROR);
+ g_return_val_if_fail (GKM_IS_GNOME2_STORAGE (self), CKR_GENERAL_ERROR);
g_return_val_if_fail (!self->transaction, CKR_GENERAL_ERROR);
if (self->login)
@@ -1280,12 +1280,12 @@ gkm_user_storage_unlock (GkmUserStorage *self, GkmSecret *login)
}
CK_RV
-gkm_user_storage_lock (GkmUserStorage *self)
+gkm_gnome2_storage_lock (GkmGnome2Storage *self)
{
GkmSecret *prev;
CK_RV rv;
- g_return_val_if_fail (GKM_IS_USER_STORAGE (self), CKR_GENERAL_ERROR);
+ g_return_val_if_fail (GKM_IS_GNOME2_STORAGE (self), CKR_GENERAL_ERROR);
g_return_val_if_fail (!self->transaction, CKR_GENERAL_ERROR);
if (!self->login)
@@ -1312,28 +1312,28 @@ gkm_user_storage_lock (GkmUserStorage *self)
}
GkmManager*
-gkm_user_storage_get_manager (GkmUserStorage *self)
+gkm_gnome2_storage_get_manager (GkmGnome2Storage *self)
{
- g_return_val_if_fail (GKM_IS_USER_STORAGE (self), NULL);
+ g_return_val_if_fail (GKM_IS_GNOME2_STORAGE (self), NULL);
return self->manager;
}
const gchar*
-gkm_user_storage_get_directory (GkmUserStorage *self)
+gkm_gnome2_storage_get_directory (GkmGnome2Storage *self)
{
- g_return_val_if_fail (GKM_IS_USER_STORAGE (self), NULL);
+ g_return_val_if_fail (GKM_IS_GNOME2_STORAGE (self), NULL);
return self->directory;
}
GkmSecret*
-gkm_user_storage_get_login (GkmUserStorage *self)
+gkm_gnome2_storage_get_login (GkmGnome2Storage *self)
{
- g_return_val_if_fail (GKM_IS_USER_STORAGE (self), NULL);
+ g_return_val_if_fail (GKM_IS_GNOME2_STORAGE (self), NULL);
return self->login;
}
gulong
-gkm_user_storage_token_flags (GkmUserStorage *self)
+gkm_gnome2_storage_token_flags (GkmGnome2Storage *self)
{
gulong flags = 0;
CK_RV rv;
@@ -1343,7 +1343,7 @@ gkm_user_storage_token_flags (GkmUserStorage *self)
/* No file has been loaded yet? */
if (self->last_mtime == 0) {
- rv = gkm_user_storage_refresh (self);
+ rv = gkm_gnome2_storage_refresh (self);
if (rv == CKR_USER_PIN_NOT_INITIALIZED)
flags |= CKF_USER_PIN_TO_BE_CHANGED;
else if (rv != CKR_OK)
@@ -1351,7 +1351,7 @@ gkm_user_storage_token_flags (GkmUserStorage *self)
}
/* No private stuff in the file? */
- if (gkm_user_file_have_section (self->file, GKM_USER_FILE_SECTION_PRIVATE))
+ if (gkm_gnome2_file_have_section (self->file, GKM_GNOME2_FILE_SECTION_PRIVATE))
flags |= CKF_USER_PIN_INITIALIZED;
return flags;
diff --git a/pkcs11/gnome2-store/gkm-gnome2-storage.h b/pkcs11/gnome2-store/gkm-gnome2-storage.h
new file mode 100644
index 0000000..01b7719
--- /dev/null
+++ b/pkcs11/gnome2-store/gkm-gnome2-storage.h
@@ -0,0 +1,79 @@
+/*
+ * gnome-keyring
+ *
+ * Copyright (C) 2008 Stefan Walter
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef __GKM_GNOME2_STORAGE_H__
+#define __GKM_GNOME2_STORAGE_H__
+
+#include <glib-object.h>
+
+#include "gkm/gkm-manager.h"
+#include "gkm/gkm-secret.h"
+#include "gkm/gkm-store.h"
+#include "gkm/gkm-transaction.h"
+
+#define GKM_TYPE_GNOME2_STORAGE (gkm_gnome2_storage_get_type ())
+#define GKM_GNOME2_STORAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GKM_TYPE_GNOME2_STORAGE, GkmGnome2Storage))
+#define GKM_GNOME2_STORAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GKM_TYPE_GNOME2_STORAGE, GkmGnome2StorageClass))
+#define GKM_IS_GNOME2_STORAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GKM_TYPE_GNOME2_STORAGE))
+#define GKM_IS_GNOME2_STORAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GKM_TYPE_GNOME2_STORAGE))
+#define GKM_GNOME2_STORAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GKM_TYPE_GNOME2_STORAGE, GkmGnome2StorageClass))
+
+typedef struct _GkmGnome2Storage GkmGnome2Storage;
+typedef struct _GkmGnome2StorageClass GkmGnome2StorageClass;
+
+struct _GkmGnome2StorageClass {
+ GkmStoreClass parent_class;
+};
+
+GType gkm_gnome2_storage_get_type (void);
+
+GkmGnome2Storage* gkm_gnome2_storage_new (GkmModule *module,
+ const gchar *directory);
+
+GkmManager* gkm_gnome2_storage_get_manager (GkmGnome2Storage *self);
+
+const gchar* gkm_gnome2_storage_get_directory (GkmGnome2Storage *self);
+
+GkmSecret* gkm_gnome2_storage_get_login (GkmGnome2Storage *self);
+
+gulong gkm_gnome2_storage_token_flags (GkmGnome2Storage *self);
+
+CK_RV gkm_gnome2_storage_refresh (GkmGnome2Storage *self);
+
+void gkm_gnome2_storage_create (GkmGnome2Storage *self,
+ GkmTransaction *transaction,
+ GkmObject *object);
+
+void gkm_gnome2_storage_destroy (GkmGnome2Storage *self,
+ GkmTransaction *transaction,
+ GkmObject *object);
+
+void gkm_gnome2_storage_relock (GkmGnome2Storage *self,
+ GkmTransaction *transaction,
+ GkmSecret *old_login,
+ GkmSecret *new_login);
+
+CK_RV gkm_gnome2_storage_unlock (GkmGnome2Storage *self,
+ GkmSecret *login);
+
+CK_RV gkm_gnome2_storage_lock (GkmGnome2Storage *self);
+
+#endif /* __GKM_GNOME2_STORAGE_H__ */
diff --git a/pkcs11/user-store/gkm-user-store.h b/pkcs11/gnome2-store/gkm-gnome2-store.h
similarity index 83%
rename from pkcs11/user-store/gkm-user-store.h
rename to pkcs11/gnome2-store/gkm-gnome2-store.h
index 6e94fa7..85d2292 100644
--- a/pkcs11/user-store/gkm-user-store.h
+++ b/pkcs11/gnome2-store/gkm-gnome2-store.h
@@ -19,11 +19,11 @@
* 02111-1307, USA.
*/
-#ifndef __GKM_USER_STORE_H__
-#define __GKM_USER_STORE_H__
+#ifndef __GKM_GNOME2_STORE_H__
+#define __GKM_GNOME2_STORE_H__
#include "pkcs11/pkcs11.h"
-CK_FUNCTION_LIST_PTR gkm_user_store_get_functions (void);
+CK_FUNCTION_LIST_PTR gkm_gnome2_store_get_functions (void);
-#endif /* __GKM_USER_STORE_H__ */
+#endif /* __GKM_GNOME2_STORE_H__ */
diff --git a/pkcs11/gnome2-store/tests/.gitignore b/pkcs11/gnome2-store/tests/.gitignore
new file mode 100644
index 0000000..6977563
--- /dev/null
+++ b/pkcs11/gnome2-store/tests/.gitignore
@@ -0,0 +1 @@
+/dump-gnome2-file
diff --git a/pkcs11/user-store/tests/Makefile.am b/pkcs11/gnome2-store/tests/Makefile.am
similarity index 62%
rename from pkcs11/user-store/tests/Makefile.am
rename to pkcs11/gnome2-store/tests/Makefile.am
index 1616ac3..b9da08d 100644
--- a/pkcs11/user-store/tests/Makefile.am
+++ b/pkcs11/gnome2-store/tests/Makefile.am
@@ -1,10 +1,10 @@
TESTING_FILES = \
test-module.c \
- unit-test-user-file.c
+ unit-test-gnome2-file.c
TESTING_LIBS = \
- $(top_builddir)/pkcs11/user-store/libgkm-user-store.la \
+ $(top_builddir)/pkcs11/gnome2-store/libgkm-gnome2-store.la \
$(top_builddir)/pkcs11/gkm/libgkm.la \
$(top_builddir)/egg/libegg.la
@@ -17,13 +17,13 @@ EXTRA_DIST = \
# ---------------------------------------------------------------------
noinst_PROGRAMS += \
- dump-data-file
+ dump-gnome2-file
-dump_data_file_SOURCES = \
- dump-data-file.c
+dump_gnome2_file_SOURCES = \
+ dump-gnome2-file.c
-dump_data_file_LDADD = \
+dump_gnome2_file_LDADD = \
$(top_builddir)/pkcs11/gkm/libgkm.la \
- $(top_builddir)/pkcs11/user-store/libgkm-user-store.la \
+ $(top_builddir)/pkcs11/gnome2-store/libgkm-gnome2-store.la \
$(top_builddir)/egg/libegg.la \
$(DAEMON_LIBS)
diff --git a/pkcs11/user-store/tests/dump-data-file.c b/pkcs11/gnome2-store/tests/dump-gnome2-file.c
similarity index 93%
rename from pkcs11/user-store/tests/dump-data-file.c
rename to pkcs11/gnome2-store/tests/dump-gnome2-file.c
index 60d668c..5b2e579 100644
--- a/pkcs11/user-store/tests/dump-data-file.c
+++ b/pkcs11/gnome2-store/tests/dump-gnome2-file.c
@@ -21,7 +21,7 @@
Author: Stef Walter <stef memberwebs com>
*/
-#include "gkm-user-file.h"
+#include "gkm-gnome2-file.h"
#include "gkm/gkm-crypto.h"
@@ -55,7 +55,7 @@ main(int argc, char* argv[])
{
const gchar *password;
GkmDataResult res;
- GkmUserFile *file;
+ GkmGnome2File *file;
GkmSecret *login;
int fd;
@@ -72,8 +72,8 @@ main(int argc, char* argv[])
password = getpass ("Password: ");
login = gkm_secret_new ((guchar*)password, strlen (password));
- file = gkm_user_file_new ();
- res = gkm_user_file_read_fd (file, fd, login);
+ file = gkm_gnome2_file_new ();
+ res = gkm_gnome2_file_read_fd (file, fd, login);
g_object_unref (login);
switch(res) {
@@ -89,7 +89,7 @@ main(int argc, char* argv[])
g_assert_not_reached ();
}
- gkm_user_file_dump (file);
+ gkm_gnome2_file_dump (file);
g_object_unref (file);
return 0;
diff --git a/pkcs11/user-store/tests/p11-tests.conf b/pkcs11/gnome2-store/tests/p11-tests.conf
similarity index 100%
rename from pkcs11/user-store/tests/p11-tests.conf
rename to pkcs11/gnome2-store/tests/p11-tests.conf
diff --git a/pkcs11/user-store/tests/test-data/.gitempty b/pkcs11/gnome2-store/tests/test-data/.gitempty
similarity index 100%
rename from pkcs11/user-store/tests/test-data/.gitempty
rename to pkcs11/gnome2-store/tests/test-data/.gitempty
diff --git a/pkcs11/user-store/tests/test-data/data-file-private.store b/pkcs11/gnome2-store/tests/test-data/data-file-private.store
similarity index 100%
rename from pkcs11/user-store/tests/test-data/data-file-private.store
rename to pkcs11/gnome2-store/tests/test-data/data-file-private.store
diff --git a/pkcs11/user-store/tests/test-data/data-file-public.store b/pkcs11/gnome2-store/tests/test-data/data-file-public.store
similarity index 100%
rename from pkcs11/user-store/tests/test-data/data-file-public.store
rename to pkcs11/gnome2-store/tests/test-data/data-file-public.store
diff --git a/pkcs11/user-store/tests/test-module.c b/pkcs11/gnome2-store/tests/test-module.c
similarity index 91%
rename from pkcs11/user-store/tests/test-module.c
rename to pkcs11/gnome2-store/tests/test-module.c
index ee71b7e..c6c5d91 100644
--- a/pkcs11/user-store/tests/test-module.c
+++ b/pkcs11/gnome2-store/tests/test-module.c
@@ -23,12 +23,12 @@
#include "config.h"
-#include "user-store/gkm-user-store.h"
+#include "gkm-gnome2-store.h"
#include "test-suite.h"
DEFINE_EXTERNAL(user_module)
{
- CK_FUNCTION_LIST_PTR funcs = gkm_user_store_get_functions ();
+ CK_FUNCTION_LIST_PTR funcs = gkm_gnome2_store_get_functions ();
testing_test_p11_module (funcs, "p11-tests.conf");
}
diff --git a/pkcs11/user-store/tests/unit-test-user-file.c b/pkcs11/gnome2-store/tests/unit-test-gnome2-file.c
similarity index 59%
rename from pkcs11/user-store/tests/unit-test-user-file.c
rename to pkcs11/gnome2-store/tests/unit-test-gnome2-file.c
index 80e954d..6b45e62 100644
--- a/pkcs11/user-store/tests/unit-test-user-file.c
+++ b/pkcs11/gnome2-store/tests/unit-test-gnome2-file.c
@@ -27,14 +27,14 @@
#include "gkm/gkm-object.h"
-#include "gkm-user-file.h"
+#include "gkm-gnome2-file.h"
#include <glib/gstdio.h>
#include <fcntl.h>
/* Both point to the same thing */
-static GkmUserFile *data_file = NULL;
+static GkmGnome2File *data_file = NULL;
static gchar *public_filename = NULL;
static gchar *private_filename = NULL;
static gchar *write_filename = NULL;
@@ -51,7 +51,7 @@ DEFINE_SETUP(file_store)
private_filename = testing_data_filename ("data-file-private.store");
write_filename = testing_scratch_filename ("unit-test-file.store");
- data_file = gkm_user_file_new ();
+ data_file = gkm_gnome2_file_new ();
public_fd = g_open (public_filename, O_RDONLY, 0);
g_assert (public_fd != -1);
@@ -89,11 +89,11 @@ DEFINE_TEST(test_file_create)
{
GkmDataResult res;
- res = gkm_user_file_create_entry (data_file, "identifier-public", GKM_USER_FILE_SECTION_PUBLIC);
+ res = gkm_gnome2_file_create_entry (data_file, "identifier-public", GKM_GNOME2_FILE_SECTION_PUBLIC);
g_assert (res == GKM_DATA_SUCCESS);
/* Should be able to create private in a new file */
- res = gkm_user_file_create_entry (data_file, "identifier-public", GKM_USER_FILE_SECTION_PRIVATE);
+ res = gkm_gnome2_file_create_entry (data_file, "identifier-public", GKM_GNOME2_FILE_SECTION_PRIVATE);
g_assert (res == GKM_DATA_SUCCESS);
}
@@ -102,14 +102,14 @@ DEFINE_TEST(test_file_write_value)
GkmDataResult res;
/* Can't write when no identifier present */
- res = gkm_user_file_write_value (data_file, "identifier-public", CKA_LABEL, "public-label", 12);
+ res = gkm_gnome2_file_write_value (data_file, "identifier-public", CKA_LABEL, "public-label", 12);
g_assert (res == GKM_DATA_UNRECOGNIZED);
- res = gkm_user_file_create_entry (data_file, "identifier-public", GKM_USER_FILE_SECTION_PUBLIC);
+ res = gkm_gnome2_file_create_entry (data_file, "identifier-public", GKM_GNOME2_FILE_SECTION_PUBLIC);
g_assert (res == GKM_DATA_SUCCESS);
/* Should be able to write now */
- res = gkm_user_file_write_value (data_file, "identifier-public", CKA_LABEL, "public-label", 12);
+ res = gkm_gnome2_file_write_value (data_file, "identifier-public", CKA_LABEL, "public-label", 12);
g_assert (res == GKM_DATA_SUCCESS);
}
@@ -121,30 +121,30 @@ DEFINE_TEST(test_file_read_value)
guint number = 7778;
/* Write some stuff in */
- res = gkm_user_file_create_entry (data_file, "ident", GKM_USER_FILE_SECTION_PUBLIC);
+ res = gkm_gnome2_file_create_entry (data_file, "ident", GKM_GNOME2_FILE_SECTION_PUBLIC);
g_assert (res == GKM_DATA_SUCCESS);
- res = gkm_user_file_write_value (data_file, "ident", CKA_LABEL, "TWO-label", 10);
+ res = gkm_gnome2_file_write_value (data_file, "ident", CKA_LABEL, "TWO-label", 10);
g_assert (res == GKM_DATA_SUCCESS);
- res = gkm_user_file_write_value (data_file, "ident", CKA_VALUE, &number, sizeof (number));
+ res = gkm_gnome2_file_write_value (data_file, "ident", CKA_VALUE, &number, sizeof (number));
g_assert (res == GKM_DATA_SUCCESS);
/* Read for an invalid item */
- res = gkm_user_file_read_value (data_file, "non-existant", CKA_LABEL, &value, &n_value);
+ res = gkm_gnome2_file_read_value (data_file, "non-existant", CKA_LABEL, &value, &n_value);
g_assert (res == GKM_DATA_UNRECOGNIZED);
/* Read for an invalid attribute */
- res = gkm_user_file_read_value (data_file, "ident", CKA_ID, &value, &n_value);
+ res = gkm_gnome2_file_read_value (data_file, "ident", CKA_ID, &value, &n_value);
g_assert (res == GKM_DATA_UNRECOGNIZED);
/* Read out a valid number */
- res = gkm_user_file_read_value (data_file, "ident", CKA_VALUE, &value, &n_value);
+ res = gkm_gnome2_file_read_value (data_file, "ident", CKA_VALUE, &value, &n_value);
g_assert (res == GKM_DATA_SUCCESS);
g_assert (value);
g_assert (n_value == sizeof (number));
g_assert_cmpuint (*((guint*)value), ==, number);
/* Read out the valid string */
- res = gkm_user_file_read_value (data_file, "ident", CKA_LABEL, &value, &n_value);
+ res = gkm_gnome2_file_read_value (data_file, "ident", CKA_LABEL, &value, &n_value);
g_assert (res == GKM_DATA_SUCCESS);
g_assert (value);
g_assert (n_value == 10);
@@ -155,7 +155,7 @@ DEFINE_TEST(test_file_read)
{
GkmDataResult res;
- res = gkm_user_file_read_fd (data_file, public_fd, NULL);
+ res = gkm_gnome2_file_read_fd (data_file, public_fd, NULL);
g_assert (res == GKM_DATA_SUCCESS);
}
@@ -166,19 +166,19 @@ DEFINE_TEST(test_file_lookup)
gboolean ret;
/* Invalid shouldn't succeed */
- ret = gkm_user_file_lookup_entry (data_file, "non-existant", §ion);
+ ret = gkm_gnome2_file_lookup_entry (data_file, "non-existant", §ion);
g_assert (ret == FALSE);
/* Create a test item */
- res = gkm_user_file_create_entry (data_file, "test-ident", GKM_USER_FILE_SECTION_PUBLIC);
+ res = gkm_gnome2_file_create_entry (data_file, "test-ident", GKM_GNOME2_FILE_SECTION_PUBLIC);
g_assert (res == GKM_DATA_SUCCESS);
- ret = gkm_user_file_lookup_entry (data_file, "test-ident", §ion);
+ ret = gkm_gnome2_file_lookup_entry (data_file, "test-ident", §ion);
g_assert (ret == TRUE);
- g_assert (section == GKM_USER_FILE_SECTION_PUBLIC);
+ g_assert (section == GKM_GNOME2_FILE_SECTION_PUBLIC);
/* Should be able to call without asking for section */
- ret = gkm_user_file_lookup_entry (data_file, "test-ident", NULL);
+ ret = gkm_gnome2_file_lookup_entry (data_file, "test-ident", NULL);
g_assert (ret == TRUE);
}
@@ -190,32 +190,32 @@ DEFINE_TEST(file_read_private_without_login)
gsize n_value;
gboolean ret;
- res = gkm_user_file_read_fd (data_file, private_fd, NULL);
+ res = gkm_gnome2_file_read_fd (data_file, private_fd, NULL);
g_assert (res == GKM_DATA_SUCCESS);
/* Items from the private section should exist */
- ret = gkm_user_file_lookup_entry (data_file, "identifier-private", §ion);
+ ret = gkm_gnome2_file_lookup_entry (data_file, "identifier-private", §ion);
g_assert (ret);
- g_assert (section == GKM_USER_FILE_SECTION_PRIVATE);
+ g_assert (section == GKM_GNOME2_FILE_SECTION_PRIVATE);
/* But we shouldn't be able to read values from those private items */
- ret = gkm_user_file_read_value (data_file, "identifier-private", CKA_LABEL, &value, &n_value);
+ ret = gkm_gnome2_file_read_value (data_file, "identifier-private", CKA_LABEL, &value, &n_value);
g_assert (ret == GKM_DATA_LOCKED);
/* Shouldn't be able to create private items */
- res = gkm_user_file_create_entry (data_file, "dummy-private", GKM_USER_FILE_SECTION_PRIVATE);
+ res = gkm_gnome2_file_create_entry (data_file, "dummy-private", GKM_GNOME2_FILE_SECTION_PRIVATE);
g_assert (res == GKM_DATA_LOCKED);
/* Shouldn't be able to write with another login */
- res = gkm_user_file_write_fd (data_file, write_fd, login);
+ res = gkm_gnome2_file_write_fd (data_file, write_fd, login);
g_assert (res == GKM_DATA_LOCKED);
/* Now load a public file without private bits*/
- res = gkm_user_file_read_fd (data_file, public_fd, NULL);
+ res = gkm_gnome2_file_read_fd (data_file, public_fd, NULL);
g_assert (res == GKM_DATA_SUCCESS);
/* Now we should be able to load private stuff */
- res = gkm_user_file_create_entry (data_file, "dummy-private", GKM_USER_FILE_SECTION_PRIVATE);
+ res = gkm_gnome2_file_create_entry (data_file, "dummy-private", GKM_GNOME2_FILE_SECTION_PRIVATE);
g_assert (res == GKM_DATA_SUCCESS);
}
@@ -223,16 +223,16 @@ DEFINE_TEST(test_file_write)
{
GkmDataResult res;
- res = gkm_user_file_create_entry (data_file, "identifier-public", GKM_USER_FILE_SECTION_PUBLIC);
+ res = gkm_gnome2_file_create_entry (data_file, "identifier-public", GKM_GNOME2_FILE_SECTION_PUBLIC);
g_assert (res == GKM_DATA_SUCCESS);
- res = gkm_user_file_write_value (data_file, "identifier-public", CKA_LABEL, "public-label", 12);
+ res = gkm_gnome2_file_write_value (data_file, "identifier-public", CKA_LABEL, "public-label", 12);
g_assert (res == GKM_DATA_SUCCESS);
- res = gkm_user_file_create_entry (data_file, "identifier-two", GKM_USER_FILE_SECTION_PUBLIC);
+ res = gkm_gnome2_file_create_entry (data_file, "identifier-two", GKM_GNOME2_FILE_SECTION_PUBLIC);
g_assert (res == GKM_DATA_SUCCESS);
- res = gkm_user_file_write_fd (data_file, write_fd, NULL);
+ res = gkm_gnome2_file_write_fd (data_file, write_fd, NULL);
g_assert (res == GKM_DATA_SUCCESS);
}
@@ -240,10 +240,10 @@ DEFINE_TEST(cant_write_private_without_login)
{
GkmDataResult res;
- res = gkm_user_file_create_entry (data_file, "identifier_private", GKM_USER_FILE_SECTION_PRIVATE);
+ res = gkm_gnome2_file_create_entry (data_file, "identifier_private", GKM_GNOME2_FILE_SECTION_PRIVATE);
g_assert (res == GKM_DATA_SUCCESS);
- res = gkm_user_file_write_fd (data_file, write_fd, NULL);
+ res = gkm_gnome2_file_write_fd (data_file, write_fd, NULL);
g_assert (res == GKM_DATA_LOCKED);
}
@@ -252,25 +252,25 @@ DEFINE_TEST(write_private_with_login)
GkmDataResult res;
gulong value;
- res = gkm_user_file_create_entry (data_file, "identifier-public", GKM_USER_FILE_SECTION_PUBLIC);
+ res = gkm_gnome2_file_create_entry (data_file, "identifier-public", GKM_GNOME2_FILE_SECTION_PUBLIC);
g_assert (res == GKM_DATA_SUCCESS);
- res = gkm_user_file_write_value (data_file, "identifier-public", CKA_LABEL, "public-label", 12);
+ res = gkm_gnome2_file_write_value (data_file, "identifier-public", CKA_LABEL, "public-label", 12);
g_assert (res == GKM_DATA_SUCCESS);
- res = gkm_user_file_create_entry (data_file, "identifier-two", GKM_USER_FILE_SECTION_PUBLIC);
+ res = gkm_gnome2_file_create_entry (data_file, "identifier-two", GKM_GNOME2_FILE_SECTION_PUBLIC);
g_assert (res == GKM_DATA_SUCCESS);
- res = gkm_user_file_write_value (data_file, "identifier-two", CKA_LABEL, "TWO-label", 9);
+ res = gkm_gnome2_file_write_value (data_file, "identifier-two", CKA_LABEL, "TWO-label", 9);
g_assert (res == GKM_DATA_SUCCESS);
value = 555;
- res = gkm_user_file_write_value (data_file, "identifier-two", CKA_VALUE, &value, sizeof (value));
+ res = gkm_gnome2_file_write_value (data_file, "identifier-two", CKA_VALUE, &value, sizeof (value));
g_assert (res == GKM_DATA_SUCCESS);
- res = gkm_user_file_create_entry (data_file, "identifier-private", GKM_USER_FILE_SECTION_PRIVATE);
+ res = gkm_gnome2_file_create_entry (data_file, "identifier-private", GKM_GNOME2_FILE_SECTION_PRIVATE);
g_assert (res == GKM_DATA_SUCCESS);
- res = gkm_user_file_write_value (data_file, "identifier-private", CKA_LABEL, "private-label", 13);
+ res = gkm_gnome2_file_write_value (data_file, "identifier-private", CKA_LABEL, "private-label", 13);
g_assert (res == GKM_DATA_SUCCESS);
- res = gkm_user_file_write_fd (data_file, write_fd, login);
+ res = gkm_gnome2_file_write_fd (data_file, write_fd, login);
g_assert (res == GKM_DATA_SUCCESS);
}
@@ -280,11 +280,11 @@ DEFINE_TEST(read_private_with_login)
gconstpointer value;
gsize n_value;
- res = gkm_user_file_read_fd (data_file, private_fd, login);
+ res = gkm_gnome2_file_read_fd (data_file, private_fd, login);
g_assert (res == GKM_DATA_SUCCESS);
/* Should be able to read private items */
- res = gkm_user_file_read_value (data_file, "identifier-private", CKA_LABEL, &value, &n_value);
+ res = gkm_gnome2_file_read_value (data_file, "identifier-private", CKA_LABEL, &value, &n_value);
g_assert (res == GKM_DATA_SUCCESS);
g_assert_cmpuint (n_value, ==, 13);
g_assert (memcmp (value, "private-label", 13) == 0);
@@ -294,20 +294,20 @@ DEFINE_TEST(destroy_entry)
{
GkmDataResult res;
- res = gkm_user_file_destroy_entry (data_file, "non-existant");
+ res = gkm_gnome2_file_destroy_entry (data_file, "non-existant");
g_assert (res == GKM_DATA_UNRECOGNIZED);
- res = gkm_user_file_read_fd (data_file, public_fd, NULL);
+ res = gkm_gnome2_file_read_fd (data_file, public_fd, NULL);
g_assert (res == GKM_DATA_SUCCESS);
/* Make sure it's here */
- g_assert (gkm_user_file_lookup_entry (data_file, "identifier-public", NULL));
+ g_assert (gkm_gnome2_file_lookup_entry (data_file, "identifier-public", NULL));
- res = gkm_user_file_destroy_entry (data_file, "identifier-public");
+ res = gkm_gnome2_file_destroy_entry (data_file, "identifier-public");
g_assert (res == GKM_DATA_SUCCESS);
/* Make sure it's gone */
- g_assert (!gkm_user_file_lookup_entry (data_file, "identifier-public", NULL));
+ g_assert (!gkm_gnome2_file_lookup_entry (data_file, "identifier-public", NULL));
}
DEFINE_TEST(destroy_entry_by_loading)
@@ -315,18 +315,18 @@ DEFINE_TEST(destroy_entry_by_loading)
GkmDataResult res;
/* Create some extra idenifiers */
- res = gkm_user_file_create_entry (data_file, "my-public", GKM_USER_FILE_SECTION_PUBLIC);
+ res = gkm_gnome2_file_create_entry (data_file, "my-public", GKM_GNOME2_FILE_SECTION_PUBLIC);
g_assert (res == GKM_DATA_SUCCESS);
- res = gkm_user_file_create_entry (data_file, "my-private", GKM_USER_FILE_SECTION_PRIVATE);
+ res = gkm_gnome2_file_create_entry (data_file, "my-private", GKM_GNOME2_FILE_SECTION_PRIVATE);
g_assert (res == GKM_DATA_SUCCESS);
/* Now read from the file */
- res = gkm_user_file_read_fd (data_file, public_fd, NULL);
+ res = gkm_gnome2_file_read_fd (data_file, public_fd, NULL);
g_assert (res == GKM_DATA_SUCCESS);
/* Both should be gone */
- g_assert (!gkm_user_file_lookup_entry (data_file, "my-public", NULL));
- g_assert (!gkm_user_file_lookup_entry (data_file, "my-private", NULL));
+ g_assert (!gkm_gnome2_file_lookup_entry (data_file, "my-public", NULL));
+ g_assert (!gkm_gnome2_file_lookup_entry (data_file, "my-private", NULL));
}
@@ -334,24 +334,24 @@ DEFINE_TEST(destroy_private_without_login)
{
GkmDataResult res;
- res = gkm_user_file_read_fd (data_file, private_fd, NULL);
+ res = gkm_gnome2_file_read_fd (data_file, private_fd, NULL);
g_assert (res == GKM_DATA_SUCCESS);
/* Make sure it's here */
- g_assert (gkm_user_file_lookup_entry (data_file, "identifier-private", NULL));
+ g_assert (gkm_gnome2_file_lookup_entry (data_file, "identifier-private", NULL));
/* Shouldn't be able to destroy */
- res = gkm_user_file_destroy_entry (data_file, "identifier-private");
+ res = gkm_gnome2_file_destroy_entry (data_file, "identifier-private");
g_assert (res == GKM_DATA_LOCKED);
/* Make sure it's still here */
- g_assert (gkm_user_file_lookup_entry (data_file, "identifier-private", NULL));
+ g_assert (gkm_gnome2_file_lookup_entry (data_file, "identifier-private", NULL));
}
static void
-entry_added_one (GkmUserFile *df, const gchar *identifier, gboolean *added)
+entry_added_one (GkmGnome2File *df, const gchar *identifier, gboolean *added)
{
- g_assert (GKM_IS_USER_FILE (df));
+ g_assert (GKM_IS_GNOME2_FILE (df));
g_assert (df == data_file);
g_assert (identifier);
g_assert (added);
@@ -370,21 +370,21 @@ DEFINE_TEST(entry_added_signal)
/* Should fire the signal */
added = FALSE;
- res = gkm_user_file_create_entry (data_file, "identifier-public", GKM_USER_FILE_SECTION_PUBLIC);
+ res = gkm_gnome2_file_create_entry (data_file, "identifier-public", GKM_GNOME2_FILE_SECTION_PUBLIC);
g_assert (res == GKM_DATA_SUCCESS);
g_assert (added == TRUE);
/* Another one should be added when we load */
added = FALSE;
- res = gkm_user_file_read_fd (data_file, public_fd, NULL);
+ res = gkm_gnome2_file_read_fd (data_file, public_fd, NULL);
g_assert (res == GKM_DATA_SUCCESS);
g_assert (added == TRUE);
}
static void
-entry_changed_one (GkmUserFile *df, const gchar *identifier, gulong type, gboolean *changed)
+entry_changed_one (GkmGnome2File *df, const gchar *identifier, gulong type, gboolean *changed)
{
- g_assert (GKM_IS_USER_FILE (df));
+ g_assert (GKM_IS_GNOME2_FILE (df));
g_assert (df == data_file);
g_assert (identifier);
g_assert (changed);
@@ -404,40 +404,40 @@ DEFINE_TEST(entry_changed_signal)
/* Loading shouldn't fire the signal */
changed = FALSE;
- res = gkm_user_file_read_fd (data_file, public_fd, NULL);
+ res = gkm_gnome2_file_read_fd (data_file, public_fd, NULL);
g_assert (res == GKM_DATA_SUCCESS);
g_assert (changed == FALSE);
/* Shouldn't fire the signal on nonexistant */
changed = FALSE;
- res = gkm_user_file_write_value (data_file, "non-existant", CKA_LABEL, "new-value", 10);
+ res = gkm_gnome2_file_write_value (data_file, "non-existant", CKA_LABEL, "new-value", 10);
g_assert (res == GKM_DATA_UNRECOGNIZED);
g_assert (changed == FALSE);
/* Should fire the signal */
changed = FALSE;
- res = gkm_user_file_write_value (data_file, "identifier-public", CKA_LABEL, "new-value", 10);
+ res = gkm_gnome2_file_write_value (data_file, "identifier-public", CKA_LABEL, "new-value", 10);
g_assert (res == GKM_DATA_SUCCESS);
g_assert (changed == TRUE);
/* Shouldn't fire the signal, same value again */
changed = FALSE;
- res = gkm_user_file_write_value (data_file, "identifier-public", CKA_LABEL, "new-value", 10);
+ res = gkm_gnome2_file_write_value (data_file, "identifier-public", CKA_LABEL, "new-value", 10);
g_assert (res == GKM_DATA_SUCCESS);
g_assert (changed == FALSE);
/* Reload file, should revert, fire signal */
changed = FALSE;
g_assert (lseek (public_fd, 0, SEEK_SET) != -1);
- res = gkm_user_file_read_fd (data_file, public_fd, NULL);
+ res = gkm_gnome2_file_read_fd (data_file, public_fd, NULL);
g_assert (res == GKM_DATA_SUCCESS);
g_assert (changed == TRUE);
}
static void
-entry_removed_one (GkmUserFile *df, const gchar *identifier, gboolean *removed)
+entry_removed_one (GkmGnome2File *df, const gchar *identifier, gboolean *removed)
{
- g_assert (GKM_IS_USER_FILE (df));
+ g_assert (GKM_IS_GNOME2_FILE (df));
g_assert (df == data_file);
g_assert (identifier);
g_assert (removed);
@@ -456,36 +456,36 @@ DEFINE_TEST(entry_removed_signal)
/* Loading shouldn't fire the signal */
removed = FALSE;
- res = gkm_user_file_read_fd (data_file, public_fd, NULL);
+ res = gkm_gnome2_file_read_fd (data_file, public_fd, NULL);
g_assert (res == GKM_DATA_SUCCESS);
g_assert (removed == FALSE);
/* Shouldn't fire the signal on removing nonexistant */
removed = FALSE;
- res = gkm_user_file_destroy_entry (data_file, "non-existant");
+ res = gkm_gnome2_file_destroy_entry (data_file, "non-existant");
g_assert (res == GKM_DATA_UNRECOGNIZED);
g_assert (removed == FALSE);
/* Remove a real entry */
removed = FALSE;
- res = gkm_user_file_destroy_entry (data_file, "identifier-public");
+ res = gkm_gnome2_file_destroy_entry (data_file, "identifier-public");
g_assert (res == GKM_DATA_SUCCESS);
g_assert (removed == TRUE);
/* Add a dummy entry */
- res = gkm_user_file_create_entry (data_file, "extra-dummy", GKM_USER_FILE_SECTION_PUBLIC);
+ res = gkm_gnome2_file_create_entry (data_file, "extra-dummy", GKM_GNOME2_FILE_SECTION_PUBLIC);
g_assert (res == GKM_DATA_SUCCESS);
/* That one should go away when we reload, fire signal */
removed = FALSE;
g_assert (lseek (public_fd, 0, SEEK_SET) != -1);
- res = gkm_user_file_read_fd (data_file, public_fd, NULL);
+ res = gkm_gnome2_file_read_fd (data_file, public_fd, NULL);
g_assert (res == GKM_DATA_SUCCESS);
g_assert (removed == TRUE);
}
static void
-foreach_entry (GkmUserFile *df, const gchar *identifier, gpointer data)
+foreach_entry (GkmGnome2File *df, const gchar *identifier, gpointer data)
{
GPtrArray *array = data;
const gchar *ident;
@@ -493,7 +493,7 @@ foreach_entry (GkmUserFile *df, const gchar *identifier, gpointer data)
g_assert (data);
g_assert (identifier);
- g_assert (GKM_IS_USER_FILE (df));
+ g_assert (GKM_IS_GNOME2_FILE (df));
/* Check that this is unique */
for (i = 0; i < array->len; ++i) {
@@ -511,11 +511,11 @@ DEFINE_TEST(data_file_foreach)
GkmDataResult res;
GPtrArray *array;
- res = gkm_user_file_read_fd (data_file, private_fd, login);
+ res = gkm_gnome2_file_read_fd (data_file, private_fd, login);
g_assert (res == GKM_DATA_SUCCESS);
array = g_ptr_array_new ();
- gkm_user_file_foreach_entry (data_file, foreach_entry, array);
+ gkm_gnome2_file_foreach_entry (data_file, foreach_entry, array);
g_assert (array->len == 4);
g_ptr_array_add (array, NULL);
@@ -527,26 +527,26 @@ DEFINE_TEST(unique_entry)
GkmDataResult res;
gchar *identifier;
- res = gkm_user_file_read_fd (data_file, public_fd, NULL);
+ res = gkm_gnome2_file_read_fd (data_file, public_fd, NULL);
g_assert (res == GKM_DATA_SUCCESS);
/* Should change an identifier that conflicts */
identifier = g_strdup ("identifier-public");
- res = gkm_user_file_unique_entry (data_file, &identifier);
+ res = gkm_gnome2_file_unique_entry (data_file, &identifier);
g_assert (res == GKM_DATA_SUCCESS);
g_assert_cmpstr (identifier, !=, "identifier-public");
g_free (identifier);
/* Shouldn't change a unique identifier */
identifier = g_strdup ("identifier-unique");
- res = gkm_user_file_unique_entry (data_file, &identifier);
+ res = gkm_gnome2_file_unique_entry (data_file, &identifier);
g_assert (res == GKM_DATA_SUCCESS);
g_assert_cmpstr (identifier, ==, "identifier-unique");
g_free (identifier);
/* Should be able to get from NULL */
identifier = NULL;
- res = gkm_user_file_unique_entry (data_file, &identifier);
+ res = gkm_gnome2_file_unique_entry (data_file, &identifier);
g_assert (res == GKM_DATA_SUCCESS);
g_assert (identifier != NULL);
g_assert (identifier[0] != 0);
@@ -557,36 +557,36 @@ DEFINE_TEST(have_sections)
{
GkmDataResult res;
- res = gkm_user_file_read_fd (data_file, public_fd, NULL);
+ res = gkm_gnome2_file_read_fd (data_file, public_fd, NULL);
g_assert (res == GKM_DATA_SUCCESS);
/* No private section */
- g_assert (gkm_user_file_have_section (data_file, GKM_USER_FILE_SECTION_PUBLIC));
- g_assert (!gkm_user_file_have_section (data_file, GKM_USER_FILE_SECTION_PRIVATE));
+ g_assert (gkm_gnome2_file_have_section (data_file, GKM_GNOME2_FILE_SECTION_PUBLIC));
+ g_assert (!gkm_gnome2_file_have_section (data_file, GKM_GNOME2_FILE_SECTION_PRIVATE));
/* Read private stuff into file, without login */
- res = gkm_user_file_read_fd (data_file, private_fd, NULL);
+ res = gkm_gnome2_file_read_fd (data_file, private_fd, NULL);
g_assert (res == GKM_DATA_SUCCESS);
/* Should have a private section even without login */
- g_assert (gkm_user_file_have_section (data_file, GKM_USER_FILE_SECTION_PUBLIC));
- g_assert (gkm_user_file_have_section (data_file, GKM_USER_FILE_SECTION_PRIVATE));
+ g_assert (gkm_gnome2_file_have_section (data_file, GKM_GNOME2_FILE_SECTION_PUBLIC));
+ g_assert (gkm_gnome2_file_have_section (data_file, GKM_GNOME2_FILE_SECTION_PRIVATE));
/* Read private stuff into file, with login */
g_assert (lseek (private_fd, 0, SEEK_SET) == 0);
- res = gkm_user_file_read_fd (data_file, private_fd, login);
+ res = gkm_gnome2_file_read_fd (data_file, private_fd, login);
g_assert (res == GKM_DATA_SUCCESS);
/* Should have a private section now with login */
- g_assert (gkm_user_file_have_section (data_file, GKM_USER_FILE_SECTION_PUBLIC));
- g_assert (gkm_user_file_have_section (data_file, GKM_USER_FILE_SECTION_PRIVATE));
+ g_assert (gkm_gnome2_file_have_section (data_file, GKM_GNOME2_FILE_SECTION_PUBLIC));
+ g_assert (gkm_gnome2_file_have_section (data_file, GKM_GNOME2_FILE_SECTION_PRIVATE));
/* Read public stuff back into file*/
g_assert (lseek (public_fd, 0, SEEK_SET) == 0);
- res = gkm_user_file_read_fd (data_file, public_fd, login);
+ res = gkm_gnome2_file_read_fd (data_file, public_fd, login);
g_assert (res == GKM_DATA_SUCCESS);
/* Shouldn't have a private section now */
- g_assert (gkm_user_file_have_section (data_file, GKM_USER_FILE_SECTION_PUBLIC));
- g_assert (!gkm_user_file_have_section (data_file, GKM_USER_FILE_SECTION_PRIVATE));
+ g_assert (gkm_gnome2_file_have_section (data_file, GKM_GNOME2_FILE_SECTION_PUBLIC));
+ g_assert (!gkm_gnome2_file_have_section (data_file, GKM_GNOME2_FILE_SECTION_PRIVATE));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
