Menu
▾
▴
[Perl-openssl-checkins] Crypt/OpenSSL/RSA RSA.xs,1.38,1.39
|
From: <iro...@us...> - 2004-02-16 05:10:46
|
Update of /cvsroot/perl-openssl/Crypt/OpenSSL/RSA In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12618 Modified Files: RSA.xs Log Message: inline method calls which are now just struct access Index: RSA.xs =================================================================== RCS file: /cvsroot/perl-openssl/Crypt/OpenSSL/RSA/RSA.xs,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** RSA.xs 16 Feb 2004 04:53:56 -0000 1.38 --- RSA.xs 16 Feb 2004 05:02:56 -0000 1.39 *************** *** 25,75 **** __FILE__, __LINE__, ERR_reason_error_string(ERR_get_error())); - //FIXME - shouldn't there always be a key? - /* Free the RSA key, if there is one */ - void free_RSA_key(rsaData* p_rsa) - { - if (p_rsa->rsa) - { - RSA_free(p_rsa->rsa); - p_rsa->rsa = NULL; - } - } - - //FIXME - shouldn't there always be a key? - RSA* get_RSA_key(rsaData* p_rsa) - { - if (!p_rsa->rsa) - { - croak("There is no key set"); - } - else - { - return p_rsa->rsa; - } - } - - int get_padding(rsaData* p_rsa) - { - return p_rsa->padding; - } - - void set_padding(rsaData* p_rsa, int p_padding) - { - p_rsa->padding = p_padding; - } - - int get_hash(rsaData* p_rsa) - { - return p_rsa->hashMode; - } - - void set_hash(rsaData* p_rsa, int p_hashMode) - { - p_rsa->hashMode = p_hashMode; - } - char is_private(rsaData* p_rsa) { ! return(get_RSA_key(p_rsa)->d != NULL); } --- 25,31 ---- __FILE__, __LINE__, ERR_reason_error_string(ERR_get_error())); char is_private(rsaData* p_rsa) { ! return(p_rsa->rsa->d != NULL); } *************** *** 245,249 **** rsaData* p_rsa; CODE: ! free_RSA_key(p_rsa); SV* --- 201,205 ---- rsaData* p_rsa; CODE: ! RSA_free(p_rsa->rsa); SV* *************** *** 255,259 **** CHECK_OPEN_SSL(stringBIO = BIO_new(BIO_s_mem())) PEM_write_bio_RSAPrivateKey( ! stringBIO, get_RSA_key(p_rsa), NULL, NULL, 0, NULL, NULL); RETVAL = extractBioString(stringBIO); --- 211,215 ---- CHECK_OPEN_SSL(stringBIO = BIO_new(BIO_s_mem())) PEM_write_bio_RSAPrivateKey( ! stringBIO, p_rsa->rsa, NULL, NULL, 0, NULL, NULL); RETVAL = extractBioString(stringBIO); *************** *** 268,272 **** CODE: CHECK_OPEN_SSL(stringBIO = BIO_new(BIO_s_mem())) ! PEM_write_bio_RSAPublicKey(stringBIO, get_RSA_key(p_rsa)); RETVAL = extractBioString(stringBIO); --- 224,228 ---- CODE: CHECK_OPEN_SSL(stringBIO = BIO_new(BIO_s_mem())) ! PEM_write_bio_RSAPublicKey(stringBIO, p_rsa->rsa); RETVAL = extractBioString(stringBIO); *************** *** 281,285 **** CODE: CHECK_OPEN_SSL(stringBIO = BIO_new(BIO_s_mem())) ! PEM_write_bio_RSA_PUBKEY(stringBIO, get_RSA_key(p_rsa)); RETVAL = extractBioString(stringBIO); --- 237,241 ---- CODE: CHECK_OPEN_SSL(stringBIO = BIO_new(BIO_s_mem())) ! PEM_write_bio_RSA_PUBKEY(stringBIO, p_rsa->rsa); RETVAL = extractBioString(stringBIO); *************** *** 396,400 **** { RSA* rsa; ! rsa = get_RSA_key(p_rsa); XPUSHs(bn2sv(rsa->n)); XPUSHs(bn2sv(rsa->e)); --- 352,356 ---- { RSA* rsa; ! rsa = p_rsa->rsa; XPUSHs(bn2sv(rsa->n)); XPUSHs(bn2sv(rsa->e)); *************** *** 423,427 **** plaintext = SvPV(plaintext_SV, plaintext_length); ! rsa = get_RSA_key(p_rsa); size = RSA_size(rsa); --- 379,383 ---- plaintext = SvPV(plaintext_SV, plaintext_length); ! rsa = p_rsa->rsa; size = RSA_size(rsa); *************** *** 433,437 **** ciphertext_length = RSA_public_encrypt( ! plaintext_length, plaintext, ciphertext, rsa, get_padding(p_rsa)); if (ciphertext_length < 0) --- 389,393 ---- ciphertext_length = RSA_public_encrypt( ! plaintext_length, plaintext, ciphertext, rsa, p_rsa->padding); if (ciphertext_length < 0) *************** *** 467,471 **** ciphertext = SvPV(ciphertext_SV, ciphertext_length); ! rsa = get_RSA_key(p_rsa); size = RSA_size(rsa); if (New(0, plaintext, size, char) == NULL) --- 423,427 ---- ciphertext = SvPV(ciphertext_SV, ciphertext_length); ! rsa = p_rsa->rsa; size = RSA_size(rsa); if (New(0, plaintext, size, char) == NULL) *************** *** 476,480 **** plaintext_length = RSA_private_decrypt( ! size, ciphertext, plaintext, rsa, get_padding(p_rsa)); if (plaintext_length < 0) --- 432,436 ---- plaintext_length = RSA_private_decrypt( ! size, ciphertext, plaintext, rsa, p_rsa->padding); if (plaintext_length < 0) *************** *** 494,498 **** rsaData* p_rsa; CODE: ! RETVAL = RSA_size(get_RSA_key(p_rsa)); OUTPUT: RETVAL --- 450,454 ---- rsaData* p_rsa; CODE: ! RETVAL = RSA_size(p_rsa->rsa); OUTPUT: RETVAL *************** *** 502,506 **** rsaData* p_rsa; CODE: ! RETVAL = RSA_check_key(get_RSA_key(p_rsa)); OUTPUT: RETVAL --- 458,462 ---- rsaData* p_rsa; CODE: ! RETVAL = RSA_check_key(p_rsa->rsa); OUTPUT: RETVAL *************** *** 537,541 **** rsaData* p_rsa; CODE: ! set_hash(p_rsa, NID_md5); void --- 493,497 ---- rsaData* p_rsa; CODE: ! p_rsa->hashMode = NID_md5; void *************** *** 543,547 **** rsaData* p_rsa; CODE: ! set_hash(p_rsa, NID_sha1); void --- 499,503 ---- rsaData* p_rsa; CODE: ! p_rsa->hashMode = NID_sha1; void *************** *** 549,553 **** rsaData* p_rsa; CODE: ! set_hash(p_rsa, NID_ripemd160); void --- 505,509 ---- rsaData* p_rsa; CODE: ! p_rsa->hashMode = NID_ripemd160; void *************** *** 555,559 **** rsaData* p_rsa; CODE: ! set_padding(p_rsa, RSA_NO_PADDING); void --- 511,515 ---- rsaData* p_rsa; CODE: ! p_rsa->padding = RSA_NO_PADDING; void *************** *** 561,565 **** rsaData* p_rsa; CODE: ! set_padding(p_rsa, RSA_PKCS1_PADDING); void --- 517,521 ---- rsaData* p_rsa; CODE: ! p_rsa->padding = RSA_PKCS1_PADDING; void *************** *** 567,571 **** rsaData* p_rsa; CODE: ! set_padding(p_rsa, RSA_PKCS1_OAEP_PADDING); void --- 523,527 ---- rsaData* p_rsa; CODE: ! p_rsa->padding = RSA_PKCS1_OAEP_PADDING; void *************** *** 573,577 **** rsaData* p_rsa; CODE: ! set_padding(p_rsa, RSA_SSLV23_PADDING); SV* --- 529,533 ---- rsaData* p_rsa; CODE: ! p_rsa->padding = RSA_SSLV23_PADDING; SV* *************** *** 583,587 **** char* digest; int signature_length; - int hash; RSA* rsa; CODE: --- 539,542 ---- *************** *** 591,595 **** } ! rsa = get_RSA_key(p_rsa); if (New(0, signature, RSA_size(rsa), char) == NULL) --- 546,550 ---- } ! rsa = p_rsa->rsa; if (New(0, signature, RSA_size(rsa), char) == NULL) *************** *** 599,607 **** } ! hash = get_hash(p_rsa); ! digest = get_message_digest(text_SV, hash); ! if (! RSA_sign(hash, digest, ! get_digest_length(hash), signature, &signature_length, --- 554,561 ---- } ! digest = get_message_digest(text_SV, p_rsa->hashMode); ! if (! RSA_sign(p_rsa->hashMode, digest, ! get_digest_length(p_rsa->hashMode), signature, &signature_length, *************** *** 629,633 **** RSA* rsa; int sig_length; - int hash; int result; --- 583,586 ---- *************** *** 638,642 **** sig = SvPV(sig_SV, sig_length); ! rsa = get_RSA_key(p_rsa); if (RSA_size(rsa) < sig_length) { --- 591,595 ---- sig = SvPV(sig_SV, sig_length); ! rsa = p_rsa->rsa; if (RSA_size(rsa) < sig_length) { *************** *** 644,651 **** } ! hash = get_hash(p_rsa); ! digest = get_message_digest(text_SV, hash); ! result = RSA_verify( ! hash, digest, get_digest_length(hash), sig, sig_length, rsa); Safefree(digest); switch(result) --- 597,607 ---- } ! digest = get_message_digest(text_SV, p_rsa->hashMode); ! result = RSA_verify(p_rsa->hashMode, ! digest, ! get_digest_length(p_rsa->hashMode), ! sig, ! sig_length, ! p_rsa->rsa); Safefree(digest); switch(result) |
