gnome-keyring r1253 - in tags/GNOME_KEYRING_2_23_90: . common daemon/pkcs11 po

[nnielsen svn gnome org]

Author: nnielsen
Date: Mon Aug 18 16:52:47 2008
New Revision: 1253
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1253&view=rev

Log:
Tag the release


Added:
   tags/GNOME_KEYRING_2_23_90/
      - copied from r1251, /trunk/
   tags/GNOME_KEYRING_2_23_90/ChangeLog
      - copied unchanged from r1252, /trunk/ChangeLog
   tags/GNOME_KEYRING_2_23_90/NEWS
      - copied unchanged from r1252, /trunk/NEWS
   tags/GNOME_KEYRING_2_23_90/po/ChangeLog
      - copied unchanged from r1252, /trunk/po/ChangeLog
Modified:
   tags/GNOME_KEYRING_2_23_90/common/gkr-async.c
   tags/GNOME_KEYRING_2_23_90/daemon/pkcs11/gkr-pkcs11-rsa.c

Modified: tags/GNOME_KEYRING_2_23_90/common/gkr-async.c
==============================================================================
--- /trunk/common/gkr-async.c	(original)
+++ tags/GNOME_KEYRING_2_23_90/common/gkr-async.c	Mon Aug 18 16:52:47 2008
@@ -44,7 +44,7 @@
 		g_atomic_int_inc (&waiting_on_lock); \
 		if (g_atomic_int_get (&waiting_on_poll)) gkr_wakeup_now (); \
 		g_mutex_lock (mtx);  \
-		g_atomic_int_exchange_and_add (&waiting_on_lock, -1); \
+		g_atomic_int_add (&waiting_on_lock, -1); \
         } G_STMT_END
 #define DO_UNLOCK(mtx) G_STMT_START { \
 		g_printerr ("%s UNLOCK %s\n", __func__, G_STRINGIFY(mtx));  \
@@ -55,7 +55,7 @@
 		g_atomic_int_inc (&waiting_on_lock); \
 		if (g_atomic_int_get (&waiting_on_poll)) gkr_wakeup_now (); \
 		g_mutex_lock (mtx); \
-		g_atomic_int_exchange_and_add (&waiting_on_lock, -1); \
+		g_atomic_int_add (&waiting_on_lock, -1); \
 	} G_STMT_END
 #define DO_UNLOCK(mtx) \
 	g_mutex_unlock (mtx)

Modified: tags/GNOME_KEYRING_2_23_90/daemon/pkcs11/gkr-pkcs11-rsa.c
==============================================================================
--- /trunk/daemon/pkcs11/gkr-pkcs11-rsa.c	(original)
+++ tags/GNOME_KEYRING_2_23_90/daemon/pkcs11/gkr-pkcs11-rsa.c	Mon Aug 18 16:52:47 2008
@@ -123,9 +123,22 @@
 	g_assert (data);
 	g_assert (n_data);
 
-	/* Now extract and send it back out */
-	*data = gkr_crypto_sexp_extract_mpi_padded (sexp, nbits, n_data, padfunc,
-	                                            format1, format2, format3, NULL);
+	/* Extract it via a padding function */
+	if (padfunc) {
+		*data = gkr_crypto_sexp_extract_mpi_padded (sexp, nbits, n_data, padfunc,
+		                                            format1, format2, format3, NULL);
+		
+	/* Just extract it directly */
+	} else {
+		*n_data = (nbits + 7) / 8;
+		*data = g_malloc0 (*n_data);
+		if (!gkr_crypto_sexp_extract_mpi_aligned (sexp, *data, *n_data, 
+		                                          format1, format2, format3, NULL)) {
+			g_free (*data);
+			*data = NULL;
+		}
+	}
+	
 	g_return_val_if_fail (*data, CKR_GENERAL_ERROR);
 
 	return CKR_OK;