emboss	2011-05-12 07:27:14 +0900 (Thu, 12 May 2011)

  New Revision: 31523

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31523

  Log:
    Thu May 12 08:18:45 2011  Martin Bosslet  <Martin.Bosslet@g...>
    
    * ext/openssl/ossl_pkey_dsa.c: Use generic X.509 SubjectPublicKeyInfo
      format for PEM-encoding DSA public keys. 
      [ruby-core:35328] [Bug #4422]
    
    Previous revision: 31520

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_pkey_dsa.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31522)
+++ ChangeLog	(revision 31523)
@@ -1,3 +1,9 @@
+Thu May 12 08:18:45 2011  Martin Bosslet  <Martin.Bosslet@g...>
+
+	* ext/openssl/ossl_pkey_dsa.c: Use generic X.509 SubjectPublicKeyInfo
+	  format for PEM-encoding DSA public keys. 
+	  [ruby-core:35328] [Bug #4422]
+
 Thu May 12 07:27:31 2011  Martin Bosslet  <Martin.Bosslet@g...>
 
 	* ext/openssl/ossl_pkey_rsa.c: Use generic X.509 SubjectPublicKeyInfo
Index: ext/openssl/ossl_pkey_dsa.c
===================================================================
--- ext/openssl/ossl_pkey_dsa.c	(revision 31522)
+++ ext/openssl/ossl_pkey_dsa.c	(revision 31523)
@@ -163,22 +163,22 @@
 	if (!dsa) {
 	    (void)BIO_reset(in);
 	    (void)ERR_get_error();
-	    dsa = PEM_read_bio_DSAPublicKey(in, NULL, NULL, NULL);
+	    dsa = PEM_read_bio_DSA_PUBKEY(in, NULL, NULL, NULL);
 	}
 	if (!dsa) {
 	    (void)BIO_reset(in);
 	    (void)ERR_get_error();
-	    dsa = PEM_read_bio_DSA_PUBKEY(in, NULL, NULL, NULL);
+	    dsa = d2i_DSAPrivateKey_bio(in, NULL);
 	}
 	if (!dsa) {
 	    (void)BIO_reset(in);
 	    (void)ERR_get_error();
-	    dsa = d2i_DSAPrivateKey_bio(in, NULL);
+	    dsa = d2i_DSA_PUBKEY_bio(in, NULL);
 	}
 	if (!dsa) {
 	    (void)BIO_reset(in);
 	    (void)ERR_get_error();
-	    dsa = d2i_DSA_PUBKEY_bio(in, NULL);
+	    dsa = PEM_read_bio_DSAPublicKey(in, NULL, NULL, NULL);
 	}
 	BIO_free(in);
 	if (!dsa) {
@@ -264,7 +264,7 @@
 	    ossl_raise(eDSAError, NULL);
 	}
     } else {
-	if (!PEM_write_bio_DSAPublicKey(out, pkey->pkey.dsa)) {
+	if (!PEM_write_bio_DSA_PUBKEY(out, pkey->pkey.dsa)) {
 	    BIO_free(out);
 	    ossl_raise(eDSAError, NULL);
 	}

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/