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_pkey_dsa.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_pkey_dsa.c')
| -rw-r--r-- | ossl_pkey_dsa.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ossl_pkey_dsa.c b/ossl_pkey_dsa.c index e62475c..03e2f59 100644 --- a/ossl_pkey_dsa.c +++ b/ossl_pkey_dsa.c @@ -124,10 +124,10 @@ ossl_dsa_s_new_from_pem(int argc, VALUE *argv, VALUE klass) rb_scan_args(argc, argv, "11", &buffer, &pass); - Check_Type(buffer, T_STRING); + buffer = rb_String(buffer); if (!NIL_P(pass)) { - Check_Type(pass, T_STRING); + pass = rb_String(pass); passwd = RSTRING(pass)->ptr; } /* else passwd = NULL; */ @@ -241,7 +241,7 @@ ossl_dsa_export(int argc, VALUE *argv, VALUE self) ciph = ossl_cipher_get_EVP_CIPHER(cipher); if (!NIL_P(password)) { - Check_Type(password, T_STRING); + password = rb_String(password); pass = RSTRING(password)->ptr; } } @@ -310,7 +310,7 @@ ossl_dsa_to_der(VALUE self) * Don't use :-)) (I's up to you) */ static VALUE -ossl_dsa_to_str(VALUE self) +ossl_dsa_to_text(VALUE self) { ossl_dsa *dsap = NULL; BIO *out = NULL; @@ -363,7 +363,7 @@ ossl_dsa_sign(VALUE self, VALUE data) VALUE str; GetDSA(self, dsap); - Check_Type(data, T_STRING); + data = rb_String(data); if (!DSA_PRIVATE(dsap->dsa)) { rb_raise(eDSAError, "Private DSA key needed!"); @@ -391,8 +391,8 @@ ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig) GetDSA(self, dsap); - Check_Type(digest, T_STRING); - Check_Type(sig, T_STRING); + digest = rb_String(digest); + sig = rb_String(sig); ret = DSA_verify(0, RSTRING(digest)->ptr, RSTRING(digest)->len,\ RSTRING(sig)->ptr, RSTRING(sig)->len, dsap->dsa); /*type = 0*/ @@ -421,7 +421,7 @@ Init_ossl_dsa(VALUE mPKey, VALUE cPKey, VALUE ePKeyError) rb_define_method(cDSA, "public?", ossl_dsa_is_public, 0); rb_define_method(cDSA, "private?", ossl_dsa_is_private, 0); - rb_define_method(cDSA, "to_str", ossl_dsa_to_str, 0); + rb_define_method(cDSA, "to_text", ossl_dsa_to_text, 0); rb_define_method(cDSA, "export", ossl_dsa_export, -1); rb_define_alias(cDSA, "to_pem", "export"); rb_define_method(cDSA, "public_key", ossl_dsa_to_public_key, 0); |