r58230 - in /branches/upstream/libcrypt-openssl-x509-perl/current: Changes Makefile.PL X509.pm X509.xs

[carnil-guest at users.alioth.debian.org]

Author: carnil-guest
Date: Sat May 22 07:34:21 2010
New Revision: 58230

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=58230
Log:
[svn-upgrade] Integrating new upstream version, libcrypt-openssl-x509-perl (1.1)

Modified:
    branches/upstream/libcrypt-openssl-x509-perl/current/Changes
    branches/upstream/libcrypt-openssl-x509-perl/current/Makefile.PL
    branches/upstream/libcrypt-openssl-x509-perl/current/X509.pm
    branches/upstream/libcrypt-openssl-x509-perl/current/X509.xs

Modified: branches/upstream/libcrypt-openssl-x509-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcrypt-openssl-x509-perl/current/Changes?rev=58230&op=diff
==============================================================================
--- branches/upstream/libcrypt-openssl-x509-perl/current/Changes (original)
+++ branches/upstream/libcrypt-openssl-x509-perl/current/Changes Sat May 22 07:34:21 2010
@@ -1,4 +1,7 @@
 Revision history for Perl extension Crypt::OpenSSL::X509.
+
+1.1    Fri May 21 17:10:28 PDT 2010
+	- Fix memory leak in sv_bio_final() (CPAN RT #57719)
 
 1.0    Mon Jan 18 12:49:11 PST 2010
 	- Remove pub_exponent() and alias it to exponent().

Modified: branches/upstream/libcrypt-openssl-x509-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcrypt-openssl-x509-perl/current/Makefile.PL?rev=58230&op=diff
==============================================================================
--- branches/upstream/libcrypt-openssl-x509-perl/current/Makefile.PL (original)
+++ branches/upstream/libcrypt-openssl-x509-perl/current/Makefile.PL Sat May 22 07:34:21 2010
@@ -50,7 +50,7 @@
 }
 
 cc_lib_links('crypto');
-cc_optimize_flags('-g -Wall');
+cc_optimize_flags('-g -Wall -Werror');
 
 auto_install();
 WriteAll();

Modified: branches/upstream/libcrypt-openssl-x509-perl/current/X509.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcrypt-openssl-x509-perl/current/X509.pm?rev=58230&op=diff
==============================================================================
--- branches/upstream/libcrypt-openssl-x509-perl/current/X509.pm (original)
+++ branches/upstream/libcrypt-openssl-x509-perl/current/X509.pm Sat May 22 07:34:21 2010
@@ -5,7 +5,7 @@
 use Exporter;
 use base qw(Exporter);
 
-$VERSION = '1.0';
+$VERSION = '1.1';
 
 @EXPORT_OK = qw(
   FORMAT_UNDEF FORMAT_ASN1 FORMAT_TEXT FORMAT_PEM FORMAT_NETSCAPE

Modified: branches/upstream/libcrypt-openssl-x509-perl/current/X509.xs
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcrypt-openssl-x509-perl/current/X509.xs?rev=58230&op=diff
==============================================================================
--- branches/upstream/libcrypt-openssl-x509-perl/current/X509.xs (original)
+++ branches/upstream/libcrypt-openssl-x509-perl/current/X509.xs Sat May 22 07:34:21 2010
@@ -71,6 +71,8 @@
 
   (void)BIO_flush(bio);
   sv = (SV *)BIO_get_callback_arg(bio);
+  BIO_set_callback_arg(bio, (void *)NULL);
+  BIO_set_callback(bio, (void *)NULL);
   BIO_free_all(bio);
 
   return sv;
@@ -199,17 +201,6 @@
 
 BOOT:
 {
-  OpenSSL_add_all_algorithms();
-  OpenSSL_add_all_ciphers();
-  OpenSSL_add_all_digests();
-  ERR_load_PEM_strings();
-  ERR_load_ASN1_strings();
-  ERR_load_crypto_strings();
-  ERR_load_X509_strings();
-  ERR_load_DSA_strings();
-  ERR_load_RSA_strings();
-  ERR_load_OBJ_strings();
-
   HV *stash = gv_stashpvn("Crypt::OpenSSL::X509", 20, TRUE);
 
   struct { char *n; I32 v; } Crypt__OpenSSL__X509__const[] = {
@@ -259,7 +250,7 @@
 Crypt::OpenSSL::X509
 new_from_string(class, string, format = FORMAT_PEM)
   SV  *class
-  SV  *string
+  char *string
   int  format
 
   ALIAS:
@@ -267,17 +258,13 @@
 
   PREINIT:
   BIO *bio;
-  STRLEN len;
-  char *cert;
-
-  CODE:
-
-  cert = SvPV(string, len);
+
+  CODE:
 
   if (ix == 1) {
-    bio = BIO_new_file(cert, "r");
+    bio = BIO_new_file(string, "r");
   } else {
-    bio = BIO_new_mem_buf(cert, len);
+    bio = BIO_new_mem_buf(string, strlen(string));
   }
 
   if (!bio) croak("%s: Failed to create BIO", SvPV_nolen(class));
@@ -292,9 +279,9 @@
     RETVAL = (X509*)PEM_read_bio_X509(bio, NULL, NULL, NULL);
   }
 
+  BIO_free_all(bio);
+
   if (!RETVAL) croak("%s: failed to read X509 certificate.", SvPV_nolen(class));
-
-  BIO_free(bio);
 
   OUTPUT:
   RETVAL