gnome-keyring r1539 - in trunk: . pkcs11/gck

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Feb  8 22:44:20 2009
New Revision: 1539
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1539&view=rev

Log:
Make output of RSA keys and PKCS8 more interoperable.

Modified:
   trunk/ChangeLog
   trunk/pkcs11/gck/gck-data-der.c

Modified: trunk/pkcs11/gck/gck-data-der.c
==============================================================================
--- trunk/pkcs11/gck/gck-data-der.c	(original)
+++ trunk/pkcs11/gck/gck-data-der.c	Sun Feb  8 22:44:20 2009
@@ -721,6 +721,10 @@
 	    !gck_data_asn1_write_mpi (asn, "prime2", q) ||
 	    !gck_data_asn1_write_mpi (asn, "coefficient", u))
 		goto done;
+	
+	/* Have to write out a null to delete OPTIONAL */
+	if (!egg_asn1_write_value (asn, "otherPrimeInfos", NULL, 0))
+		goto done;
 
 	/* Calculate e1 and e2 */
 	tmp = gcry_mpi_snew (1024);
@@ -1047,7 +1051,7 @@
 	g_return_val_if_fail (res == ASN1_SUCCESS, NULL);
 	
 	/* Write out the version */
-	if (!egg_asn1_write_uint (asn, "version", 1))
+	if (!egg_asn1_write_uint (asn, "version", 0))
 		g_return_val_if_reached (NULL);
 	
 	/* Per algorithm differences */