gnome-keyring r1467 - in trunk: . egg egg/tests egg/tests/test-data gcr pkcs11/roots-store po

[nnielsen svn gnome org]

Author: nnielsen
Date: Tue Jan 20 00:37:59 2009
New Revision: 1467
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1467&view=rev

Log:
	* egg/Makefile.am:
	* egg/tests/test.asn:
	* egg/tests/unit-test-secmem.c:
	* egg/tests/unit-test-symkey.c:
	* egg/tests/test-data/test-certificate-1.der: (added)
	* egg/tests/test-data/pem-rsa-enc.key: (added)
	* gcr/Makefile.am: 
	* pkcs11/roots-sotre/gck-roots-module.c: 
	* configure.in:
	* NEWS: Release version 2.25.5


Added:
   trunk/egg/tests/test-data/pem-rsa-enc.key
   trunk/egg/tests/test-data/test-certificate-1.der   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.in
   trunk/egg/Makefile.am
   trunk/egg/tests/test.asn
   trunk/egg/tests/unit-test-secmem.c
   trunk/egg/tests/unit-test-symkey.c
   trunk/gcr/Makefile.am
   trunk/pkcs11/roots-store/gck-roots-module.c
   trunk/po/ChangeLog
   trunk/po/POTFILES.in

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Jan 20 00:37:59 2009
@@ -1,3 +1,13 @@
+Changes in version 2.25.5 are:
+* Refactor out gcr library for crypto UI and related tasks.
+* Code refactoring.
+* Support automatically initializing a PKCS#11 token when not initialized.
+* Add modular user-store module for general storage of keys and certs.
+* Build fixes [Saleem Abdulrasool, Jeff Cai]
+* Add modular roots-store module for storage of trusted CA certs.
+* Add modular rpc-layer for communication between module and daemon.
+* Add modular ssh-agent as the main gnome-keyring-daemon agent.
+
 Changes in version 2.25.4.2 are:
 * The modular ssh agent uses keys from all available PKCS#11 slots.
 * Fix compiler warnings.

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jan 20 00:37:59 2009
@@ -1,6 +1,6 @@
 AC_INIT(library/gnome-keyring.h)
 
-AM_INIT_AUTOMAKE(gnome-keyring, 2.25.4.2)
+AM_INIT_AUTOMAKE(gnome-keyring, 2.25.5)
 AM_CONFIG_HEADER(config.h)
 	
 dnl ****************************************************************************

Modified: trunk/egg/Makefile.am
==============================================================================
--- trunk/egg/Makefile.am	(original)
+++ trunk/egg/Makefile.am	Tue Jan 20 00:37:59 2009
@@ -23,17 +23,21 @@
 	egg-openssl.c egg-openssl.h \
 	egg-unix-credentials.c egg-unix-credentials.h \
 	egg-secure-memory.c egg-secure-memory.h \
-	egg-symkey.c egg-symkey.h
+	egg-symkey.c egg-symkey.h \
+	$(BUILT_SOURCES)
 	
 asn1-def-pk.h: pk.asn
-	asn1Parser -o asn1-def-pk.h pk.asn 
+	asn1Parser -o asn1-def-pk.h $(srcdir)/pk.asn 
 	
 asn1-def-pkix.h: pkix.asn
-	asn1Parser -o asn1-def-pkix.h pkix.asn 
+	asn1Parser -o asn1-def-pkix.h $(srcdir)/pkix.asn 
 
 EXTRA_DIST = \
 	pkix.asn \
 	pk.asn
+
+DISTCLEANFILES = \
+	$(BUILT_SOURCES)
 	
 # --------------------------------------------------------------------
 # COMMON STUFF COMPILED INTO SMALLER COMPONENTS

