gnome-keyring r1427 - in trunk: . pkcs11 pkcs11/ssh-keys pkcs11/ssh-store pkcs11/ssh-store/tests

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Jan  4 21:58:57 2009
New Revision: 1427
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1427&view=rev

Log:
	* pkcs11/Makefile.am:
	* pkcs11/ssh-store/: (renamed from ssh-keys)
	* pkcs11/ssh-store/gck-ssh-module.c:
	* pkcs11/ssh-store/gck-ssh-module.h:
	* pkcs11/ssh-store/gck-ssh-standalone.c:
	* pkcs11/ssh-store/gck-ssh-store.h: (added)
	* pkcs11/ssh-store/Makefile.am:
	* pkcs11/ssh-store/tests/Makefile.am:
	* configure.in: Rename 'ssh-keys' to 'ssh-store' component, and add 
	better entry points to access the PKCS#11 module.

Added:
   trunk/pkcs11/ssh-store/
      - copied from r1410, /trunk/pkcs11/ssh-keys/
   trunk/pkcs11/ssh-store/gck-ssh-private-key.c
      - copied unchanged from r1417, /trunk/pkcs11/ssh-keys/gck-ssh-private-key.c
   trunk/pkcs11/ssh-store/gck-ssh-public-key.c
      - copied unchanged from r1417, /trunk/pkcs11/ssh-keys/gck-ssh-public-key.c
   trunk/pkcs11/ssh-store/gck-ssh-store.h
Removed:
   trunk/pkcs11/ssh-keys/
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/pkcs11/Makefile.am
   trunk/pkcs11/ssh-store/Makefile.am
   trunk/pkcs11/ssh-store/gck-ssh-module.c
   trunk/pkcs11/ssh-store/gck-ssh-module.h
   trunk/pkcs11/ssh-store/gck-ssh-standalone.c
   trunk/pkcs11/ssh-store/tests/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jan  4 21:58:57 2009
@@ -518,8 +518,8 @@
 pkcs11/roots/Makefile
 pkcs11/roots/tests/Makefile
 pkcs11/ssh-agent/Makefile
-pkcs11/ssh-keys/Makefile
-pkcs11/ssh-keys/tests/Makefile
+pkcs11/ssh-store/Makefile
+pkcs11/ssh-store/tests/Makefile
 pkcs11/rpc/Makefile
 pkcs11/tests/Makefile
 po/Makefile.in

Modified: trunk/pkcs11/Makefile.am
==============================================================================
--- trunk/pkcs11/Makefile.am	(original)
+++ trunk/pkcs11/Makefile.am	Sun Jan  4 21:58:57 2009
@@ -47,5 +47,5 @@
 TESTS_DIR = 
 endif
 
-SUBDIRS = . rpc gck ssh-agent ssh-keys $(ROOTS_DIR) $(TESTS_DIR)
+SUBDIRS = . rpc gck ssh-agent ssh-store $(ROOTS_DIR) $(TESTS_DIR)
 

Modified: trunk/pkcs11/ssh-store/Makefile.am
==============================================================================
--- /trunk/pkcs11/ssh-keys/Makefile.am	(original)
+++ trunk/pkcs11/ssh-store/Makefile.am	Sun Jan  4 21:58:57 2009
@@ -9,12 +9,13 @@
 	
 			
 # ------------------------------------------------------------------------------
-# The ssh-keys component code
+# The ssh-store component code
 
 noinst_LTLIBRARIES = \
-	libgck-ssh-keys.la
+	libgck-ssh-store.la
 
-libgck_ssh_keys_la_SOURCES = \
+libgck_ssh_store_la_SOURCES = \
+	gck-ssh-store.h \
 	gck-ssh-module.c gck-ssh-module.h \
 	gck-ssh-openssh.c gck-ssh-openssh.h \
 	gck-ssh-private-key.c gck-ssh-private-key.h \
@@ -23,20 +24,20 @@
 # ------------------------------------------------------------------------------
 # The standalone module 
 
-moduledir = $(libdir)/gnome-keyring/standalone/
+moduledir = $(libdir)/gnome-keyring/devel/
 
 module_LTLIBRARIES = \
-	gck-ssh-keys-module.la
+	gck-ssh-store-standalone.la
 
-gck_ssh_keys_module_la_LDFLAGS = \
+gck_ssh_store_standalone_la_LDFLAGS = \
 	-module -avoid-version \
 	-no-undefined -export-symbols-regex 'C_GetFunctionList'
 
-gck_ssh_keys_module_la_SOURCES = \
+gck_ssh_store_standalone_la_SOURCES = \
 	gck-ssh-standalone.c
 
