[gnome-keyring/dbus-api: 3/6] Merge branch 'master' into dbus-api

[Stefan Walter <stefw src gnome org>]

commit da336e8e56b98a2c8a0789238c5db0c05503e50a
Merge: 2055447... 0c08225...
Author: Stef Walter <stef memberwebs com>
Date:   Mon Nov 9 22:26:04 2009 +0000

    Merge branch 'master' into dbus-api

 pkcs11/gck/gck-attributes.c             |    4 +++-
 pkcs11/gck/tests/unit-test-attributes.c |    7 +++++++
 2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --cc pkcs11/gck/tests/unit-test-attributes.c
index 05643b6,c56e1b0..323ca28
--- a/pkcs11/gck/tests/unit-test-attributes.c
+++ b/pkcs11/gck/tests/unit-test-attributes.c
@@@ -25,17 -25,13 +25,24 @@@
  
  #include "gck/gck-attributes.h"
  
 +/* Some test data */
 +static CK_OBJECT_CLASS attr_template_klass = CKO_DATA;
 +static CK_BBOOL attr_template_token = CK_TRUE;
 +static CK_ATTRIBUTE attr_template[] = {
 +	{ CKA_LABEL, "funny", 5 },
 +	{ CKA_CLASS, &attr_template_klass, sizeof (CK_OBJECT_CLASS) },
 +	{ CKA_ID, "my-identifier", 13 },
 +	{ CKA_TOKEN, &attr_template_token, sizeof (CK_BBOOL) },
 +	{ CKA_VALUE, "\a[\315\025", 4 }
 +};
 +
+ DEFINE_TEST(attribute_equal_zero_len_null_ptr)
+ {
+ 	CK_ATTRIBUTE attr1 = { CKA_LABEL, "", 0 };
+ 	CK_ATTRIBUTE attr2 = { CKA_LABEL, NULL, 0 };
+ 	g_assert (gck_attribute_equal (&attr1, &attr2));
+ }
+ 
  DEFINE_TEST(attribute_consume)
  {
  	CK_ATTRIBUTE attr;