Added: trunk/egg/tests/test-data/pem-rsa-enc.key
==============================================================================
--- (empty file)
+++ trunk/egg/tests/test-data/pem-rsa-enc.key	Tue Jan 20 00:37:59 2009
@@ -0,0 +1,18 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,24522D4CE5F5CD7B
+
+2H/8j0HYUya7LWEUxpgjp/LVcCX7yZB7SoREdoJdcqJEBUMWVxU/2OfVB8EZupmy
+7YHcnn5v1JwwtmAXAtqM9JGlvNWaRr1m4zDrhJn1fY3tu8YGtMR49IOZmOUBK+X+
+IxWAwaFDqLntuGZZnAmRJtgFVYVABEs5yM9zgoCGDaU4WMK3caD7Jnw8jH5m0nqQ
+XiQ1y1dHxFJmAgG0b5h2z7zjQTmmXd3IhXqSqsE/9ryruCCYa0Z7aAN5oAmO89I9
+gOyy3J4h76mTNFfF5btV4Jllwd4LkgGOmm69UxAyUTGzwYJ5gxgB3xFzGBwpVlcu
+72PrQCrjZqZ6rj6cTPGUYzcyMtEw3Xd6mFhApqJpVRZwNWUAMMJwHl2oWwKcIxfV
+y+OftRX6kc+cunrxCkl9aKuHDoJPEq+/Uh+AEXqir+942Vull0WPyuWUjaPKR1xJ
+poYsNfHRWq+klKCggQQL6jwuVbDLhbaXfgaNBQO1XMracgfmnO1PQPw8JSQ5iOkm
+Ybt2oHAEnrEWxZGn1PfRq6Z8HAbBlQpfmG7SMJZdQjlndKA6GR+tN5krKfpj6uak
+0eklm0Nb0YcDzJ3qqHXxIimK3Kh/WRZ1hVTnX4mS9u3HNQMo5Ov6z8OQN+Q45ffi
+ZDFkVwUTEJ+iwmCG7XnxX0v8Bv5LZmAnPu95KQTp4Ds0AZ6Sp+RqxvhnCO25cgWj
++N5jHGzsDk9/Jw7rAHz8pnl3sziNBWdAk5ASPA28HCQQo5peWnWajM3Pk98+/wHY
+blTh7gw77gTake6hpiegnhNUXwGm6BXEqmyu7mPW0z5XFRb9W7bpog==
+-----END RSA PRIVATE KEY-----

Added: trunk/egg/tests/test-data/test-certificate-1.der
==============================================================================
Binary file. No diff available.