-gck_ssh_keys_module_la_LIBADD = \
-	libgck-ssh-keys.la \
+gck_ssh_store_standalone_la_LIBADD = \
+	libgck-ssh-store.la \
 	$(top_builddir)/pkcs11/gck/libgck.la \
 	$(top_builddir)/common/libgkr-module-common.la \
 	$(GOBJECT_LIBS) \

Modified: trunk/pkcs11/ssh-store/gck-ssh-module.c
==============================================================================
--- /trunk/pkcs11/ssh-keys/gck-ssh-module.c	(original)
+++ trunk/pkcs11/ssh-store/gck-ssh-module.c	Sun Jan  4 21:58:57 2009
@@ -239,3 +239,14 @@
 	module_class->slot_info = &gck_ssh_module_slot_info;
 	module_class->token_info = &gck_ssh_module_token_info;
 }
+
+/* ----------------------------------------------------------------------------
+ * PUBLIC
+ */
+
+CK_FUNCTION_LIST_PTR
+gck_ssh_store_get_functions (void)
+{
+	gck_crypto_initialize ();
+	return gck_ssh_module_function_list;
+}

Modified: trunk/pkcs11/ssh-store/gck-ssh-module.h
==============================================================================
--- /trunk/pkcs11/ssh-keys/gck-ssh-module.h	(original)
+++ trunk/pkcs11/ssh-store/gck-ssh-module.h	Sun Jan  4 21:58:57 2009
@@ -24,6 +24,7 @@
 
 #include <glib-object.h>
 
+#include "gck-ssh-store.h"
 #include "gck/gck-module.h"
 
 #define GCK_TYPE_SSH_MODULE               (gck_ssh_module_get_type ())
@@ -40,8 +41,6 @@
 	GckModuleClass parent_class;
 };
 
-GCK_DECLARE_MODULE (gck_ssh_module);
-
 GType               gck_ssh_module_get_type               (void);
 
 #endif /* __GCK_SSH_MODULE_H__ */

Modified: trunk/pkcs11/ssh-store/gck-ssh-standalone.c
==============================================================================
--- /trunk/pkcs11/ssh-keys/gck-ssh-standalone.c	(original)
+++ trunk/pkcs11/ssh-store/gck-ssh-standalone.c	Sun Jan  4 21:58:57 2009
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "gck-ssh-module.h"
+#include "gck-ssh-store.h"
 
 #include "gck/gck-crypto.h"
 
@@ -31,6 +31,8 @@
 
 #include "pkcs11/pkcs11.h"
 
+#include <glib-object.h>
+
 /* Module callbacks for secure memory */
 static GStaticMutex memory_mutex = G_STATIC_MUTEX_INIT;
 void gkr_memory_lock (void) 
@@ -47,12 +49,9 @@
 		return CKR_ARGUMENTS_BAD;
 	
 	g_type_init ();
-	
 	if (!g_thread_supported ())
 		g_thread_init (NULL);
 	
-	gck_crypto_initialize ();
-	
-	*list = gck_ssh_module_function_list;
+	*list = gck_ssh_store_get_functions ();
 	return CKR_OK;
 }

Added: trunk/pkcs11/ssh-store/gck-ssh-store.h
==============================================================================
--- (empty file)
+++ trunk/pkcs11/ssh-store/gck-ssh-store.h	Sun Jan  4 21:58:57 2009
@@ -0,0 +1,29 @@
+/* 
+ * 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 __GCK_SSH_STORE_H__
+#define __GCK_SSH_STORE_H__
+
+#include "pkcs11/pkcs11.h"
+
+CK_FUNCTION_LIST_PTR  gck_ssh_store_get_functions  (void);
+
+#endif /* __GCK_SSH_STORE_H__ */

Modified: trunk/pkcs11/ssh-store/tests/Makefile.am
==============================================================================
--- /trunk/pkcs11/ssh-keys/tests/Makefile.am	(original)
+++ trunk/pkcs11/ssh-store/tests/Makefile.am	Sun Jan  4 21:58:57 2009
@@ -4,12 +4,12 @@
 UNIT_PROMPT = 
 
 UNIT_LIBS =  \
-	$(top_builddir)/pkcs11/ssh-keys/libgck-ssh-keys.la \
+	$(top_builddir)/pkcs11/ssh-store/libgck-ssh-store.la \
 	$(top_builddir)/pkcs11/gck/libgck.la \
 	$(top_builddir)/common/libgkr-module-common.la
 
 include $(top_srcdir)/tests/gtest.make
 
 p11-tests:
-	p11-tests -f p11-tests.conf ../.libs/gck-ssh-keys-module.so
+	p11-tests -f p11-tests.conf ../.libs/gck-ssh-store-standalone.so
 	
\ No newline at end of file