gnome-keyring r1442 - in trunk: . gp11 gp11/reference gp11/reference/tmpl gp11/tests pam/tests pkcs11/gck pkcs11/roots pkcs11/rpc-layer pkcs11/ssh-agent pkcs11/ssh-store
- From: nnielsen svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-keyring r1442 - in trunk: . gp11 gp11/reference gp11/reference/tmpl gp11/tests pam/tests pkcs11/gck pkcs11/roots pkcs11/rpc-layer pkcs11/ssh-agent pkcs11/ssh-store
- Date: Tue, 6 Jan 2009 06:26:42 +0000 (UTC)
Author: nnielsen
Date: Tue Jan 6 06:26:42 2009
New Revision: 1442
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1442&view=rev
Log:
* configure.in:
* gp11/gp11.h:
* gp11/reference/Makefile.am:
* gp11/tests/gp11-test-module.c:
* gp11/tests/unit-test-gp11-attributes.c:
* pam/tests/unit-test-pam-setup.c:
* pkcs11/gck/gck-file-store.c:
* pkcs11/gck/gck-file-tracker.c:
* pkcs11/gck/gck-manager.c:
* pkcs11/gck/gck-session.c:
* pkcs11/roots/gck-roots-certificate.c:
* pkcs11/rpc-layer/gck-rpc-module.c:
* pkcs11/ssh-agent/gck-ssh-agent-ops.c:
* pkcs11/ssh-store/gck-ssh-public-key.c: Fix compiler warnings
and add -Werror back in when --enable-tests is configured.
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/gp11/gp11.h
trunk/gp11/reference/Makefile.am
trunk/gp11/reference/gp11-undeclared.txt
trunk/gp11/reference/tmpl/gp11-unused.sgml
trunk/gp11/reference/tmpl/gp11.sgml
trunk/gp11/tests/gp11-test-module.c
trunk/gp11/tests/unit-test-gp11-attributes.c
trunk/pam/tests/unit-test-pam-setup.c
trunk/pkcs11/gck/gck-file-store.c
trunk/pkcs11/gck/gck-file-tracker.c
trunk/pkcs11/gck/gck-manager.c
trunk/pkcs11/gck/gck-session.c
trunk/pkcs11/roots/gck-roots-certificate.c
trunk/pkcs11/rpc-layer/gck-rpc-module.c
trunk/pkcs11/ssh-agent/gck-ssh-agent-ops.c
trunk/pkcs11/ssh-store/gck-ssh-public-key.c
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Tue Jan 6 06:26:42 2009
@@ -401,18 +401,8 @@
dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
-AC_ARG_ENABLE(more-warnings,
-[ --enable-more-warnings Maximum compiler warnings],
-set_more_warnings="$enableval",[
-if test -f $srcdir/CVSVERSION; then
- is_cvs_version=true
- set_more_warnings=yes
-else
- set_more_warnings=no
-fi
-])
-AC_MSG_CHECKING(for more warnings, including -Werror)
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
+AC_MSG_CHECKING(for more warnings)
+if test "$GCC" = "yes"; then
AC_MSG_RESULT(yes)
CFLAGS="\
-Wall \
@@ -449,14 +439,16 @@
AC_ARG_ENABLE(tests,
AC_HELP_STRING([--enable-tests],
- [Build test tools and unit tests]))
+ [Build test tools, unit tests, and -Werror]))
+AC_MSG_CHECKING([build test tools, unit tests, and -Werror])
if test "$enable_tests" == "yes"; then
- echo "building tests and unit tests"
AC_DEFINE_UNQUOTED(WITH_TESTS, 1, [Build with unit test support])
- tests_status="yes"
+ AC_MSG_RESULT(yes)
+ CFLAGS="$CFLAGS -Werror"
+ tests_status="yes"
else
- echo "not building tests and unit tests"
+ AC_MSG_RESULT(no)
tests_status="no"
fi
@@ -539,7 +531,6 @@
echo
echo "OPTIONAL DEPENDENCIES"
echo " PAM: $pam_status"
-echo " DBus: $dbus_status"
echo " HAL: $hal_status"
echo
echo "CONFIGURATION"
@@ -548,6 +539,6 @@
echo
echo "BUILD"
echo " Debug Build: $debug_status"
-echo " Unit Tests: $tests_status"
+echo " Tests, -Werror: $tests_status"
echo
Modified: trunk/gp11/gp11.h
==============================================================================
--- trunk/gp11/gp11.h (original)
+++ trunk/gp11/gp11.h Tue Jan 6 06:26:42 2009
@@ -72,7 +72,14 @@
GP11_DATE = -4
};
-#define GP11_INVALID (gulong)-1
+#define GP11_INVALID -1UL
+
+/* Used on varargs functions that should end with GP11_INVALID */
+#ifdef NOT_YET_SUPPORTED
+#define GP11_INVALID_TERMINATED __attribute__((__sentinel__(-1UL)))
+#else
+#define GP11_INVALID_TERMINATED
+#endif
void gp11_attribute_init (GP11Attribute *attr,
gulong attr_type,
@@ -150,13 +157,16 @@
GP11Attributes* gp11_attributes_new (void);
-GP11Attributes* gp11_attributes_new_empty (gulong attr_type, ...);
+GP11Attributes* gp11_attributes_new_empty (gulong attr_type,
+ ...) GP11_INVALID_TERMINATED;
GP11Attributes* gp11_attributes_new_full (GP11Allocator allocator);
-GP11Attributes* gp11_attributes_newv (gulong attr_type, ...);
+GP11Attributes* gp11_attributes_newv (gulong attr_type,
+ ...) GP11_INVALID_TERMINATED;
-GP11Attributes* gp11_attributes_new_valist (GP11Allocator allocator, va_list va);
+GP11Attributes* gp11_attributes_new_valist (GP11Allocator allocator,
+ va_list va);
GP11Attribute* gp11_attributes_at (GP11Attributes *attrs,
guint index);
@@ -298,7 +308,7 @@
gboolean gp11_module_enumerate_objects (GP11Module *self,
GP11ObjectForeachFunc func,
gpointer user_data,
- ...);
+ ...) GP11_INVALID_TERMINATED;
gboolean gp11_module_enumerate_objects_full (GP11Module *self,
GP11Attributes *attrs,
@@ -631,7 +641,7 @@
GP11Object* gp11_session_create_object (GP11Session *self,
GError **err,
- ...);
+ ...) GP11_INVALID_TERMINATED;
GP11Object* gp11_session_create_object_full (GP11Session *self,
GP11Attributes *attrs,
@@ -650,7 +660,7 @@
GList* gp11_session_find_objects (GP11Session *self,
GError **err,
- ...);
+ ...) GP11_INVALID_TERMINATED;
GList* gp11_session_find_objects_full (GP11Session *self,
GP11Attributes *attrs,
@@ -672,38 +682,38 @@
GP11Object* gp11_session_generate_key (GP11Session *self,
GP11Mechanism *mechanism,
GError **err,
- ...);
+ ...) GP11_INVALID_TERMINATED;
void gp11_session_generate_key_async (GP11Session *self,
GP11Mechanism *mechanism,
GAsyncReadyCallback callback,
gpointer user_data,
- ...);
+ ...) GP11_INVALID_TERMINATED;
GP11Object* gp11_session_generate_key_finish (GP11Session *self,
GAsyncResult *result,
GError **err,
- ...);
+ ...) GP11_INVALID_TERMINATED;
gboolean gp11_session_generate_key_pair (GP11Session *self,
GP11Mechanism *mechanism,
GP11Object **public_key,
GP11Object **private_key,
GError **err,
- ...);
+ ...) GP11_INVALID_TERMINATED;
void gp11_session_generate_key_pair_async (GP11Session *self,
GP11Mechanism *mechanism,
GAsyncReadyCallback callback,
gpointer user_data,
- ...);
+ ...) GP11_INVALID_TERMINATED;
gboolean gp11_session_generate_key_pair_finish (GP11Session *self,
GAsyncResult *result,
GP11Object **public_key,
GP11Object **private_key,
GError **err,
- ...);
+ ...) GP11_INVALID_TERMINATED;
gboolean gp11_session_seed_random (GP11Session *self,
const guchar *seed,
@@ -1165,7 +1175,7 @@
const guchar *input,
gsize n_input,
GError **err,
- ...);
+ ...) GP11_INVALID_TERMINATED;
GP11Object* gp11_session_unwrap (GP11Session *self,
GP11Object *key,
@@ -1174,7 +1184,7 @@
gsize n_input,
GCancellable *cancellable,
GError **err,
- ...);
+ ...) GP11_INVALID_TERMINATED;
void gp11_session_unwrap_async (GP11Session *self,
GP11Object *key,
@@ -1184,7 +1194,7 @@
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
- ...);
+ ...) GP11_INVALID_TERMINATED;
GP11Object* gp11_session_unwrap_finish (GP11Session *self,
GAsyncResult *result,
@@ -1194,14 +1204,14 @@
GP11Object *key,
gulong mech_type,
GError **err,
- ...);
+ ...) GP11_INVALID_TERMINATED;
GP11Object* gp11_session_derive_full (GP11Session *self,
GP11Object *key,
GP11Mechanism *mech_args,
GCancellable *cancellable,
GError **err,
- ...);
+ ...) GP11_INVALID_TERMINATED;
void gp11_session_derive_async (GP11Session *self,
GP11Object *key,
@@ -1209,7 +1219,7 @@
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
- ...);
+ ...) GP11_INVALID_TERMINATED;
GP11Object* gp11_session_derive_finish (GP11Session *self,
GAsyncResult *result,
@@ -1320,7 +1330,7 @@
gboolean gp11_object_set (GP11Object *self,
GError **err,
- ...);
+ ...) GP11_INVALID_TERMINATED;
gboolean gp11_object_set_full (GP11Object *self,
GP11Attributes *attrs,
@@ -1339,7 +1349,7 @@
GP11Attributes* gp11_object_get (GP11Object *self,
GError **err,
- ...);
+ ...) GP11_INVALID_TERMINATED;
GP11Attributes* gp11_object_get_full (GP11Object *self,
GP11Attributes *attrs,
Modified: trunk/gp11/reference/Makefile.am
==============================================================================
--- trunk/gp11/reference/Makefile.am (original)
+++ trunk/gp11/reference/Makefile.am Tue Jan 6 06:26:42 2009
@@ -85,6 +85,9 @@
$(GOBJECT_LIBS) \
$(NULL)
+# gtk-doc has warnings
+CFLAGS += "-Wno-error"
+
# This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make
Modified: trunk/gp11/reference/gp11-undeclared.txt
==============================================================================
--- trunk/gp11/reference/gp11-undeclared.txt (original)
+++ trunk/gp11/reference/gp11-undeclared.txt Tue Jan 6 06:26:42 2009
@@ -556,11 +556,25 @@
free_private_memory
free_public_memory
gp11_attributes_is_immutable
+gp11_attributes_new_valist
gp11_attributes_set_immutable
+gp11_object_get_full
gp11_object_get_one
gp11_object_get_one_async
gp11_object_get_one_finish
gp11_object_get_one_full
+gp11_object_set_full
+gp11_session_create_object_full
+gp11_session_derive_async
+gp11_session_derive_full
+gp11_session_find_objects_full
+gp11_session_generate_key_async
+gp11_session_generate_key_finish
+gp11_session_generate_key_pair
+gp11_session_generate_key_pair_async
+gp11_session_generate_key_pair_finish
+gp11_session_seed_random
+gp11_session_unwrap_async
gp11_slot_get_auto_login
gp11_slot_get_reuse_sessions
gp11_slot_set_auto_login
Modified: trunk/gp11/reference/tmpl/gp11-unused.sgml
==============================================================================
--- trunk/gp11/reference/tmpl/gp11-unused.sgml (original)
+++ trunk/gp11/reference/tmpl/gp11-unused.sgml Tue Jan 6 06:26:42 2009
@@ -3393,6 +3393,15 @@
@attrs:
@Returns:
+<!-- ##### FUNCTION gp11_attributes_new_valist ##### -->
+<para>
+
+</para>
+
+ allocator:
+ va:
+ Returns:
+
<!-- ##### FUNCTION gp11_attributes_set_immutable ##### -->
<para>
@@ -3400,6 +3409,17 @@
@attrs:
+<!-- ##### FUNCTION gp11_object_get_full ##### -->
+<para>
+
+</para>
+
+ self:
+ attrs:
+ cancellable:
+ err:
+ Returns:
+
<!-- ##### FUNCTION gp11_object_get_one ##### -->
<para>
@@ -3442,6 +3462,148 @@
@err:
@Returns:
+<!-- ##### FUNCTION gp11_object_set_full ##### -->
+<para>
+
+</para>
+
+ self:
+ attrs:
+ cancellable:
+ err:
+ Returns:
+
+<!-- ##### FUNCTION gp11_session_create_object_full ##### -->
+<para>
+
+</para>
+
+ self:
+ attrs:
+ cancellable:
+ err:
+ Returns:
+
+<!-- ##### FUNCTION gp11_session_derive_async ##### -->
+<para>
+
+</para>
+
+ self:
+ key:
+ mech_args:
+ cancellable:
+ callback:
+ user_data:
+
+<!-- ##### FUNCTION gp11_session_derive_full ##### -->
+<para>
+
+</para>
+
+ self:
+ key:
+ mech_args:
+ cancellable:
+ err:
+ Varargs:
+ Returns:
+
+<!-- ##### FUNCTION gp11_session_find_objects_full ##### -->
+<para>
+
+</para>
+
+ self:
+ attrs:
+ cancellable:
+ err:
+ Returns:
+
+<!-- ##### FUNCTION gp11_session_generate_key_async ##### -->
+<para>
+
+</para>
+
+ self:
+ mechanism:
+ callback:
+ user_data:
+ Varargs:
+
+<!-- ##### FUNCTION gp11_session_generate_key_finish ##### -->
+<para>
+
+</para>
+
+ self:
+ result:
+ err:
+ Varargs:
+ Returns:
+
+<!-- ##### FUNCTION gp11_session_generate_key_pair ##### -->
+<para>
+
+</para>
+
+ self:
+ mechanism:
+ public_key:
+ private_key:
+ err:
+ Varargs:
+ Returns:
+
+<!-- ##### FUNCTION gp11_session_generate_key_pair_async ##### -->
+<para>
+
+</para>
+
+ self:
+ mechanism:
+ callback:
+ user_data:
+ Varargs:
+
+<!-- ##### FUNCTION gp11_session_generate_key_pair_finish ##### -->
+<para>
+
+</para>
+
+ self:
+ result:
+ public_key:
+ private_key:
+ err:
+ Varargs:
+ Returns:
+
+<!-- ##### FUNCTION gp11_session_seed_random ##### -->
+<para>
+
+</para>
+
+ self:
+ seed:
+ n_seed:
+ err:
+ Returns:
+
+<!-- ##### FUNCTION gp11_session_unwrap_async ##### -->
+<para>
+
+</para>
+
+ self:
+ key:
+ mech_args:
+ input:
+ n_input:
+ cancellable:
+ callback:
+ user_data:
+
<!-- ##### FUNCTION gp11_slot_get_auto_login ##### -->
<para>
Modified: trunk/gp11/reference/tmpl/gp11.sgml
==============================================================================
--- trunk/gp11/reference/tmpl/gp11.sgml (original)
+++ trunk/gp11/reference/tmpl/gp11.sgml Tue Jan 6 06:26:42 2009
@@ -332,17 +332,6 @@
</para>
@attr_type:
- Varargs:
- Returns:
-
-
-<!-- ##### FUNCTION gp11_attributes_new_valist ##### -->
-<para>
-
-</para>
-
- allocator:
- va:
@Returns:
@@ -1292,19 +1281,6 @@
@self:
@err:
- Varargs:
- Returns:
-
-
-<!-- ##### FUNCTION gp11_session_create_object_full ##### -->
-<para>
-
-</para>
-
- self:
- attrs:
- cancellable:
- err:
@Returns:
@@ -1338,19 +1314,6 @@
@self:
@err:
- Varargs:
- Returns:
-
-
-<!-- ##### FUNCTION gp11_session_find_objects_full ##### -->
-<para>
-
-</para>
-
- self:
- attrs:
- cancellable:
- err:
@Returns:
@@ -1385,83 +1348,6 @@
@self:
@mechanism:
@err:
- Varargs:
- Returns:
-
-
-<!-- ##### FUNCTION gp11_session_generate_key_async ##### -->
-<para>
-
-</para>
-
- self:
- mechanism:
- callback:
- user_data:
- Varargs:
-
-
-<!-- ##### FUNCTION gp11_session_generate_key_finish ##### -->
-<para>
-
-</para>
-
- self:
- result:
- err:
- Varargs:
- Returns:
-
-
-<!-- ##### FUNCTION gp11_session_generate_key_pair ##### -->
-<para>
-
-</para>
-
- self:
- mechanism:
- public_key:
- private_key:
- err:
- Varargs:
- Returns:
-
-
-<!-- ##### FUNCTION gp11_session_generate_key_pair_async ##### -->
-<para>
-
-</para>
-
- self:
- mechanism:
- callback:
- user_data:
- Varargs:
-
-
-<!-- ##### FUNCTION gp11_session_generate_key_pair_finish ##### -->
-<para>
-
-</para>
-
- self:
- result:
- public_key:
- private_key:
- err:
- Varargs:
- Returns:
-
-
-<!-- ##### FUNCTION gp11_session_seed_random ##### -->
-<para>
-
-</para>
-
- self:
- seed:
- n_seed:
- err:
@Returns:
@@ -2323,25 +2209,9 @@
@input:
@n_input:
@err:
- Varargs:
@Returns:
-<!-- ##### FUNCTION gp11_session_unwrap_async ##### -->
-<para>
-
-</para>
-
- self:
- key:
- mech_args:
- input:
- n_input:
- cancellable:
- callback:
- user_data:
-
-
<!-- ##### FUNCTION gp11_session_unwrap_finish ##### -->
<para>
@@ -2362,37 +2232,9 @@
@key:
@mech_type:
@err:
- Varargs:
@Returns:
-<!-- ##### FUNCTION gp11_session_derive_full ##### -->
-<para>
-
-</para>
-
- self:
- key:
- mech_args:
- cancellable:
- err:
- Varargs:
- Returns:
-
-
-<!-- ##### FUNCTION gp11_session_derive_async ##### -->
-<para>
-
-</para>
-
- self:
- key:
- mech_args:
- cancellable:
- callback:
- user_data:
-
-
<!-- ##### FUNCTION gp11_session_derive_finish ##### -->
<para>
@@ -2652,19 +2494,6 @@
@self:
@err:
- Varargs:
- Returns:
-
-
-<!-- ##### FUNCTION gp11_object_set_full ##### -->
-<para>
-
-</para>
-
- self:
- attrs:
- cancellable:
- err:
@Returns:
@@ -2698,19 +2527,6 @@
@self:
@err:
- Varargs:
- Returns:
-
-
-<!-- ##### FUNCTION gp11_object_get_full ##### -->
-<para>
-
-</para>
-
- self:
- attrs:
- cancellable:
- err:
@Returns:
Modified: trunk/gp11/tests/gp11-test-module.c
==============================================================================
--- trunk/gp11/tests/gp11-test-module.c (original)
+++ trunk/gp11/tests/gp11-test-module.c Tue Jan 6 06:26:42 2009
@@ -126,7 +126,7 @@
/* Our token object */
attrs = gp11_attributes_newv (CKA_CLASS, GP11_ULONG, CKO_DATA,
CKA_LABEL, GP11_STRING, "TEST LABEL",
- -1);
+ GP11_INVALID);
g_hash_table_insert (the_objects, GUINT_TO_POINTER (2), attrs);
/* Private capitalize key */
@@ -136,7 +136,7 @@
CKA_ALLOWED_MECHANISMS, sizeof (value), &value,
CKA_DECRYPT, GP11_BOOLEAN, TRUE,
CKA_PRIVATE, GP11_BOOLEAN, TRUE,
- -1);
+ GP11_INVALID);
g_hash_table_insert (the_objects, GUINT_TO_POINTER (PRIVATE_KEY_CAPITALIZE), attrs);
/* Public capitalize key */
@@ -146,7 +146,7 @@
CKA_ALLOWED_MECHANISMS, sizeof (value), &value,
CKA_ENCRYPT, GP11_BOOLEAN, TRUE,
CKA_PRIVATE, GP11_BOOLEAN, FALSE,
- -1);
+ GP11_INVALID);
g_hash_table_insert (the_objects, GUINT_TO_POINTER (PUBLIC_KEY_CAPITALIZE), attrs);
/* Private prefix key */
@@ -157,7 +157,7 @@
CKA_SIGN, GP11_BOOLEAN, TRUE,
CKA_PRIVATE, GP11_BOOLEAN, TRUE,
CKA_ALWAYS_AUTHENTICATE, GP11_BOOLEAN, TRUE,
- -1);
+ GP11_INVALID);
g_hash_table_insert (the_objects, GUINT_TO_POINTER (PRIVATE_KEY_PREFIX), attrs);
/* Private prefix key */
@@ -167,7 +167,7 @@
CKA_ALLOWED_MECHANISMS, sizeof (value), &value,
CKA_VERIFY, GP11_BOOLEAN, TRUE,
CKA_PRIVATE, GP11_BOOLEAN, FALSE,
- -1);
+ GP11_INVALID);
g_hash_table_insert (the_objects, GUINT_TO_POINTER (PUBLIC_KEY_PREFIX), attrs);
initialized = TRUE;
Modified: trunk/gp11/tests/unit-test-gp11-attributes.c
==============================================================================
--- trunk/gp11/tests/unit-test-gp11-attributes.c (original)
+++ trunk/gp11/tests/unit-test-gp11-attributes.c Tue Jan 6 06:26:42 2009
@@ -355,7 +355,7 @@
202, GP11_STRING, "string",
303, GP11_DATE, date,
404, N_ATTR_DATA, ATTR_DATA,
- -1);
+ GP11_INVALID);
g_date_free (date);
test_attributes_contents (attrs, FALSE);
Modified: trunk/pam/tests/unit-test-pam-setup.c
==============================================================================
--- trunk/pam/tests/unit-test-pam-setup.c (original)
+++ trunk/pam/tests/unit-test-pam-setup.c Tue Jan 6 06:26:42 2009
@@ -110,7 +110,8 @@
sleep (1);
printf ("User: ");
- fgets (user, sizeof (user), stdin);
+ if (!fgets (user, sizeof (user), stdin))
+ g_return_if_reached ();
g_strstrip (user);
Modified: trunk/pkcs11/gck/gck-file-store.c
==============================================================================
--- trunk/pkcs11/gck/gck-file-store.c (original)
+++ trunk/pkcs11/gck/gck-file-store.c Tue Jan 6 06:26:42 2009
@@ -549,7 +549,7 @@
g_assert (GCK_IS_FILE_STORE (self));
g_assert (buffer);
g_assert (offset);
- g_assert (attributes);
+ g_assert (entries);
if (!gkr_buffer_get_string (buffer, *offset, offset, &str, (GkrBufferAllocator)g_realloc))
return NULL;
Modified: trunk/pkcs11/gck/gck-file-tracker.c
==============================================================================
--- trunk/pkcs11/gck/gck-file-tracker.c (original)
+++ trunk/pkcs11/gck/gck-file-tracker.c Tue Jan 6 06:26:42 2009
@@ -121,7 +121,6 @@
struct stat sb;
GError *err = NULL;
const char *filename;
- gchar *path;
gchar *file;
GDir *dir;
int ret, lasterr;
@@ -134,7 +133,8 @@
if (stat (self->directory_path, &sb) < 0) {
if (errno != ENOENT && errno != ENOTDIR && errno != EPERM)
- g_message ("couldn't stat directory: %s: %s", path, g_strerror (errno));
+ g_message ("couldn't stat directory: %s: %s",
+ self->directory_path, g_strerror (errno));
return;
}
@@ -155,7 +155,7 @@
dir = g_dir_open (self->directory_path, 0, &err);
if (dir == NULL) {
if (errno != ENOENT && errno != ENOTDIR && errno != EPERM)
- g_message ("couldn't list keyrings at: %s: %s", path,
+ g_message ("couldn't list keyrings at: %s: %s", self->directory_path,
err && err->message ? err->message : "");
g_error_free (err);
return;
Modified: trunk/pkcs11/gck/gck-manager.c
==============================================================================
--- trunk/pkcs11/gck/gck-manager.c (original)
+++ trunk/pkcs11/gck/gck-manager.c Tue Jan 6 06:26:42 2009
@@ -274,7 +274,8 @@
static void
index_update (Index *index, GckObject *object)
{
- CK_ATTRIBUTE_PTR attr, prev;
+ CK_ATTRIBUTE_PTR attr = NULL;
+ CK_ATTRIBUTE_PTR prev;
GHashTable *objects;
gboolean ret;
Modified: trunk/pkcs11/gck/gck-session.c
==============================================================================
--- trunk/pkcs11/gck/gck-session.c (original)
+++ trunk/pkcs11/gck/gck-session.c Tue Jan 6 06:26:42 2009
@@ -919,9 +919,9 @@
gck_session_C_FindObjectsInit (GckSession* self, CK_ATTRIBUTE_PTR template,
CK_ULONG count)
{
+ CK_BBOOL token = CK_FALSE;
gboolean also_private;
CK_RV rv = CKR_OK;
- CK_BBOOL token;
GArray *found;
gboolean all;
Modified: trunk/pkcs11/roots/gck-roots-certificate.c
==============================================================================
--- trunk/pkcs11/roots/gck-roots-certificate.c (original)
+++ trunk/pkcs11/roots/gck-roots-certificate.c Tue Jan 6 06:26:42 2009
@@ -23,6 +23,7 @@
#include "gck-roots-certificate.h"
+#include "gck/gck-attributes.h"
#include "gck/gck-manager.h"
#include "gck/gck-object.h"
#include "gck/gck-sexp.h"
Modified: trunk/pkcs11/rpc-layer/gck-rpc-module.c
==============================================================================
--- trunk/pkcs11/rpc-layer/gck-rpc-module.c (original)
+++ trunk/pkcs11/rpc-layer/gck-rpc-module.c Tue Jan 6 06:26:42 2009
@@ -1082,12 +1082,17 @@
}
}
+#ifdef UNIMPLEMENTED
path = gck_rpc_module_init (args);
if (!path || !path[0]) {
warning (("missing pkcs11 socket path in environment"));
ret = CKR_GENERAL_ERROR;
goto done;
}
+#else
+ /* TODO: Need to complete this code */
+ path = "";
+#endif
/* Make a copy of the socket path */
snprintf (pkcs11_socket_path, sizeof (pkcs11_socket_path), "%s", path);
Modified: trunk/pkcs11/ssh-agent/gck-ssh-agent-ops.c
==============================================================================
--- trunk/pkcs11/ssh-agent/gck-ssh-agent-ops.c (original)
+++ trunk/pkcs11/ssh-agent/gck-ssh-agent-ops.c Tue Jan 6 06:26:42 2009
@@ -824,7 +824,7 @@
guint8 *hash;
gulong algo, mech;
GChecksumType halgo;
- gsize n_hash;
+ gsize n_hash = 0;
offset = 5;
Modified: trunk/pkcs11/ssh-store/gck-ssh-public-key.c
==============================================================================
--- trunk/pkcs11/ssh-store/gck-ssh-public-key.c (original)
+++ trunk/pkcs11/ssh-store/gck-ssh-public-key.c Tue Jan 6 06:26:42 2009
@@ -23,6 +23,7 @@
#include "gck-ssh-public-key.h"
+#include "gck/gck-attributes.h"
#include "gck/gck-object.h"
#include "gck/gck-util.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
