[Perl-openssl-checkins] Crypt/OpenSSL/RSA RSA.xs,1.54,1.55

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

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

Modified Files:
	RSA.xs 
Log Message:
Add some harmless semicolons to the ends of macros to help code formatters

Index: RSA.xs
===================================================================
RCS file: /cvsroot/perl-openssl/Crypt/OpenSSL/RSA/RSA.xs,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** RSA.xs	19 Feb 2004 03:11:39 -0000	1.54
--- RSA.xs	19 Feb 2004 03:16:06 -0000	1.55
***************
*** 51,55 ****
      SV* rsaSvRef;
  
!     CHECK_NEW(rsa, 1, rsaData)
      rsa->rsa = p_rsa;
      rsa->hashMode = NID_sha1;
--- 51,55 ----
      SV* rsaSvRef;
  
!     CHECK_NEW(rsa, 1, rsaData);
      rsa->rsa = p_rsa;
      rsa->hashMode = NID_sha1;
***************
*** 135,139 ****
      keyString = SvPV(p_keyStringSv, keyStringLength);
  
!     CHECK_OPEN_SSL(stringBIO = BIO_new_mem_buf(keyString, keyStringLength))
  
      rsa = p_loader(stringBIO, NULL, NULL, NULL);
--- 135,139 ----
      keyString = SvPV(p_keyStringSv, keyStringLength);
  
!     CHECK_OPEN_SSL(stringBIO = BIO_new_mem_buf(keyString, keyStringLength));
  
      rsa = p_loader(stringBIO, NULL, NULL, NULL);
***************
*** 142,146 ****
      BIO_free(stringBIO);
  
!     CHECK_OPEN_SSL(rsa)
      return rsa;
  }
--- 142,146 ----
      BIO_free(stringBIO);
  
!     CHECK_OPEN_SSL(rsa);
      return rsa;
  }
***************
*** 157,161 ****
      from = SvPV(p_from, from_length);
      size = RSA_size(p_rsa->rsa);
!     CHECK_NEW(to, size, char)
  
      to_length = p_crypt(from_length, from, to, p_rsa->rsa, p_rsa->padding);
--- 157,161 ----
      from = SvPV(p_from, from_length);
      size = RSA_size(p_rsa->rsa);
!     CHECK_NEW(to, size, char);
  
      to_length = p_crypt(from_length, from, to, p_rsa->rsa, p_rsa->padding);
***************
*** 164,168 ****
      {
          Safefree(to);
!         CHECK_OPEN_SSL(0)
      }
      sv = newSVpv(to, to_length);
--- 164,168 ----
      {
          Safefree(to);
!         CHECK_OPEN_SSL(0);
      }
      sv = newSVpv(to, to_length);
***************
*** 221,225 ****
      BIO* stringBIO;
    CODE:
!     CHECK_OPEN_SSL(stringBIO = BIO_new(BIO_s_mem()))
      PEM_write_bio_RSAPrivateKey(
          stringBIO, p_rsa->rsa, NULL, NULL, 0, NULL, NULL);
--- 221,225 ----
      BIO* stringBIO;
    CODE:
!     CHECK_OPEN_SSL(stringBIO = BIO_new(BIO_s_mem()));
      PEM_write_bio_RSAPrivateKey(
          stringBIO, p_rsa->rsa, NULL, NULL, 0, NULL, NULL);
***************
*** 235,239 ****
      BIO* stringBIO;
    CODE:
!     CHECK_OPEN_SSL(stringBIO = BIO_new(BIO_s_mem()))
      PEM_write_bio_RSAPublicKey(stringBIO, p_rsa->rsa);
      RETVAL = extractBioString(stringBIO);
--- 235,239 ----
      BIO* stringBIO;
    CODE:
!     CHECK_OPEN_SSL(stringBIO = BIO_new(BIO_s_mem()));
      PEM_write_bio_RSAPublicKey(stringBIO, p_rsa->rsa);
      RETVAL = extractBioString(stringBIO);
***************
*** 248,252 ****
      BIO* stringBIO;
    CODE:
!     CHECK_OPEN_SSL(stringBIO = BIO_new(BIO_s_mem()))
      PEM_write_bio_RSA_PUBKEY(stringBIO, p_rsa->rsa);
      RETVAL = extractBioString(stringBIO);
--- 248,252 ----
      BIO* stringBIO;
    CODE:
!     CHECK_OPEN_SSL(stringBIO = BIO_new(BIO_s_mem()));
      PEM_write_bio_RSA_PUBKEY(stringBIO, p_rsa->rsa);
      RETVAL = extractBioString(stringBIO);
***************
*** 263,267 ****
      RSA* rsa;
    CODE:
!     CHECK_OPEN_SSL(rsa = RSA_generate_key(SvIV(bitsSV), exponent, NULL, NULL))
      RETVAL = make_rsa_obj(proto, rsa);
    OUTPUT:
--- 263,267 ----
      RSA* rsa;
    CODE:
!     CHECK_OPEN_SSL(rsa = RSA_generate_key(SvIV(bitsSV), exponent, NULL, NULL));
      RETVAL = make_rsa_obj(proto, rsa);
    OUTPUT:
