Second round of fixing the OpenSSL perl/ stuff. It now at least compiled fine

under Unix and passes some trivial tests I've now added. But the whole stuff
is horribly incomplete, so a README.1ST with a disclaimer was added to make
sure no one expects that this stuff really works in the OpenSSL 0.9.2 release.
Additionally I've started to clean the XS sources up and fixed a few little
bugs and inconsistencies in OpenSSL.{pm,xs} and openssl_bio.xs.

PS: I'm still not convinces whether we should try to make this
    finally running or kick it out and replace it with some
    other module....

CHANGES

@@ -5,6 +5,15 @@
 
  Changes between 0.9.1c and 0.9.2
 
+  *) Second round of fixing the OpenSSL perl/ stuff. It now at least compiled
+     fine under Unix and passes some trivial tests I've now added. But the
+     whole stuff is horribly incomplete, so a README.1ST with a disclaimer was
+     added to make sure no one expects that this stuff really works in the
+     OpenSSL 0.9.2 release.  Additionally I've started to clean the XS sources
+     up and fixed a few little bugs and inconsistencies in OpenSSL.{pm,xs} and
+     openssl_bio.xs.
+     [Ralf S. Engelschall]
+
   *) Fix the generation of two part addresses in perl.
      [Kenji Miyake <kenji@miyake.org>, integrated by Ben Laurie]
 

perl/MANIFEST

+README.1ST
 MANIFEST
 Makefile.PL
 typemap
@@ -12,3 +13,6 @@ openssl_err.xs
 openssl_ssl.xs
 openssl_x509.xs
 openssl_cb.c
+t/01-use.t
+t/02-version.t
+t/03-bio.t

perl/Makefile.PL

@@ -2,14 +2,19 @@
 ##  Makefile.PL -- Perl MakeMaker specification
 ##
 
