[Perl-openssl-checkins] Crypt/OpenSSL/RSA RSA.xs,1.30,1.31

[<iro...@us...>]

Update of /cvsroot/perl-openssl/Crypt/OpenSSL/RSA
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6595

Modified Files:
	RSA.xs 
Log Message:
misc cleanup - removing temporary variables, white space, etc.

Index: RSA.xs
===================================================================
RCS file: /cvsroot/perl-openssl/Crypt/OpenSSL/RSA/RSA.xs,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** RSA.xs	13 Feb 2004 23:26:24 -0000	1.30
--- RSA.xs	15 Feb 2004 14:18:17 -0000	1.31
***************
*** 38,47 ****
  {
      SV** rsa_ptr_SV_ptr;
-     RSA* rsa;
  
!     rsa_ptr_SV_ptr = hvFetch(rsa_HV, KEY_KEY);
!     if (rsa_ptr_SV_ptr != NULL)
      {
!         RSA_free((RSA*) SvIV (*rsa_ptr_SV_ptr));
          hv_delete(rsa_HV, KEY_KEY, strlen(KEY_KEY), G_DISCARD);
      }
--- 38,45 ----
  {
      SV** rsa_ptr_SV_ptr;
  
!     if ((rsa_ptr_SV_ptr = hvFetch(rsa_HV, KEY_KEY)) != NULL)
      {
!         RSA_free((RSA*) SvIV(*rsa_ptr_SV_ptr));
          hv_delete(rsa_HV, KEY_KEY, strlen(KEY_KEY), G_DISCARD);
      }
***************
*** 51,58 ****
  {
      SV** rsa_ptr_SV_ptr;
-     RSA* rsa;
  
!     rsa_ptr_SV_ptr = hvFetch(rsa_HV, KEY_KEY);
!     if (rsa_ptr_SV_ptr == NULL)
      {
          croak("There is no key set");
--- 49,54 ----
  {
      SV** rsa_ptr_SV_ptr;
  
!     if ((rsa_ptr_SV_ptr = hvFetch(rsa_HV, KEY_KEY)) == NULL)
      {
          croak("There is no key set");
***************
*** 60,64 ****
      else
      {
!         return (RSA*) SvIV (*rsa_ptr_SV_ptr);
      }
  }
--- 56,60 ----
      else
      {
!         return (RSA*) SvIV(*rsa_ptr_SV_ptr);
      }
  }
***************
*** 102,106 ****
  SV* make_rsa_obj(SV* p_proto, RSA* p_rsa)
  {
-     RSA* rsa;
      HV* rsa_HV;
      rsa_HV = newHV();
--- 98,101 ----
***************
*** 108,115 ****
      set_hash(rsa_HV, NID_sha1);
      set_padding(rsa_HV, RSA_PKCS1_OAEP_PADDING);
!     return sv_bless(newRV_noinc((SV*) rsa_HV),
!                     (SvROK(p_proto)
!                      ? SvSTASH(SvRV(p_proto))
!                      : gv_stashsv(p_proto, 1)));
  }
  
--- 103,109 ----
      set_hash(rsa_HV, NID_sha1);
      set_padding(rsa_HV, RSA_PKCS1_OAEP_PADDING);
!     return sv_bless(
!         newRV_noinc((SV*) rsa_HV),
!         (SvROK(p_proto) ? SvSTASH(SvRV(p_proto)) : gv_stashsv(p_proto, 1)));
  }
  
***************
*** 267,275 ****
    PREINIT:
      BIO* stringBIO;
-     RSA* rsa;
    CODE:
      CHECK_OPEN_SSL(stringBIO = BIO_new(BIO_s_mem()))
!     rsa = get_RSA_key(rsa_HV);
!     PEM_write_bio_RSAPrivateKey(stringBIO, rsa, NULL, NULL, 0, NULL, NULL);
      RETVAL = extractBioString(stringBIO);
  
--- 261,268 ----
    PREINIT:
      BIO* stringBIO;
    CODE:
      CHECK_OPEN_SSL(stringBIO = BIO_new(BIO_s_mem()))
!     PEM_write_bio_RSAPrivateKey(
!         stringBIO, get_RSA_key(rsa_HV), NULL, NULL, 0, NULL, NULL);
      RETVAL = extractBioString(stringBIO);
  
***************
*** 322,329 ****
  
      exponent = (items == 3) ? SvIV(ST(2)) : 65535;
!     rsa = RSA_generate_key(SvIV(bitsSV), exponent, NULL, NULL);
! 
!     CHECK_OPEN_SSL(rsa)
! 
      set_RSA_key(rsa_HV, rsa);
  
--- 315,319 ----
  
      exponent = (items == 3) ? SvIV(ST(2)) : 65535;
!     CHECK_OPEN_SSL(rsa = RSA_generate_key(SvIV(bitsSV), exponent, NULL, NULL))
      set_RSA_key(rsa_HV, rsa);
  
***************
*** 589,593 ****
  
  SV*
! sign (rsa_HV, text_SV, ...)
      HV* rsa_HV;
      SV* text_SV;
--- 579,583 ----
  
  SV*
! sign(rsa_HV, text_SV, ...)
      HV* rsa_HV;
      SV* text_SV;
***************
*** 632,636 ****
  
  void
! verify (rsa_HV, text_SV, sig_SV, ...)
      HV* rsa_HV;
      SV* text_SV;
--- 622,626 ----
  
  void
! verify(rsa_HV, text_SV, sig_SV, ...)
      HV* rsa_HV;
      SV* text_SV;