***************
*** 289,293 ****
          croak("At least a modulous and public key must be provided");
      }
!     CHECK_OPEN_SSL(rsa = RSA_new())
      rsa->n = n;
      rsa->e = e;
--- 289,293 ----
          croak("At least a modulous and public key must be provided");
      }
!     CHECK_OPEN_SSL(rsa = RSA_new());
      rsa->n = n;
      rsa->e = e;
***************
*** 301,305 ****
              THROW(BN_div(p, NULL, n, q, ctx));
          }
!         else if (! q)
          {
              q = BN_new();
--- 301,305 ----
              THROW(BN_div(p, NULL, n, q, ctx));
          }
!         else if (!q)
          {
              q = BN_new();
***************
*** 315,334 ****
          {
              THROW(d = BN_new());
!             THROW(BN_mul(d, p_minus_1, q_minus_1, ctx))
!             THROW(BN_mod_inverse(d, e, d, ctx))
          }
          rsa->d = d;
          THROW(rsa->dmp1 = BN_new());
!         THROW(BN_mod(rsa->dmp1, d, p_minus_1, ctx))
          THROW(rsa->dmq1 = BN_new());
!         THROW(BN_mod(rsa->dmq1, d, q_minus_1, ctx))
          THROW(rsa->iqmp = BN_new());
!         THROW(BN_mod_inverse(rsa->iqmp, q, p, ctx))
!         THROW(RSA_check_key(rsa) == 1)
       err:
!         if(p_minus_1) BN_clear_free(p_minus_1);
!         if(q_minus_1) BN_clear_free(q_minus_1);
!         if(ctx) BN_CTX_free(ctx);
!         if(error)
          {
              RSA_free(rsa);
--- 315,334 ----
          {
              THROW(d = BN_new());
!             THROW(BN_mul(d, p_minus_1, q_minus_1, ctx));
!             THROW(BN_mod_inverse(d, e, d, ctx));
          }
          rsa->d = d;
          THROW(rsa->dmp1 = BN_new());
!         THROW(BN_mod(rsa->dmp1, d, p_minus_1, ctx));
          THROW(rsa->dmq1 = BN_new());
!         THROW(BN_mod(rsa->dmq1, d, q_minus_1, ctx));
          THROW(rsa->iqmp = BN_new());
!         THROW(BN_mod_inverse(rsa->iqmp, q, p, ctx));
!         THROW(RSA_check_key(rsa) == 1);
       err:
!         if (p_minus_1) BN_clear_free(p_minus_1);
!         if (q_minus_1) BN_clear_free(q_minus_1);
!         if (ctx) BN_CTX_free(ctx);
!         if (error)
          {
              RSA_free(rsa);
***************
*** 492,503 ****
      int signature_length;
    CODE:
!     if (! is_private(p_rsa))
      {
          croak("Public keys cannot sign messages.");
      }
  
!     CHECK_NEW(signature, RSA_size(p_rsa->rsa), char)
  
!     CHECK_OPEN_SSL(digest = get_message_digest(text_SV, p_rsa->hashMode))
      CHECK_OPEN_SSL(RSA_sign(p_rsa->hashMode,
                              digest,
--- 492,504 ----
      int signature_length;
    CODE:
! {
!     if (!is_private(p_rsa))
      {
          croak("Public keys cannot sign messages.");
      }
  
!     CHECK_NEW(signature, RSA_size(p_rsa->rsa), char);
  
!     CHECK_OPEN_SSL(digest = get_message_digest(text_SV, p_rsa->hashMode));
      CHECK_OPEN_SSL(RSA_sign(p_rsa->hashMode,
                              digest,
***************
*** 505,511 ****
                              signature,
                              &signature_length,
!                             p_rsa->rsa))
      RETVAL = newSVpvn(signature, signature_length);
      Safefree(signature);
    OUTPUT:
      RETVAL
--- 506,513 ----
                              signature,
                              &signature_length,
!                             p_rsa->rsa));
      RETVAL = newSVpvn(signature, signature_length);
      Safefree(signature);
+ }
    OUTPUT:
      RETVAL
***************
*** 530,534 ****
      }
  
!     CHECK_OPEN_SSL(digest = get_message_digest(text_SV, p_rsa->hashMode))
      switch(RSA_verify(p_rsa->hashMode,
                        digest,
--- 532,536 ----
      }
  
!     CHECK_OPEN_SSL(digest = get_message_digest(text_SV, p_rsa->hashMode));
      switch(RSA_verify(p_rsa->hashMode,
                        digest,
***************
*** 539,543 ****
      {
          case 0:
!             CHECK_OPEN_SSL(ERR_peek_error())
              XSRETURN_NO;
              break;
--- 541,545 ----
      {
          case 0:
!             CHECK_OPEN_SSL(ERR_peek_error());
              XSRETURN_NO;
              break;
***************
*** 546,550 ****
              break;
          default:
!             CHECK_OPEN_SSL(0)
              break;
      }
--- 548,552 ----
              break;
          default:
!             CHECK_OPEN_SSL(0);
              break;
      }