[macruby-changes] [5082] MacRuby/trunk/ext/openssl

[source_changes at macosforge.org]

Revision: 5082
          http://trac.macosforge.org/projects/ruby/changeset/5082
Author:   watson1978 at gmail.com
Date:     2010-12-27 06:16:40 -0800 (Mon, 27 Dec 2010)
Log Message:
-----------
Fixed the typo. had better use a rb_bstr_bytes.

Modified Paths:
--------------
    MacRuby/trunk/ext/openssl/ossl_cipher.c
    MacRuby/trunk/ext/openssl/ossl_pkey_rsa.c

Modified: MacRuby/trunk/ext/openssl/ossl_cipher.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_cipher.c	2010-12-26 01:53:07 UTC (rev 5081)
+++ MacRuby/trunk/ext/openssl/ossl_cipher.c	2010-12-27 14:16:40 UTC (rev 5082)
@@ -357,7 +357,7 @@
     GetCipher(self, ctx);
     str = rb_bstr_new();
     rb_bstr_resize(str, EVP_CIPHER_CTX_block_size(ctx));
-    if (!EVP_CipherFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), &out_len))
+    if (!EVP_CipherFinal_ex(ctx, (unsigned char *)rb_bstr_bytes(str), &out_len))
 	ossl_raise(eCipherError, NULL);
     assert(out_len <= RSTRING_LEN(str));
     rb_str_set_len(str, out_len);

Modified: MacRuby/trunk/ext/openssl/ossl_pkey_rsa.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_pkey_rsa.c	2010-12-26 01:53:07 UTC (rev 5081)
+++ MacRuby/trunk/ext/openssl/ossl_pkey_rsa.c	2010-12-27 14:16:40 UTC (rev 5082)
@@ -289,7 +289,7 @@
 	ossl_raise(eRSAError, NULL);
     str = rb_bstr_new();
     rb_bstr_resize(str, len);
-    p = (unsigned char *)RSTRING_PTR(str);
+    p = (unsigned char *)rb_bstr_bytes(str);
     if(i2d_func(pkey->pkey.rsa, &p) < 0)
 	ossl_raise(eRSAError, NULL);
     ossl_str_adjust(str, p);
@@ -345,7 +345,7 @@
     str = rb_bstr_new();
     rb_bstr_resize(str, ossl_rsa_buf_size(pkey));
     buf_len = RSA_public_decrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
-				 (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
+				 (unsigned char *)rb_bstr_bytes(str), pkey->pkey.rsa,
 				 pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
     rb_str_set_len(str, buf_len);
@@ -375,7 +375,7 @@
     str = rb_bstr_new();
     rb_bstr_resize(str, ossl_rsa_buf_size(pkey));
     buf_len = RSA_private_encrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
-				  (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
+				  (unsigned char *)rb_bstr_bytes(str), pkey->pkey.rsa,
 				  pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
     rb_str_set_len(str, buf_len);
@@ -406,7 +406,7 @@
     str = rb_bstr_new();
     rb_bstr_resize(str, ossl_rsa_buf_size(pkey));
     buf_len = RSA_private_decrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
-				  (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
+				  (unsigned char *)rb_bstr_bytes(str), pkey->pkey.rsa,
 				  pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
     rb_str_set_len(str, buf_len);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20101227/06f77228/attachment.html>