+$V = '0.9.2';
+print "Configuring companion Perl module for OpenSSL $V\n";
+
 use ExtUtils::MakeMaker;
 
 WriteMakefile(
     'OPTIMIZE'      => '',
-    'DISTNAME'      => 'OpenSSL-0.9.2',
+    'DISTNAME'      => "openssl-$V",
     'NAME'          => 'OpenSSL',
     'VERSION_FROM'  => 'OpenSSL.pm',
-    'LIBS'          => ['-L.. -lssl -lcrypto'],
+    'LIBS'          => ( $^O eq 'MSWin32'
+                         ? [ '-L../out32dll -lssleay32 -llibeay32' ]
+                         : [ '-L.. -lssl -lcrypto' ]                 ),
     'DEFINE'        => '',
     'INC'           => '-I../include',
     'H'             => ['openssl.h'],

perl/OpenSSL.pm

@@ -4,32 +4,35 @@
 
 package OpenSSL;
 
+require 5.000;
 use Exporter;
 use DynaLoader;
 
 @ISA    = qw(Exporter DynaLoader);
 @EXPORT = qw();
 
-$VERSION='0.92';
-bootstrap penSSL;
+$VERSION = '0.92';
+bootstrap OpenSSL;
 
-@OpenSSL::BN::ISA=		qw(OpenSSL::ERR);
-@OpenSSL::MD::ISA=		qw(OpenSSL::ERR);
-@OpenSSL::Cipher::ISA=		qw(OpenSSL::ERR);
-@OpenSSL::SSL::CTX::ISA=	qw(OpenSSL::ERR);
-@OpenSSL::BIO::ISA=		qw(OpenSSL::ERR);
-@OpenSSL::SSL::ISA=		qw(OpenSSL::ERR);
+@OpenSSL::BN::ISA        = qw(OpenSSL::ERR);
+@OpenSSL::MD::ISA        = qw(OpenSSL::ERR);
+@OpenSSL::Cipher::ISA    = qw(OpenSSL::ERR);
+@OpenSSL::SSL::CTX::ISA  = qw(OpenSSL::ERR);
+@OpenSSL::BIO::ISA       = qw(OpenSSL::ERR);
+@OpenSSL::SSL::ISA       = qw(OpenSSL::ERR);
 
-@BN::ISA=			qw(OpenSSL::BN);
-@MD::ISA=		qw(OpenSSL::MD);
-@Cipher::ISA=		qw(OpenSSL::Cipher);
-@SSL::ISA=		qw(OpenSSL::SSL);
-@SSL::CTX::ISA=		qw(OpenSSL::SSL::CTX);
-@BIO::ISA=		qw(OpenSSL::BIO);
+@BN::ISA                 = qw(OpenSSL::BN);
+@MD::ISA                 = qw(OpenSSL::MD);
+@Cipher::ISA             = qw(OpenSSL::Cipher);
+@SSL::ISA                = qw(OpenSSL::SSL);
+@SSL::CTX::ISA           = qw(OpenSSL::SSL::CTX);
+@BIO::ISA                = qw(OpenSSL::BIO);
 
-@OpenSSL::MD::names=qw(md2 md5 sha sha1 ripemd160 mdc2);
+@OpenSSL::MD::names = qw(
+    md2 md5 sha sha1 ripemd160 mdc2
+);
 
-@OpenSSL::Cipher::names=qw(
+@OpenSSL::Cipher::names = qw(
     des-ecb des-cfb des-ofb des-cbc
     des-ede des-ede-cfb des-ede-ofb des-ede-cbc
     des-ede3 des-ede3-cfb des-ede3-ofb des-ede3-cbc
@@ -39,36 +42,40 @@ bootstrap penSSL;
     bf-ecb bf-cfb bf-ofb bf-cbc
     cast5-ecb cast5-cfb cast5-ofb cast5-cbc
     rc5-ecb rc5-cfb rc5-ofb rc5-cbc
-	);
+);
 
-sub OpenSSL::SSL::CTX::new_ssl { OpenSSL::SSL::new($_[0]); }
+sub OpenSSL::SSL::CTX::new_ssl { 
+    OpenSSL::SSL::new($_[0]);
+}
 
-sub OpenSSL::ERR::error
-	{
-	my($o)=@_;
-	my($s,$ret);
+sub OpenSSL::ERR::error {
+    my($o) = @_;
+    my($s, $ret);
 
-	while (($s=$o->get_error()) != 0)
-		{
+    while (($s = $o->get_error()) != 0) {
         $ret.=$s."\n";
     }
     return($ret);
-	}
+}
 
-@OpenSSL::Cipher::aliases=qw(des desx des3 idea rc2 bf cast);
+@OpenSSL::Cipher::aliases = qw(
+    des desx des3 idea rc2 bf cast
+);
 
 package OpenSSL::BN;
 
-sub bnfix { (ref($_[0]) ne "OpenSSL::BN")?OpenSSL::BN::dec2bn($_[0]):$_[0]; }
+sub bnfix { 
+    (ref($_[0]) ne "OpenSSL::BN") ? OpenSSL::BN::dec2bn($_[0]) : $_[0]; 
+}
+
 use overload
 "="    => sub { dup($_[0]); },
 "+"    => sub { add($_[0],$_[1]); },
-"-"  => sub {	($_[1],$_[0])=($_[0],$_[1]) if $_[2];
-		OpenSSL::BN::sub($_[0],$_[1]); },
+"-"    => sub { ($_[1],$_[0])=($_[0],$_[1]) if $_[2]; OpenSSL::BN::sub($_[0],$_[1]); },
 "*"    => sub { mul($_[0],$_[1]); },
+"**"   => sub { ($_[1],$_[0])=($_[0],$_[1]) if $_[2]; OpenSSL::BN::exp($_[0],$_[1]); },
 "/"    => sub { ($_[1],$_[0])=($_[0],$_[1]) if $_[2]; (div($_[0],$_[1]))[0]; },
 "%"    => sub { ($_[1],$_[0])=($_[0],$_[1]) if $_[2]; mod($_[0],$_[1]); },
-"**" => sub { ($_[1],$_[0])=($_[0],$_[1]) if $_[2]; exp($_[0],$_[1]); },
 "<<"   => sub { lshift($_[0],$_[1]); },
 ">>"   => sub { rshift($_[0],$_[1]); },
 "<=>"  => sub { OpenSSL::BN::cmp($_[0],$_[1]); },
@@ -76,5 +83,8 @@ use overload
 '0+'   => sub { dec2bn($_[0]); },
 "bool" => sub { ref($_[0]) eq "OpenSSL::BN"; };
 
-sub OpenSSL::BIO::do_accept { OpenSSL::BIO::do_handshake(@_); }
+sub OpenSSL::BIO::do_accept { 
+    OpenSSL::BIO::do_handshake(@_);
+}
+
 1;

perl/OpenSSL.xs

@@ -4,52 +4,63 @@
 
 #include "openssl.h"
 
-SV *new_ref(type,obj,mort)
-char *type;
-char *obj;
-	{
+SV *
+new_ref(type, obj, mort)
+  char *type;
+  char *obj;
+{
     SV *ret;
 
     if (mort)
-		ret=sv_newmortal();
+        ret = sv_newmortal();
     else
-		ret=newSViv(0);
-printf(">new_ref %d\n",type);
-	sv_setref_pv(ret,type,(void *)obj);
+        ret = newSViv(0);
+#ifdef DEBUG
+    printf(">new_ref %d\n",type);
+#endif
+    sv_setref_pv(ret, type, (void *)obj);
     return(ret);
-	}
+}
 
-int ex_new(obj,data,ad,idx,argl,argp)
-char *obj;
-SV *data;
-CRYPTO_EX_DATA *ad;
-int idx;
-long argl;
-char *argp;
-	{
+int 
+ex_new(obj, data, ad, idx, argl, argp)
+  char *obj;
+  SV *data;
+  CRYPTO_EX_DATA *ad;
+  int idx;
+  long argl;
+  char *argp;
+{
     SV *sv;
 
-fprintf(stderr,"ex_new %08X %s\n",obj,argp);
-	sv=sv_newmortal();
-	sv_setref_pv(sv,argp,(void *)obj);
-printf("%d>new_ref '%s'\n",sv,argp);
-	CRYPTO_set_ex_data(ad,idx,(char *)sv);
+#ifdef DEBUG
+    printf("ex_new %08X %s\n",obj,argp); 
+#endif
+    sv = sv_newmortal();
+    sv_setref_pv(sv, argp, (void *)obj);
+#ifdef DEBUG
+    printf("%d>new_ref '%s'\n", sv, argp);
+#endif
+    CRYPTO_set_ex_data(ad, idx, (char *)sv);
     return(1);
-	}
+}
 
-void ex_cleanup(obj,data,ad,idx,argl,argp)
-char *obj;
-SV *data;
-CRYPTO_EX_DATA *ad;
-int idx;
-long argl;
-char *argp;
-	{
+void 
+ex_cleanup(obj, data, ad, idx, argl, argp)
+  char *obj;
+  SV *data;
+  CRYPTO_EX_DATA *ad;
+  int idx;
+  long argl;
+  char *argp;
+{
     pr_name("ex_cleanup");
-fprintf(stderr,"ex_cleanup %08X %s\n",obj,argp);
+#ifdef DEBUG
+    printf("ex_cleanup %08X %s\n", obj, argp);
+#endif
     if (data != NULL)
         SvREFCNT_dec((SV *)data);
-	}
+}
 
 MODULE = OpenSSL  PACKAGE = OpenSSL
 

perl/README.1ST

+
+  WARNING, this Perl interface to OpenSSL is horrible incomplete.
+  Don't expect it to be really useable!!
+

perl/openssl.h

@@ -58,18 +58,19 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
+
 #ifdef __cplusplus
 }
 #endif
 
-typedef struct datum_st
-	{
+typedef struct datum_st {
     char *dptr;
     int dsize;
-	} datum;
+} datum;
 
 #include "crypto.h"
 #include "buffer.h"
@@ -79,7 +80,7 @@ typedef struct datum_st
 #include "x509.h"
 #include "ssl.h"
 
-#if 0
+#ifdef DEBUG
 #define pr_name(name)           printf("%s\n",name)
 #define pr_name_d(name,p2)      printf("%s %d\n",name,p2)
 #define pr_name_dd(name,p2,p3)  printf("%s %d %d\n",name,p2,p3)
@@ -90,7 +91,6 @@ typedef struct datum_st
 #endif
 
 SV *new_ref(char *type, char *obj, int mort);
-int ex_new(char *obj,SV *data,CRYPTO_EX_DATA *ad,int idx,long argl,char *argp);
-void ex_cleanup(char *obj,SV *data,CRYPTO_EX_DATA *ad,int idx,
-	long argl,char *argp);
+int ex_new(char *obj, SV *data, CRYPTO_EX_DATA *ad, int idx, long argl, char *argp);
+void ex_cleanup(char *obj, SV *data, CRYPTO_EX_DATA *ad, int idx, long argl, char *argp);
 

perl/openssl_bio.xs

 
 #include "openssl.h"
 
-static int p5_bio_ex_bio_ptr=0;
-static int p5_bio_ex_bio_callback=0;
-static int p5_bio_ex_bio_callback_data=0;
-
-static long p5_bio_callback(bio,state,parg,cmd,larg,ret)
-BIO *bio;
-int state;
-char *parg;
-int cmd;
-long larg;
-int ret;
-	{
+static int p5_bio_ex_bio_ptr = 0;
+static int p5_bio_ex_bio_callback = 0;
+static int p5_bio_ex_bio_callback_data = 0;
+
+static long 
+p5_bio_callback(bio,state,parg,cmd,larg,ret)
+  BIO  *bio;
+  int   state;
+  char *parg;
+  int   cmd;
+  long  larg;
+  int   ret;
+{
     int i;
     SV *me,*cb;
 
-	me=(SV *)BIO_get_ex_data(bio,p5_bio_ex_bio_ptr);
-	cb=(SV *)BIO_get_ex_data(bio,p5_bio_ex_bio_callback);
-	if (cb != NULL)
-		{
+    me = (SV *)BIO_get_ex_data(bio, p5_bio_ex_bio_ptr);
+    cb = (SV *)BIO_get_ex_data(bio, p5_bio_ex_bio_callback);
+    if (cb != NULL) {
         dSP;
 
-		ENTER ;
+        ENTER;
         SAVETMPS;
 
         PUSHMARK(sp);
-		XPUSHs(sv_2mortal(newSViv(me)));
+        XPUSHs(sv_2mortal(newSVsv(me)));
         XPUSHs(sv_2mortal(newSViv(state)));
         XPUSHs(sv_2mortal(newSViv(cmd)));
         if ((state == BIO_CB_READ) || (state == BIO_CB_WRITE))
-			{
             XPUSHs(sv_2mortal(newSVpv(parg,larg)));
-			}
         else
             XPUSHs(&sv_undef);
         /* ptr one */
@@ -40,37 +38,31 @@ int ret;
         XPUSHs(sv_2mortal(newSViv(ret)));
         PUTBACK;
 
-		i=perl_call_sv(cb,G_SCALAR);
+        i = perl_call_sv(cb,G_SCALAR);
 
         SPAGAIN;
         if (i == 1)
-			ret=POPi;
+            ret = POPi;
         else
-			ret=1;
+            ret = 1;
         PUTBACK;
         FREETMPS;
         LEAVE;
     }
-	else
-		{
-		croak("Internal error in SSL p5_ssl_info_callback");
+    else {
+        croak("Internal error in p5_bio_callback");
     }
     return(ret);
-	}
+}
 
-int boot_bio()
-	{
-	p5_bio_ex_bio_ptr=
-		BIO_get_ex_new_index(0,"OpenSSL::BIO",ex_new,NULL,
-			ex_cleanup);
-	p5_bio_ex_bio_callback=	
-		BIO_get_ex_new_index(0,"bio_callback",NULL,NULL,
-			ex_cleanup);
-	p5_bio_ex_bio_callback_data=
-		BIO_get_ex_new_index(0,"bio_callback_data",NULL,NULL,
-			ex_cleanup);
+int 
+boot_bio(void)
+{
+    p5_bio_ex_bio_ptr = BIO_get_ex_new_index(0, "OpenSSL::BIO", ex_new, NULL, ex_cleanup);
+    p5_bio_ex_bio_callback = BIO_get_ex_new_index(0, "bio_callback", NULL, NULL, ex_cleanup);
+    p5_bio_ex_bio_callback_data = BIO_get_ex_new_index(0, "bio_callback_data", NULL, NULL, ex_cleanup);
     return(1);
-	}
+}
 
 MODULE = OpenSSL::BIO  PACKAGE = OpenSSL::BIO  PREFIX = p5_BIO_
 
@@ -78,58 +70,57 @@ VERSIONCHECK: DISABLE
 
 void
 p5_BIO_new_buffer_ssl_connect(...)
+    PROTOTYPE: ;$
     PREINIT:
         SSL_CTX *ctx;
         BIO *bio;
         SV *arg;
     PPCODE:
         if (items == 1)
-			arg=ST(0);
+            arg = ST(0);
         else if (items == 2)
-			arg=ST(1);
+            arg = ST(1);
         else
-			arg=NULL;
-
+            arg = NULL;
         if ((arg == NULL) || !(sv_derived_from(arg,"OpenSSL::SSL::CTX")))
             croak("Usage: OpenSSL::BIO::new_buffer_ssl_connect(SSL_CTX)");
-		else
-			{
-			IV tmp=SvIV((SV *)SvRV(arg));
-			ctx=(SSL_CTX *)tmp;
+        else {
+            IV tmp = SvIV((SV *)SvRV(arg));
+            ctx = (SSL_CTX *)tmp;
         }
-		EXTEND(sp,1);
-		bio=BIO_new_buffer_ssl_connect(ctx);
-		arg=(SV *)BIO_get_ex_data(bio,p5_bio_ex_bio_ptr);
+        EXTEND(sp, 1);
+        bio = BIO_new_buffer_ssl_connect(ctx);
+        arg = (SV *)BIO_get_ex_data(bio, p5_bio_ex_bio_ptr);
         PUSHs(arg);
     
 void
 p5_BIO_new_ssl_connect(...)
+    PROTOTYPE: ;$
     PREINIT:
         SSL_CTX *ctx;
         BIO *bio;
         SV *arg;
     PPCODE:
         if (items == 1)
-			arg=ST(0);
+            arg = ST(0);
         else if (items == 2)
-			arg=ST(1);
+            arg = ST(1);
         else
-			arg=NULL;
-
+            arg = NULL;
         if ((arg == NULL) || !(sv_derived_from(arg,"OpenSSL::SSL::CTX")))
             croak("Usage: OpenSSL::BIO::new_ssl_connect(SSL_CTX)");
-		else
-			{
-			IV tmp=SvIV((SV *)SvRV(arg));
-			ctx=(SSL_CTX *)tmp;
+        else {
+            IV tmp = SvIV((SV *)SvRV(arg));
+            ctx = (SSL_CTX *)tmp;
         }
         EXTEND(sp,1);
-		bio=BIO_new_ssl_connect(ctx);
-		arg=(SV *)BIO_get_ex_data(bio,p5_bio_ex_bio_ptr);
+        bio = BIO_new_ssl_connect(ctx);
+        arg = (SV *)BIO_get_ex_data(bio,p5_bio_ex_bio_ptr);
         PUSHs(arg);
     
 void
 p5_BIO_new(...)
+    PROTOTYPE: ;$
     PREINIT:
         BIO *bio;
         char *type;
@@ -137,161 +128,162 @@ p5_BIO_new(...)
     PPCODE:
         pr_name("p5_BIO_new");
         if ((items == 1) && SvPOK(ST(0)))
-			type=SvPV(ST(0),na);
+            type = SvPV(ST(0),na);
         else if ((items == 2) && SvPOK(ST(1)))
-			type=SvPV(ST(1),na);
+            type = SvPV(ST(1),na);
         else
             croak("Usage: OpenSSL::BIO::new(type)");
-
         EXTEND(sp,1);
-		if (strcmp(type,"connect") == 0)
+        if (strcmp(type, "mem") == 0)
+            bio=BIO_new(BIO_s_mem());
+        else if (strcmp(type, "socket") == 0)
+            bio=BIO_new(BIO_s_socket());
+        else if (strcmp(type, "connect") == 0)
             bio=BIO_new(BIO_s_connect());
-		else if (strcmp(type,"accept") == 0)
+        else if (strcmp(type, "accept") == 0)
             bio=BIO_new(BIO_s_accept());
-		else if (strcmp(type,"ssl") == 0)
+        else if (strcmp(type, "fd") == 0)
+            bio=BIO_new(BIO_s_fd());
+        else if (strcmp(type, "file") == 0)
+            bio=BIO_new(BIO_s_file());
+        else if (strcmp(type, "null") == 0)
+            bio=BIO_new(BIO_s_null());
+        else if (strcmp(type, "ssl") == 0)
             bio=BIO_new(BIO_f_ssl());
-		else if (strcmp(type,"buffer") == 0)
+        else if (strcmp(type, "buffer") == 0)
             bio=BIO_new(BIO_f_buffer());
         else
             croak("unknown BIO type");
-		arg=(SV *)BIO_get_ex_data(bio,p5_bio_ex_bio_ptr);
+        arg = (SV *)BIO_get_ex_data(bio,p5_bio_ex_bio_ptr);
         PUSHs(arg);
 
 int
-p5_BIO_hostname(bio,name)
+p5_BIO_hostname(bio, name)
     BIO *bio;
     char *name;
+    PROTOTYPE: $$
     CODE:
-		RETVAL=BIO_set_conn_hostname(bio,name);
+        RETVAL = BIO_set_conn_hostname(bio, name);
     OUTPUT:
         RETVAL
 
 int
-p5_BIO_set_accept_port(bio,str)
+p5_BIO_set_accept_port(bio, str)
     BIO *bio;
     char *str;
+    PROTOTYPE: $$
     CODE:
-		RETVAL=BIO_set_accept_port(bio,str);
+        RETVAL = BIO_set_accept_port(bio, str);
     OUTPUT:
         RETVAL
 
 int
 p5_BIO_do_handshake(bio)
     BIO *bio;
+    PROTOTYPE: $
     CODE:
-		RETVAL=BIO_do_handshake(bio);
+        RETVAL = BIO_do_handshake(bio);
     OUTPUT:
         RETVAL
 
 BIO *
-p5_BIO_push(b,bio)
+p5_BIO_push(b, bio)
     BIO *b;
     BIO *bio;
+    PROTOTYPE: $$
     CODE:
         /* This reference will be reduced when the reference is
          * let go, and then when the BIO_free_all() is called
          * inside the OpenSSL library by the BIO with this
          * pushed into */
         bio->references++;
-		RETVAL=BIO_push(b,bio);
+        RETVAL = BIO_push(b, bio);
     OUTPUT:
         RETVAL
 
 void
 p5_BIO_pop(b)
     BIO *b
+    PROTOTYPE: $
     PREINIT:
         BIO *bio;
         char *type;
         SV *arg;
     PPCODE:
-		bio=BIO_pop(b);
-		if (bio != NULL)
-			{
+        bio = BIO_pop(b);
+        if (bio != NULL) {
             /* This BIO will either be one created in the
              * perl library, in which case it will have a perl
              * SV, otherwise it will have been created internally,
              * inside OpenSSL.  For the 'pushed in', it needs
              * the reference count decememted. */
-			arg=(SV *)BIO_get_ex_data(bio,p5_bio_ex_bio_ptr);
-			if (arg == NULL)
-				{
-				arg=new_ref("OpenSSL::BIO",(char *)bio,0);
-				BIO_set_ex_data(bio,p5_bio_ex_bio_ptr,(char *)arg);
+            arg = (SV *)BIO_get_ex_data(bio, p5_bio_ex_bio_ptr);
+            if (arg == NULL) {
+                arg = new_ref("OpenSSL::BIO",(char *)bio,0);
+                BIO_set_ex_data(bio, p5_bio_ex_bio_ptr, (char *)arg);
                 PUSHs(arg);
             }
-			else
-				{
+            else {
                 /* it was pushed in */
                 SvREFCNT_inc(arg);
                 PUSHs(arg);
-#if 0 		/* This does not need to be done. */
-				if (bio->references < 1)
-					abort();
-				/* decrement the reference count */
-				BIO_free(bio);
-#endif
             }
         }
 
 int
-p5_BIO_sysread(bio,in,num, ...)
+p5_BIO_sysread(bio, in, num, ...)
     BIO *bio;
     SV *in;
     int num;
+    PROTOTYPE: $$$;
     PREINIT:
         int i,n,olen;
         int offset;
         char *p;
     CODE:
-		offset=0;
+        offset = 0;
         if (!SvPOK(in))
-			sv_setpvn(in,"",0);
-		SvPV(in,olen);
-		if (items > 3)
-			{
-			offset=SvIV(ST(3));
-			if (offset < 0)
-				{
+            sv_setpvn(in, "", 0);
+        SvPV(in, olen);
+        if (items > 3) {
+            offset = SvIV(ST(3));
+            if (offset < 0) {
                 if (-offset > olen)
                     croak("Offset outside string");
                 offset+=olen;
             }
         }
-		if ((num+offset) > olen)
-			{
-			SvGROW(in,num+offset+1);
-			p=SvPV(in,i);
-			memset(&(p[olen]),0,(num+offset)-olen+1);
+        if ((num+offset) > olen) {
+            SvGROW(in, num+offset+1);
+            p=SvPV(in, i);
+            memset(&(p[olen]), 0, (num+offset)-olen+1);
         }
-		p=SvPV(in,n);
-
-		i=BIO_read(bio,p+offset,num);
-		RETVAL=i;
-		if (i <= 0) i=0;
-		SvCUR_set(in,offset+i);
+        p = SvPV(in,n);
+        i = BIO_read(bio, p+offset, num);
+        RETVAL = i;
+        if (i <= 0) 
+            i = 0;
+        SvCUR_set(in, offset+i);
     OUTPUT:
         RETVAL
 
 int
-p5_BIO_syswrite(bio,in, ...)
+p5_BIO_syswrite(bio, in, ...)
     BIO *bio;
     SV *in;
+    PROTOTYPE: $$;
     PREINIT:
         char *ptr;
         int len,in_len;
         int offset=0;
         int n;
     CODE:
-		ptr=SvPV(in,in_len);
-		if (items > 2)
-			{
-			len=SvOK(ST(2))?SvIV(ST(2)):in_len;
-			if (items > 3)
-				{
-				offset=SvIV(ST(3));
-				if (offset < 0)
-					{
+        ptr = SvPV(in, in_len);
+        if (items > 2) {
+            len = SvOK(ST(2)) ? SvIV(ST(2)) : in_len;
+            if (items > 3) {
+                offset = SvIV(ST(3));
+                if (offset < 0) {
                     if (-offset > in_len)
                         croak("Offset outside string");
                     offset+=in_len;
@@ -300,152 +292,158 @@ p5_BIO_syswrite(bio,in, ...)
                     croak("Offset outside string");
             }
             if (len >= (in_len-offset))
-				len=in_len-offset;
+                len = in_len-offset;
         }
         else
-			len=in_len;
-
-		RETVAL=BIO_write(bio,ptr+offset,len);
+            len = in_len;
+        RETVAL = BIO_write(bio, ptr+offset, len);
     OUTPUT:
         RETVAL
 
 void
 p5_BIO_getline(bio)
     BIO *bio;
+    PROTOTYPE: $
     PREINIT:
         int i;
         char *p;
     PPCODE:
         pr_name("p5_BIO_gets");
-		EXTEND(sp,1);
+        EXTEND(sp, 1);
         PUSHs(sv_newmortal());
-		sv_setpvn(ST(0),"",0);
-		SvGROW(ST(0),1024);
-		p=SvPV(ST(0),na);
-		i=BIO_gets(bio,p,1024);
-		if (i < 0) i=0;
-		SvCUR_set(ST(0),i);
+        sv_setpvn(ST(0), "", 0);
+        SvGROW(ST(0), 1024);
+        p=SvPV(ST(0), na);
+        i = BIO_gets(bio, p, 1024);
+        if (i < 0) 
+            i = 0;
+        SvCUR_set(ST(0), i);
 
 int
 p5_BIO_flush(bio)
     BIO *bio;
+    PROTOTYPE: $
     CODE:
-		RETVAL=BIO_flush(bio);
+        RETVAL = BIO_flush(bio);
     OUTPUT:
         RETVAL
 
 char *
 p5_BIO_type(bio)
     BIO *bio;
+    PROTOTYPE: $
     CODE:
-		RETVAL=bio->method->name;
+        RETVAL = bio->method->name;
     OUTPUT:
         RETVAL
 
 void
 p5_BIO_next_bio(b)
     BIO *b
+    PROTOTYPE: $
     PREINIT:
         BIO *bio;
         char *type;
         SV *arg;
     PPCODE:
-		bio=b->next_bio;
-		if (bio != NULL)
-			{
-			arg=(SV *)BIO_get_ex_data(bio,p5_bio_ex_bio_ptr);
-			if (arg == NULL)
-				{
-				arg=new_ref("OpenSSL::BIO",(char *)bio,0);
-				BIO_set_ex_data(bio,p5_bio_ex_bio_ptr,(char *)arg);
+        bio = b->next_bio;
+        if (bio != NULL) {
+            arg = (SV *)BIO_get_ex_data(bio, p5_bio_ex_bio_ptr);
+            if (arg == NULL) {
+                arg = new_ref("OpenSSL::BIO", (char *)bio, 0);
+                BIO_set_ex_data(bio, p5_bio_ex_bio_ptr, (char *)arg);
                 bio->references++;
                 PUSHs(arg);
             }
-			else
-				{
+            else {
                 SvREFCNT_inc(arg);
                 PUSHs(arg);
             }
         }
 
 int
-p5_BIO_puts(bio,in)
+p5_BIO_puts(bio, in)
     BIO *bio;
     SV *in;
+    PROTOTYPE: $$
     PREINIT:
         char *ptr;
     CODE:
-		ptr=SvPV(in,na);
-		RETVAL=BIO_puts(bio,ptr);
+        ptr = SvPV(in,na);
+        RETVAL = BIO_puts(bio, ptr);
     OUTPUT:
         RETVAL
 
 void
-p5_BIO_set_callback(bio,cb,...)
+p5_BIO_set_callback(bio, cb,...)
     BIO *bio;
     SV *cb;
+    PROTOTYPE: $$;
     PREINIT:
-		SV *arg=NULL;
-		SV *arg2=NULL;
+        SV *arg  = NULL;
+        SV *arg2 = NULL;
     CODE:
         if (items > 3)
             croak("Usage: OpenSSL::BIO::set_callback(bio,callback[,arg]");
-		if (items == 3)
-			{
-			arg2=sv_mortalcopy(ST(2));
+        if (items == 3) {
+            arg2 = sv_mortalcopy(ST(2));
             SvREFCNT_inc(arg2);
-			BIO_set_ex_data(bio,p5_bio_ex_bio_callback_data,
-				(char *)arg2);
+            BIO_set_ex_data(bio, p5_bio_ex_bio_callback_data, (char *)arg2);
         }
-		arg=sv_mortalcopy(ST(1));
+        arg = sv_mortalcopy(ST(1));
         SvREFCNT_inc(arg);
-		BIO_set_ex_data(bio,p5_bio_ex_bio_callback,(char *)arg);
-		printf("%08lx < bio_ptr\n",BIO_get_ex_data(bio,p5_bio_ex_bio_ptr));
-		BIO_set_callback(bio,p5_bio_callback);
+        BIO_set_ex_data(bio, p5_bio_ex_bio_callback, (char *)arg);
+        /* printf("%08lx < bio_ptr\n",BIO_get_ex_data(bio,p5_bio_ex_bio_ptr)); */
+        BIO_set_callback(bio, p5_bio_callback);
 
 void
 p5_BIO_DESTROY(bio)
     BIO *bio
+    PROTOTYPE: $
     PREINIT:
         SV *sv;
     PPCODE:
         pr_name_d("p5_BIO_DESTROY",bio->references);
-		printf("p5_BIO_DESTROY <%s> %d\n",bio->method->name,bio->references);
+        /* printf("p5_BIO_DESTROY <%s> %d\n",bio->method->name,bio->references); */
         BIO_set_ex_data(bio,p5_bio_ex_bio_ptr,NULL);
         BIO_free_all(bio);
 
 int
-p5_BIO_set_ssl(bio,ssl)
+p5_BIO_set_ssl(bio, ssl)
     BIO *bio;
     SSL *ssl;
+    PROTOTYPE: $$
     CODE:
         pr_name("p5_BIO_set_ssl");
         ssl->references++;
-		RETVAL=BIO_set_ssl(bio,ssl,BIO_CLOSE);
+        RETVAL = BIO_set_ssl(bio, ssl, BIO_CLOSE);
     OUTPUT:
         RETVAL
 
 int
 p5_BIO_number_read(bio)
     BIO *bio;
+    PROTOTYPE: $
     CODE:
-		RETVAL=BIO_number_read(bio);
+        RETVAL = BIO_number_read(bio);
     OUTPUT:
         RETVAL
 
 int
 p5_BIO_number_written(bio)
     BIO *bio;
+    PROTOTYPE: $
     CODE:
-		RETVAL=BIO_number_written(bio);
+        RETVAL = BIO_number_written(bio);
     OUTPUT:
         RETVAL
 
 int
 p5_BIO_references(bio)
     BIO *bio;
+    PROTOTYPE: $
     CODE:
-		RETVAL=bio->references;	
+        RETVAL = bio->references; 
     OUTPUT:
         RETVAL
 

perl/t/01-use.t

+
+BEGIN { 
+    $| = 1; 
+    print "1..1\n";
+}
+END {
+	print "not ok 1\n" unless $loaded;
+}
+use OpenSSL;
+$loaded = 1;
+print "ok 1\n";
+
+

perl/t/02-version.t

+
+print "1..1\n";
+use OpenSSL;
+if ($OpenSSL::VERSION ne '') {
+    print "ok 1\n";
+}
+else {
+    print "not ok 1\n";
+}
+

perl/t/03-bio.t

+
+BEGIN { 
+    $| = 1; 
+    print "1..1\n";
+}
+END {
+	print "not ok 1\n" unless $ok;
+}
+
+use OpenSSL;
+my $bio = OpenSSL::BIO::new("mem") || die;
+undef $bio;
+
+$ok = 1;
+print "ok 1\n";
+