Modified: trunk/egg/tests/test.asn
==============================================================================
--- trunk/egg/tests/test.asn	(original)
+++ trunk/egg/tests/test.asn	Tue Jan 20 00:37:59 2009
@@ -7,8 +7,7 @@
 TestIntegers ::= SEQUENCE {
 	uint1                   INTEGER,
 	uint2			INTEGER,
-	uint3			INTEGER,
-	mpi                     INTEGER
+	uint3			INTEGER
 }
 
 TestData ::= SEQUENCE {

Modified: trunk/egg/tests/unit-test-secmem.c
==============================================================================
--- trunk/egg/tests/unit-test-secmem.c	(original)
+++ trunk/egg/tests/unit-test-secmem.c	Tue Jan 20 00:37:59 2009
@@ -42,7 +42,7 @@
  * Tests be run in the order specified here.
  */
 
-#define IS_ZERO ~0
+#define IS_ZERO ((gsize)~0)
 
 static gsize
 find_non_zero (gpointer mem, gsize len)
@@ -128,7 +128,7 @@
 	strcpy ((gchar*)p, str);
 	
 	p2 = egg_secure_realloc_full (p, 512, 0);
-	g_assert (p2 == NULL);
+	g_assert (p2 != NULL);
 	g_assert_cmpint (IS_ZERO, ==, find_non_zero (((gchar*)p2) + len, 512 - len));
 	
 	g_assert (strcmp (p2, str) == 0);

Modified: trunk/egg/tests/unit-test-symkey.c
==============================================================================
--- trunk/egg/tests/unit-test-symkey.c	(original)
+++ trunk/egg/tests/unit-test-symkey.c	Tue Jan 20 00:37:59 2009
@@ -27,6 +27,7 @@
 
 #include "run-auto-test.h"
 
+#include "egg-secure-memory.h"
 #include "egg-symkey.h"
 
 #include <gcrypt.h>
@@ -34,6 +35,11 @@
 DEFINE_SETUP(crypto_setup)
 {
 	gcry_check_version (LIBGCRYPT_VERSION);
+	gcry_set_allocation_handler ((gcry_handler_alloc_t)g_malloc, 
+	                             (gcry_handler_alloc_t)egg_secure_alloc, 
+	                             egg_secure_check, 
+	                             (gcry_handler_realloc_t)egg_secure_realloc, 
+	                             egg_secure_free);
 }
 
 DEFINE_TEARDOWN(crypto_setup)

Modified: trunk/gcr/Makefile.am
==============================================================================
--- trunk/gcr/Makefile.am	(original)
+++ trunk/gcr/Makefile.am	Tue Jan 20 00:37:59 2009
@@ -43,7 +43,8 @@
 
 EXTRA_DIST = \
 	gcr.pc.in \
-	gcr-marshal.list
+	gcr-marshal.list \
+	gcr-import-dialog.glade
     
 DISTCLEANFILES = \
 	gcr-$(GCR_MAJOR).pc
@@ -59,4 +60,4 @@
 
 SUBDIRS = . \
 	$(TESTS_DIR)
-	
\ No newline at end of file
+	

Modified: trunk/pkcs11/roots-store/gck-roots-module.c
==============================================================================
--- trunk/pkcs11/roots-store/gck-roots-module.c	(original)
+++ trunk/pkcs11/roots-store/gck-roots-module.c	Tue Jan 20 00:37:59 2009
@@ -257,9 +257,8 @@
 gck_roots_module_real_refresh_token (GckModule *base)
 {
 	GckRootsModule *self = GCK_ROOTS_MODULE (base);
-#ifdef ROOT_CERTIFICATES
-	gck_file_tracker_refresh (self->tracker, FALSE);
-#endif
+	if (self->tracker)
+		gck_file_tracker_refresh (self->tracker, FALSE);
 	return CKR_OK;
 }
 
@@ -274,11 +273,13 @@
 #ifdef ROOT_CERTIFICATES
 	if (!self->directory)
 		self->directory = g_strdup (ROOT_CERTIFICATES);
-	self->tracker = gck_file_tracker_new (self->directory, "*", "*.0");
-	g_signal_connect (self->tracker, "file-added", G_CALLBACK (file_load), self);
-	g_signal_connect (self->tracker, "file-changed", G_CALLBACK (file_load), self);
-	g_signal_connect (self->tracker, "file-removed", G_CALLBACK (file_remove), self);
 #endif
+	if (self->directory) {
+		self->tracker = gck_file_tracker_new (self->directory, "*", "*.0");
+		g_signal_connect (self->tracker, "file-added", G_CALLBACK (file_load), self);
+		g_signal_connect (self->tracker, "file-changed", G_CALLBACK (file_load), self);
+		g_signal_connect (self->tracker, "file-removed", G_CALLBACK (file_remove), self);
+	}
 	
 	manager = gck_module_get_manager (GCK_MODULE (self));
 	gck_manager_add_property_index (manager, "unique", TRUE);

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Tue Jan 20 00:37:59 2009
@@ -16,6 +16,7 @@
 daemon/pkix/gkr-pkix-serialize.c
 daemon/ssh/gkr-ssh-storage.c
 daemon/ui/gkr-ask-tool.c
+gcr/gcr-import-dialog.glade
 gcr/gcr-parser.c
 gp11/gp11-misc.c
 library/gnome-keyring-utils.c