diff options
| author | Michal Rokos <m.rokos@sh.cvut.cz> | 2002-03-05 15:05:29 +0000 |
|---|---|---|
| committer | Michal Rokos <m.rokos@sh.cvut.cz> | 2002-03-05 15:05:29 +0000 |
| commit | 3c8abbf103555809d110c21f89de60869a4a6bea (patch) | |
| tree | 71beab86d7d0e6fc143a6d5c55a25cc2a75e0b6f /ossl_cipher.c | |
| parent | 59dd8c5696d83aff78c506d2a161ea4ffb404088 (diff) | |
| download | ruby-openssl-history-3c8abbf103555809d110c21f89de60869a4a6bea.tar.gz | |
* WARNING! All to_str methods are not used any longer (use to_text instead)
* made an aliases to_pem as to_s
* more relaxed params checking - everywhere where string was needed it is OK that obj implements to_s method
Diffstat (limited to 'ossl_cipher.c')
| -rw-r--r-- | ossl_cipher.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ossl_cipher.c b/ossl_cipher.c index 35cf886..14d6a14 100644 --- a/ossl_cipher.c +++ b/ossl_cipher.c @@ -116,7 +116,7 @@ ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self) rb_scan_args(argc, argv, "11", &pass, &init_v); - Check_Type(pass, T_STRING); + pass = rb_String(pass); if (NIL_P(init_v)) { /* @@ -131,7 +131,7 @@ ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self) } */ } else { - Check_Type(init_v, T_STRING); + init_v = rb_obj_as_string(init_v); memcpy(iv, RSTRING(init_v)->ptr, sizeof(iv)); } EVP_CIPHER_CTX_init(ciphp->ctx); @@ -157,7 +157,7 @@ ossl_cipher_decrypt(int argc, VALUE *argv, VALUE self) rb_scan_args(argc, argv, "11", &pass, &init_v); - Check_Type(pass, T_STRING); + pass = rb_String(pass); if (NIL_P(init_v)) { /* @@ -166,7 +166,7 @@ ossl_cipher_decrypt(int argc, VALUE *argv, VALUE self) */ memcpy(iv, "OpenSSL for Ruby rulez!", sizeof(iv)); } else { - Check_Type(init_v, T_STRING); + init_v = rb_obj_as_string(init_v); memcpy(iv, RSTRING(init_v)->ptr, sizeof(iv)); } EVP_CIPHER_CTX_init(ciphp->ctx); @@ -193,7 +193,7 @@ ossl_cipher_update(VALUE self, VALUE data) GetCipher(self, ciphp); - Check_Type(data, T_STRING); + data = rb_String(data); in = RSTRING(data)->ptr; in_len = RSTRING(data)->len; |