* 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

30 files changed, 191 insertions, 179 deletions

diff --git a/ChangeLog b/ChangeLog
index db14d3c..4268bf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@ Copyright (C) 2001 Michal Rokos <m.rokos@sh.cvut.cz>
 All rights reserved.
 
 $Log$
+Revision 1.33  2002/03/05 15:05:57  majkl
+	* 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
+
 Revision 1.32  2002/02/23 07:28:00  majkl
 	* More benevolent checks (Check_SafeStr(x) -> Check_Type(x, T_STRING)
 	  (where we don't care)
diff --git a/README b/README
index 4c2763c..a90d283 100644
--- a/README
+++ b/README
@@ -17,7 +17,7 @@ Hynek Rostinsky <hynek.rostinsky@foresta.cz> - Windows platform fixes (strptime
 = PKey:: RSA,DSA keys - new, load, export
 = X509::Certificate - generating new certs, load, looking inside
 = X509::CRL - load, new, looking inside
-= X509::Name - new, export to_str, to_a, to_h (hash)
+= X509::Name - new, export, to_a, to_h (hash)
 = X509::Revoked - new, looking inside (on parameters)
 = X509::Store - new, import trusted certs and CRL, verifiing certs
 = Digest::... - various hashes
@@ -105,10 +105,10 @@ OpenSSL::
 		.from_s_hex(sHEX)
 		--- PUBLIC -----------------------
 		.to_s(type="dec") => sDEC
-		.to_s_bin => sBIN
-		.to_s_mpi => sMPI
-		.to_s_dec => sDEC
-		.to_s_hex => sHEX
+		.to_s_bin() => sBIN
+		.to_s_mpi() => sMPI
+		.to_s_dec() => sDEC
+		.to_s_hex() => sHEX
 
 	BNError
 	
@@ -135,8 +135,8 @@ OpenSSL::
 		CipherError
 		
 	Config
-		.new(sFilename) - dispatches .load
-		.load(sFilename)
+		::new(sFilename) - dispatches .load
+		::load(sFilename)
 		----------------------------------
 		.get_value(sSection|nil, sKey) => sValue
 		.get_section(sSection) => hSection
@@ -153,35 +153,36 @@ OpenSSL::
 		SHA1
 		DSS
 		DSS1
-			.new([sData])
+			::new([sData])
 			----------------------------------
 			.update(sData) => self
 			.<< <=> .update
 			.digest() => sDigestFinal
 			.hexdigest() => sHEXDigestFinal
 			.inspect <=> .hexdigest
-			.to_str <=> .hexdigest
+			.to_s <=> .hexdigest
 			
 		DigestError
 
 	HMAC
-		.new(sKey, oDigest::ANY) => self
+		::new(sKey, oDigest::ANY) => self
 		----------------------------------
 		.update(sData) => self
 		.<< <=> .update
 		.hmac() => sHMACFinal
 		.hexhmac() => sHEXHMACFinal
 		.inspect <=> .hexhmac
-		.to_str <=> .hexhmac
+		.to_s <=> .hexhmac
 		
 	HMACError
 		
 	Netscape::
 		SPKI
-			.new([sPEM])
+			::new([sPEM])
 			----------------------------------
 			.to_pem() => sPEM
-			.to_str() => sHumanReadable
+			.to_s <=> .to_pem
+			.to_text() => sHumanReadable
 			.public_key() => oPKey::ANY
 			.public_key=(oPKey::ANY) => oPKey::ANY
 			.sign(oPKey::ANY, oDigest::ANY) => self
@@ -196,7 +197,7 @@ OpenSSL::
 			type:	SIGNED, ENVELOPED, SIGNED_ENVELOPED
 
 		PKCS7
-			.new(cType|sPEM)
+			::new(cType|sPEM)
 			----------------------------------
 			.cipher=(oCipher::ANY) => oCipher::ANY
 			.add_signer(oPKCS7::Signer, oPKey::ANY) => self
@@ -208,9 +209,10 @@ OpenSSL::
 			.verify_data(oX509::Store [, sDetachedData]) => bResult, yields PKCS7::Signer
 			.decode_data(oPKey::ANY, oX509::Certificate) => sData
 			.to_pem() => sPEM
+			.to_s <=> .to_pem
 
 		Signer
-			.new(oX509::Certificate, oPKey::ANY, oDigest::ANY)
+			::new(oX509::Certificate, oPKey::ANY, oDigest::ANY)
 			----------------------------------
 			.name() => X509::Name
 			.serial() => fSerial
@@ -229,23 +231,23 @@ OpenSSL::
 			----------------------------------
 			.public?() => bResult
 			.private?() => bResult
-			.to_str() => sHumanReadable
+			.to_text() => sHumanReadable
 			.export() => sPEM
 			.to_pem <=> .export
 			.public_key() => oPKey::ANY
 
 		DSA
-			.new([fKeyLen|sPEM [, sPassword]]) - dispatches .new_from_pem or .generate 
-			.new_from_pem(sPEM [, sPassword])
-			.generate(fKeyLen) - yields |p,n|
-			.new_from_fixnum <=> generate
+			::new([fKeyLen|sPEM [, sPassword]]) - dispatches .new_from_pem or .generate 
+			::new_from_pem(sPEM [, sPassword])
+			::generate(fKeyLen) - yields |p,n|
+			::new_from_fixnum <=> generate
 			----------------------------------
 			.public?() => bResult
 			.private?() => bResult
-			.to_str() => sHumanReadable
+			.to_text() => sHumanReadable
 			.export([oCipher::ANY [, sPassword]]) => sPEM
 			.to_pem <=> .export
-			.public_key() => oPKey::ANY
+			.public_key() => oPKey::DSA
 			.to_der() => sDER
 			.sign(oDigest::ANY, sData) => sSig
 			.sign_digest(sDigest) => sSig
@@ -255,14 +257,14 @@ OpenSSL::
 		DSAError
 			
 		RSA
-			.new([fKeyLen|sPEM [, sPassword]]) - dispatches .new_from_pem or .generate 
-			.new_from_pem(sPEM [, sPassword])
-			.generate(fKeyLen) - yields |p,n|
-			.new_from_fixnum <=> generate
+			::new([fKeyLen|sPEM [, sPassword]]) - dispatches .new_from_pem or .generate 
+			::new_from_pem(sPEM [, sPassword])
+			::generate(fKeyLen) - yields |p,n|
+			::new_from_fixnum <=> generate
 			----------------------------------
 			.public?() => bResult
 			.private?() => bResult
-			.to_str() => sHumanReadable
+			.to_text() => sHumanReadable
 			.export([oCipher::ANY [, sPassword]]) => sPEM
 			.to_pem <=> .export
 			.public_key() => oPKey::ANY
@@ -292,31 +294,33 @@ OpenSSL::
 		
 	X509::
 		Attribute
-			.new(arg) - dispatches "new_from_#{arg.type.name.downcase}"
-			.new_from_string("oid = value")
-			.new_from_array(["oid", "value"])
-			.new_from_hash({"oid"=>"oid", "value"=>"val"})
+			::new(arg) - dispatches "new_from_#{arg.type.name.downcase}"
+			::new_from_string("oid = value")
+			::new_from_array(["oid", "value"])
+			::new_from_hash({"oid"=>"oid", "value"=>"val"})
 			----------------------------------
 			
 		AttributeError
 		
 		Certificate - Doc TODO!
-		
+			.to_s <=> .to_pem
+			
 		CertificateError
 		
 		CRL - Doc TODO!
+			.to_s <=> .to_pem
 		
 		CRLError
 		
 		Extension - Doc TODO!
-			.new is DISABLED!
+			::new is DISABLED!
 			----------------------------------
-			.to_str => string as "oid = critical, value"
+			.to_s => string as "oid = critical, value"
 			.to_a => ary as ["oid", "value", critical], critical as bool
 			.to_h => hash as {"oid"=>"oid", "value"=>"val", "critical"=>bool}
 			
 		ExtensionFactory - Doc TODO!
-			.new(...)
+			::new(...)
 			----------------------------------
 			.create_extension(*arg)
 			.create_ext_from_string(str)
@@ -326,22 +330,32 @@ OpenSSL::
 		ExtensionError
 		
 		Name - Doc TODO!
-			.new(arg) dispatches "new_from_#{arg.type.name.downcase}"
-			.new_from_string(str) => self, str as "/A=B/C=D/E=F"
-			.new_from_array(ary) => self, ary as [["A","B"],["C","D"],["E","F"]]
-			.new_from_hash(hash) => self, hash as {"A"=>"B","C"=>"D","E"=>"F"}
+			::new(arg) dispatches "new_from_#{arg.type.name.downcase}"
+			::new_from_string(str) => self, str as "/A=B/C=D/E=F"
+			::new_from_array(ary) => self, ary as [["A","B"],["C","D"],["E","F"]]
+			::new_from_hash(hash) => self, hash as {"A"=>"B","C"=>"D","E"=>"F"}
 			----------------------------------
-			.to_str => str as "/A=B/C=D/E=F"
+			.to_s => str as "/A=B/C=D/E=F"
 			.to_a => ary as [["A","B"],["C","D"],["E","F"]]
 			.to_h => hash as {"A"=>"B","C"=>"D","E"=>"F"}
 		
 		NameError
 		
 		Request - Doc TODO!
+			.to_s <=> .to_pem
 
 		RequestError
 		
-		Revoked - Doc TODO!
+		Revoked
+			::new()
+			----------------------------------
+			serial() => nSerial
+			serial=(nSerial) => nSerial
+			time() => tRevoked
+			time=(tRevoked) => tRevoked
+			extensions() => Ary(X509::Extension)
+			extensions=(ary) => Ary(X509::Extension)
+			add_extension(oExtension) => oExtension
 
 		RevokedError
 		
diff --git a/lib/openssl.rb b/lib/openssl.rb
index 8baf452..d182220 100644
--- a/lib/openssl.rb
+++ b/lib/openssl.rb
@@ -156,7 +156,7 @@ end # defined? DH
       #
       # to_h is built-in method
       # 
-      def to_str # "/A=B/C=D/E=F"
+      def to_s # "/A=B/C=D/E=F"
         hash = self.to_h
 	str = ""
 	hash.keys.each do |key|
@@ -218,7 +218,7 @@ end # defined? DH
       #
       # to_a is built-in
       # 
-      def to_str # "oid = critical, value"
+      def to_s # "oid = critical, value"
         ary = self.to_a
 	str = ary[0] + " = "
 	str += "critical, " if ary[2] == true
diff --git a/lib/ssl.rb b/lib/ssl.rb
index a2af0db..1b0d4ca 100644
--- a/lib/ssl.rb
+++ b/lib/ssl.rb
@@ -2,7 +2,7 @@
 
   ssl.rb -- to support migrations from SSLSocket.
 
-  Copyright (C) 2001 GOTOU Yuuzou <gotoyuzo@notowrk.org>
+  Copyright (C) 2001-2002 GOTOU Yuuzou <gotoyuzo@notowrk.org>
 
   This program is licenced under the same licence as Ruby.
   (See the file 'LICENCE'.)
@@ -29,8 +29,7 @@ module SSL
   X509 = ::OpenSSL::X509::Certificate
   class X509
     alias serialNumber serial
-    alias inspect to_str
-    alias to_s to_pem
+    alias inspect to_pem
     def notBefore; not_before.to_s; end
     def notAfter; not_after.to_s; end
 
diff --git a/ossl_bn.c b/ossl_bn.c
index 4f548fc..0f39458 100644
--- a/ossl_bn.c
+++ b/ossl_bn.c
@@ -80,11 +80,11 @@ ossl_bn_s_new(int argc, VALUE *argv, VALUE klass)
 
 #define BIGNUM_FROM(func)								\
 	static VALUE									\
-	ossl_bn_from_##func(VALUE self, VALUE str)					\
+	ossl_bn_from_s_##func(VALUE self, VALUE str)					\
 	{										\
 		BIGNUM *bn = NULL;							\
 											\
-		Check_Type(str, T_STRING);						\
+		str = rb_String(str);							\
 											\
 		GetBN(self, bn);							\
 											\
@@ -98,11 +98,11 @@ BIGNUM_FROM(mpi);
 
 #define BIGNUM_FROM2(func)								\
 	static VALUE									\
-	ossl_bn_from_##func(VALUE self, VALUE str)					\
+	ossl_bn_from_s_##func(VALUE self, VALUE str)					\
 	{										\
 		BIGNUM *bn = NULL;							\
 											\
-		Check_Type(str, T_STRING);						\
+		str = rb_String(str);							\
 											\
 		GetBN(self, bn);							\
 											\
@@ -164,9 +164,9 @@ ossl_bn_to_mpi(VALUE self)
 	return str;
 }
 
-#define BIGNUM_TO_STR(func)								\
+#define BIGNUM_TO_S(func)								\
 	static VALUE									\
-	ossl_bn_to_##func(VALUE self)							\
+	ossl_bn_to_s_##func(VALUE self)							\
 	{										\
 		BIGNUM *bn = NULL;							\
 		char *txt = NULL;							\
@@ -669,15 +669,15 @@ Init_bn(VALUE module)
 
 	rb_define_singleton_method(cBN, "new", ossl_bn_s_new, -1);
 	
-	rb_define_private_method(cBN, "from_s_bin", ossl_bn_from_bin, 1);
-	rb_define_private_method(cBN, "from_s_mpi", ossl_bn_from_mpi, 1);
-	rb_define_private_method(cBN, "from_s_dec", ossl_bn_from_dec, 1);
-	rb_define_private_method(cBN, "from_s_hex", ossl_bn_from_hex, 1);
+	rb_define_private_method(cBN, "from_s_bin", ossl_bn_from_s_bin, 1);
+	rb_define_private_method(cBN, "from_s_mpi", ossl_bn_from_s_mpi, 1);
+	rb_define_private_method(cBN, "from_s_dec", ossl_bn_from_s_dec, 1);
+	rb_define_private_method(cBN, "from_s_hex", ossl_bn_from_s_hex, 1);
 	
-	rb_define_method(cBN, "to_s_bin", ossl_bn_to_bin, 0);
-	rb_define_method(cBN, "to_s_mpi", ossl_bn_to_mpi, 0);
-	rb_define_method(cBN, "to_s_dec", ossl_bn_to_dec, 0);
-	rb_define_method(cBN, "to_s_hex", ossl_bn_to_hex, 0);
+	rb_define_method(cBN, "to_s_bin", ossl_bn_to_s_bin, 0);
+	rb_define_method(cBN, "to_s_mpi", ossl_bn_to_s_mpi, 0);
+	rb_define_method(cBN, "to_s_dec", ossl_bn_to_s_dec, 0);
+	rb_define_method(cBN, "to_s_hex", ossl_bn_to_s_hex, 0);
 
 	rb_define_method(cBN, "zero?", ossl_bn_is_zero, 0);
 	rb_define_method(cBN, "one?", ossl_bn_is_one, 0);
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;
 	
diff --git a/ossl_config.c b/ossl_config.c
index bce24f4..a559d97 100644
--- a/ossl_config.c
+++ b/ossl_config.c
@@ -85,10 +85,10 @@ ossl_config_get_value(VALUE self, VALUE section, VALUE item)
 	GetConfig(self, confp);
 	
 	if (!NIL_P(section)) {
-		Check_Type(section, T_STRING);
+		section = rb_String(section);
 		sect = RSTRING(section)->ptr;
 	}
-	Check_Type(item, T_STRING);
+	item = rb_String(item);
 
 	if (!(str = CONF_get_string(confp->config, sect, RSTRING(item)->ptr))) {
 		OSSL_Raise(eConfigError, "");
@@ -109,7 +109,7 @@ ossl_config_get_section(VALUE self, VALUE section)
 
 	GetConfig(self, confp);
 	
-	Check_Type(section, T_STRING);
+	section = rb_String(section);
 	
 	if (!(sk = CONF_get_section(confp->config, RSTRING(section)->ptr))) {
 		OSSL_Raise(eConfigError, "");
diff --git a/ossl_digest.c b/ossl_digest.c
index 79ca0bd..c77f432 100644
--- a/ossl_digest.c
+++ b/ossl_digest.c
@@ -89,7 +89,7 @@ ossl_digest_update(VALUE self, VALUE data)
 
 	GetDigest(self, digestp);
 
-	Check_Type(data, T_STRING);
+	data = rb_String(data);
 
 	EVP_DigestUpdate(digestp->md, RSTRING(data)->ptr, RSTRING(data)->len);
 
@@ -209,7 +209,7 @@ ossl_digest_hexdigest(VALUE self)
 		EVP_DigestInit(digestp->md, EVP_##dgst());					\
 												\
 		if (rb_scan_args(argc, argv, "01", &data) == 1) {				\
-			Check_Type(data, T_STRING);						\
+			data = rb_String(data);							\
 			EVP_DigestUpdate(digestp->md, RSTRING(data)->ptr, RSTRING(data)->len);	\
 		}										\
 		return self;									\
diff --git a/ossl_hmac.c b/ossl_hmac.c
index 8bb5aec..e49072b 100644
--- a/ossl_hmac.c
+++ b/ossl_hmac.c
@@ -70,7 +70,7 @@ ossl_hmac_initialize(int argc, VALUE *argv, VALUE self)
 
 	rb_scan_args(argc, argv, "20", &key, &digest);
 
-	Check_Type(key, T_STRING);
+	key = rb_String(key);
 	md = ossl_digest_get_EVP_MD(digest);
 
 	if (!(hmacp->hmac = OPENSSL_malloc(sizeof(HMAC_CTX)))) {
@@ -88,7 +88,7 @@ ossl_hmac_update(VALUE self, VALUE data)
 
 	GetHMAC(self, hmacp);
 
-	Check_Type(data, T_STRING);
+	data = rb_String(data);
 
 	HMAC_Update(hmacp->hmac, RSTRING(data)->ptr, RSTRING(data)->len);
 
@@ -174,7 +174,7 @@ Init_hmac(VALUE module)
 	rb_define_method(cHMAC, "hmac", ossl_hmac_hmac, 0);
 	rb_define_method(cHMAC, "hexhmac", ossl_hmac_hexhmac, 0);
 	rb_define_alias(cHMAC, "inspect", "hexhmac");
-	rb_define_alias(cHMAC, "to_str", "hexhmac");
+	rb_define_alias(cHMAC, "to_s", "hexhmac");
 }
 
 #else /* NO_HMAC */
diff --git a/ossl_ns_spki.c b/ossl_ns_spki.c
index 4a99619..f77ac0e 100644
--- a/ossl_ns_spki.c
+++ b/ossl_ns_spki.c
@@ -72,11 +72,9 @@ ossl_spki_initialize(int argc, VALUE *argv, VALUE self)
 		case T_NIL:
 			spki = NETSCAPE_SPKI_new();
 			break;
-		case T_STRING:
-			spki = NETSCAPE_SPKI_b64_decode(RSTRING(buffer)->ptr, -1);
-			break;
 		default:
-			rb_raise(rb_eTypeError, "unsupported type");
+			buffer = rb_String(buffer);
+			spki = NETSCAPE_SPKI_b64_decode(RSTRING(buffer)->ptr, -1);
 	}
 	if (!spki)
 		OSSL_Raise(eSPKIError, "");
@@ -106,7 +104,7 @@ ossl_spki_to_pem(VALUE self)
 }
 
 static VALUE
-ossl_spki_to_str(VALUE self)
+ossl_spki_to_text(VALUE self)
 {
 	ossl_spki *spkip = NULL;
 	BIO *out = NULL;
@@ -181,7 +179,7 @@ ossl_spki_set_challenge(VALUE self, VALUE str)
 	ossl_spki *spkip = NULL;
 
 	GetSPKI(self, spkip);
-	Check_Type(str, T_STRING);
+	str = rb_String(str);
 
 	if (!ASN1_STRING_set(spkip->spki->spkac->challenge, RSTRING(str)->ptr, RSTRING(str)->len)) {
 		OSSL_Raise(eSPKIError, "");
@@ -251,7 +249,8 @@ Init_ossl_spki(VALUE module)
 	rb_define_singleton_method(cSPKI, "new", ossl_spki_s_new, -1);
 	rb_define_method(cSPKI, "initialize", ossl_spki_initialize, -1);
 	rb_define_method(cSPKI, "to_pem", ossl_spki_to_pem, 0);
-	rb_define_method(cSPKI, "to_str", ossl_spki_to_str, 0);
+	rb_define_alias(cSPKI, "to_s", "to_pem");
+	rb_define_method(cSPKI, "to_text", ossl_spki_to_text, 0);
 	rb_define_method(cSPKI, "public_key", ossl_spki_get_public_key, 0);
 	rb_define_method(cSPKI, "public_key=", ossl_spki_set_public_key, 1);
 	rb_define_method(cSPKI, "sign", ossl_spki_sign, 2);
diff --git a/ossl_pkcs7.c b/ossl_pkcs7.c
index 6345bac..93c748b 100644
--- a/ossl_pkcs7.c
+++ b/ossl_pkcs7.c
@@ -131,7 +131,7 @@ static VALUE ossl_pkcs7_s_sign(VALUE klass, VALUE key, VALUE cert, VALUE data)
 	
 	OSSL_Check_Type(key, cPKey);
 	OSSL_Check_Type(cert, X509Certificate);
-	Check_Type(data, T_STRING);
+	data = rb_String(data);
 
 	if (rb_funcall(key, rb_intern("private?"), 0, NULL) != Qtrue) {
 		rb_raise(ePKCS7Error, "private key needed!");
@@ -186,7 +186,7 @@ ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
 	GetPKCS7_unsafe(self, p7p);
 
 	rb_scan_args(argc, argv, "10", &arg1);
-	
+
 	switch (TYPE(arg1)) {
 		case T_FIXNUM:
 			if (!(p7 = PKCS7_new())) {
@@ -197,7 +197,8 @@ ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
 				OSSL_Raise(ePKCS7Error, "");
 			}
 			break;
-		case T_STRING:
+		default:
+			arg1 = rb_String(arg1);
 			if (!(in = BIO_new_mem_buf(RSTRING(arg1)->ptr, RSTRING(arg1)->len))) {
 				OSSL_Raise(ePKCS7Error, "");
 			}
@@ -206,9 +207,6 @@ ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
 				OSSL_Raise(ePKCS7Error, "");
 			}
 			BIO_free(in);
-			break;
-		default:
-			rb_raise(ePKCS7Error, "unsupported param (%s)", rb_class2name(CLASS_OF(arg1)));
 	}
 	p7p->pkcs7 = p7;
 
@@ -373,7 +371,7 @@ ossl_pkcs7_add_data(int argc, VALUE *argv, VALUE self)
 
 	rb_scan_args(argc, argv, "11", &data, &detach);
 	
-	Check_Type(data, T_STRING);
+	data = rb_String(data);
 
 	PKCS7_content_new(p7p->pkcs7, NID_pkcs7_data);
 
@@ -420,7 +418,7 @@ ossl_pkcs7_data_verify(int argc, VALUE *argv, VALUE self)
 	store = ossl_x509store_get_X509_STORE(x509store);
 	
 	if (!NIL_P(detached)) {
-		Check_Type(detached, T_STRING);
+		detached = rb_String(detached);
 		if (!(data = BIO_new_mem_buf(RSTRING(detached)->ptr, RSTRING(detached)->len))) {
 			OSSL_Raise(ePKCS7Error, "");
 		}
@@ -652,6 +650,7 @@ Init_pkcs7(VALUE module)
 	rb_define_method(cPKCS7, "verify_data", ossl_pkcs7_data_verify, -1);
 	rb_define_method(cPKCS7, "decode_data", ossl_pkcs7_data_decode, 2);
 	rb_define_method(cPKCS7, "to_pem", ossl_pkcs7_to_pem, 0);
+	rb_define_alias(cPKCS7, "to_s", "to_pem");
 	
 #define DefPKCS7Const(x) rb_define_const(module, #x, INT2FIX(x))
 
diff --git a/ossl_pkey_dh.c b/ossl_pkey_dh.c
index 87db5c8..9c19ec5 100644
--- a/ossl_pkey_dh.c
+++ b/ossl_pkey_dh.c
@@ -122,7 +122,7 @@ ossl_dh_s_new_from_pem(VALUE klass, VALUE buffer)
 	BIO *in = NULL;
 	VALUE obj;
 	
-	Check_Type(buffer, T_STRING);
+	buffer = rb_String(buffer);
 	
 	if (!(in = BIO_new_mem_buf(RSTRING(buffer)->ptr, RSTRING(buffer)->len)))
 		OSSL_Raise(eDHError, "");
@@ -237,7 +237,7 @@ ossl_dh_export(VALUE self)
  * Don't use :-)) (I's up to you)
  */
 static VALUE
-ossl_dh_to_str(VALUE self)
+ossl_dh_to_text(VALUE self)
 {
 	ossl_dh *dhp = NULL;
 	BIO *out = NULL;
@@ -297,7 +297,7 @@ Init_ossl_dh(VALUE mPKey, VALUE cPKey, VALUE ePKeyError)
 
 	rb_define_method(cDH, "public?", ossl_dh_is_public, 0);
 	rb_define_method(cDH, "private?", ossl_dh_is_private, 0);
-	rb_define_method(cDH, "to_str", ossl_dh_to_str, 0);
+	rb_define_method(cDH, "to_text", ossl_dh_to_text, 0);
 	rb_define_method(cDH, "export", ossl_dh_export, 0);
 	rb_define_alias(cDH, "to_pem", "export");
 	rb_define_method(cDH, "public_key", ossl_dh_to_public_key, 0);
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);
diff --git a/ossl_pkey_rsa.c b/ossl_pkey_rsa.c
index 85011e8..01dc3a8 100644
--- a/ossl_pkey_rsa.c
+++ b/ossl_pkey_rsa.c
@@ -125,10 +125,10 @@ ossl_rsa_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; */
@@ -221,19 +221,19 @@ ossl_rsa_export(int argc, VALUE *argv, VALUE self)
 	BIO *out = NULL;
 	BUF_MEM *buf = NULL;
 	const EVP_CIPHER *ciph = NULL;
-	char *pass = NULL;
-	VALUE cipher, password, str;
+	char *passwd = NULL;
+	VALUE cipher, pass, str;
 
 	GetRSA(self, rsap);
 
-	rb_scan_args(argc, argv, "02", &cipher, &password);
+	rb_scan_args(argc, argv, "02", &cipher, &pass);
 
 	if (!NIL_P(cipher)) {
 		ciph = ossl_cipher_get_EVP_CIPHER(cipher);
 		
-		if (!NIL_P(password)) {
-			Check_Type(password, T_STRING);
-			pass = RSTRING(password)->ptr;
+		if (!NIL_P(pass)) {
+			pass = rb_String(pass);
+			passwd = RSTRING(pass)->ptr;
 		}
 	}
 	if (!(out = BIO_new(BIO_s_mem()))) {
@@ -241,7 +241,7 @@ ossl_rsa_export(int argc, VALUE *argv, VALUE self)
 	}
 	
 	if (RSA_PRIVATE(rsap->rsa)) {
-		if (!PEM_write_bio_RSAPrivateKey(out, rsap->rsa, ciph, NULL, 0, NULL, pass)) {
+		if (!PEM_write_bio_RSAPrivateKey(out, rsap->rsa, ciph, NULL, 0, NULL, passwd)) {
 			BIO_free(out);
 			OSSL_Raise(eRSAError, "");
 		}
@@ -269,7 +269,7 @@ ossl_rsa_public_encrypt(VALUE self, VALUE buffer)
 	
 	GetRSA(self, rsap);
 
-	Check_Type(buffer, T_STRING);
+	buffer = rb_String(buffer);
 	
 	size = RSA_size(rsap->rsa);
 	
@@ -296,7 +296,7 @@ ossl_rsa_public_decrypt(VALUE self, VALUE buffer)
 
 	GetRSA(self, rsap);
 
-	Check_Type(buffer, T_STRING);
+	buffer = rb_String(buffer);
 	
 	size = RSA_size(rsap->rsa);
 	
@@ -327,7 +327,7 @@ ossl_rsa_private_encrypt(VALUE self, VALUE buffer)
 		rb_raise(eRSAError, "PRIVATE key needed for this operation!");
 	}
 	
-	Check_Type(buffer, T_STRING);
+	buffer = rb_String(buffer);
 	
 	size = RSA_size(rsap->rsa);
 	
@@ -358,7 +358,7 @@ ossl_rsa_private_decrypt(VALUE self, VALUE buffer)
 		rb_raise(eRSAError, "Private RSA key needed!");
 	}
 	
-	Check_Type(buffer, T_STRING);
+	buffer = rb_String(buffer);
 	
 	size = RSA_size(rsap->rsa);
 
@@ -448,7 +448,7 @@ ossl_rsa_to_der(VALUE self)
  * Don't use :-)) (I's up to you)
  */
 static VALUE
-ossl_rsa_to_str(VALUE self)
+ossl_rsa_to_text(VALUE self)
 {
 	ossl_rsa *rsap = NULL;
 	BIO *out = NULL;
@@ -507,7 +507,7 @@ ossl_rsa_sign(VALUE self, VALUE digest, VALUE text)
 
 	GetRSA(self, rsap);
 	OSSL_Check_type(digest, cDigest);
-	Check_Type(text, T_STRING);
+	text = rb_String(text);
 
 	if (!(sign = OPENSSL_malloc(RSA_size(rsap->rsa)+16))) {
 		OSSL_Raise(eRSAError, "");
@@ -548,7 +548,7 @@ Init_ossl_rsa(VALUE mPKey, VALUE cPKey, VALUE ePKeyError)
 	rb_define_alias(CLASS_OF(cRSA), "new_from_fixnum", "generate");
 	rb_define_method(cRSA, "public?", ossl_rsa_is_public, 0);
 	rb_define_method(cRSA, "private?", ossl_rsa_is_private, 0);
-	rb_define_method(cRSA, "to_str", ossl_rsa_to_str, 0);
+	rb_define_method(cRSA, "to_text", ossl_rsa_to_text, 0);
 	rb_define_method(cRSA, "export", ossl_rsa_export, -1);
 	rb_define_alias(cRSA, "to_pem", "export");
 	rb_define_method(cRSA, "public_key", ossl_rsa_to_public_key, 0);
diff --git a/ossl_rand.c b/ossl_rand.c
index f5be630..e149fbd 100644
--- a/ossl_rand.c
+++ b/ossl_rand.c
@@ -29,7 +29,7 @@ VALUE eRandomError;
 static VALUE
 ossl_rand_seed(VALUE self, VALUE str)
 {
-	Check_Type(str, T_STRING);
+	str = rb_obj_as_string(str);
 	RAND_seed(RSTRING(str)->ptr, RSTRING(str)->len);
 
 	return str;
@@ -38,7 +38,9 @@ ossl_rand_seed(VALUE self, VALUE str)
 static VALUE
 ossl_rand_load_file(VALUE self, VALUE filename)
 {
+	filename = rb_str_to_str(filename);
 	Check_SafeStr(filename);
+	
 	if(!RAND_load_file(RSTRING(filename)->ptr, -1)) {
 		OSSL_Raise(eRandomError, "");
 	}
@@ -49,7 +51,9 @@ ossl_rand_load_file(VALUE self, VALUE filename)
 static VALUE
 ossl_rand_write_file(VALUE self, VALUE filename)
 {
+	filename = rb_str_to_str(filename);
 	Check_SafeStr(filename);
+	
 	if (RAND_write_file(RSTRING(filename)->ptr) == -1) {
 		OSSL_Raise(eRandomError, "");
 	}
diff --git a/ossl_ssl.c b/ossl_ssl.c
index 9a7efe3..de0bbb4 100644
--- a/ossl_ssl.c
+++ b/ossl_ssl.c
@@ -388,8 +388,7 @@ ssl_write(VALUE self, VALUE str)
 	FILE *fp;
 
 	Data_Get_Struct(self, ssl_st, p);
-	if(TYPE(str) != T_STRING)
-        str = rb_obj_as_string(str);
+        str = rb_String(str);
 
 	if (p->ssl) {
 		nwrite = SSL_write(p->ssl, RSTRING(str)->ptr, RSTRING(str)->len);
@@ -533,20 +532,18 @@ ssl_set_ciphers(VALUE self, VALUE v)
         return Qnil;
     }
 
-    if(TYPE(v) == T_STRING) str = v;
-    else if(TYPE(v) == T_ARRAY){
-        str = rb_str_new2("");
-        for(i = 0; i < RARRAY(v)->len; i++){
-            elem = rb_ary_entry(v, i);
-            if(TYPE(elem) == T_ARRAY) elem = rb_ary_entry(elem, 0);
-            elem = rb_obj_as_string(elem);
-            rb_str_append(str, elem);
-            if(i < RARRAY(v)->len-1) rb_str_cat2(str, ":");
-        }
-    }
-    else str = rb_obj_as_string(v);
+	if (TYPE(v) == T_ARRAY) {
+		str = rb_str_new2("");
+		for (i = 0; i < RARRAY(v)->len; i++) {
+			elem = rb_ary_entry(v, i);
+			if (TYPE(elem) == T_ARRAY) elem = rb_ary_entry(elem, 0);
+			elem = rb_String(elem);
+			rb_str_append(str, elem);
+			if (i < RARRAY(v)->len-1) rb_str_cat2(str, ":");
+		}
+	} else str = rb_String(v);
 
-	if(!SSL_CTX_set_cipher_list(p->ctx, RSTRING(str)->ptr)) {
+	if (!SSL_CTX_set_cipher_list(p->ctx, RSTRING(str)->ptr)) {
 		OSSL_Raise(eSSLError, "SSL_CTX_set_ciphers:");
 	}
 	return Qnil;
diff --git a/ossl_x509.c b/ossl_x509.c
index e2034e1..af97234 100644
--- a/ossl_x509.c
+++ b/ossl_x509.c
@@ -140,17 +140,13 @@ ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
 		case T_NIL:
 			x509 = X509_new();
 			break;
-			
-		case T_STRING:
+		default:
+			buffer = rb_String(buffer);
 			if (!(in = BIO_new_mem_buf(RSTRING(buffer)->ptr, RSTRING(buffer)->len))) {
 				OSSL_Raise(eX509CertificateError, "");
 			}
 			x509 = PEM_read_bio_X509(in, NULL, NULL, NULL);
 			BIO_free(in);
-			break;
-			
-		default:
-			rb_raise(rb_eTypeError, "unsupported type");
 	}
 	
 	if (!x509)
@@ -210,7 +206,7 @@ ossl_x509_to_pem(VALUE self)
 }
 
 static VALUE
-ossl_x509_to_str(VALUE self)
+ossl_x509_to_text(VALUE self)
 {
 	ossl_x509 *x509p = NULL;
 	BIO *out = NULL;
@@ -682,7 +678,8 @@ Init_ossl_x509(VALUE module)
 	rb_define_method(cX509Certificate, "initialize", ossl_x509_initialize, -1);
 	rb_define_method(cX509Certificate, "to_der", ossl_x509_to_der, 0);
 	rb_define_method(cX509Certificate, "to_pem", ossl_x509_to_pem, 0);
-	rb_define_method(cX509Certificate, "to_str", ossl_x509_to_str, 0);
+	rb_define_alias(cX509Certificate, "to_s", "to_pem");
+	rb_define_method(cX509Certificate, "to_text", ossl_x509_to_text, 0);
 	rb_define_method(cX509Certificate, "version", ossl_x509_get_version, 0);
 	rb_define_method(cX509Certificate, "version=", ossl_x509_set_version, 1);
 	rb_define_method(cX509Certificate, "serial", ossl_x509_get_serial, 0);
diff --git a/ossl_x509attr.c b/ossl_x509attr.c
index c1d982d..66f5a55 100644
--- a/ossl_x509attr.c
+++ b/ossl_x509attr.c
@@ -100,14 +100,14 @@ ossl_x509attr_s_new_from_array(VALUE klass, VALUE ary)
 
 	/* key [0] */
 	item = RARRAY(ary)->ptr[0];
-	Check_Type(item, T_STRING);
+	item = rb_String(item);
 	if (!(nid = OBJ_ln2nid(RSTRING(item)->ptr)))
 		if (!(nid = OBJ_sn2nid(RSTRING(item)->ptr)))
 			OSSL_Raise(eX509AttributeError, "");
 
 	/* data [1] */
 	item = RARRAY(ary)->ptr[1];
-	Check_Type(item, T_STRING);
+	item = rb_String(item);
 
 	if (!(attr = X509_ATTRIBUTE_create(nid, MBSTRING_ASC, RSTRING(item)->ptr)))
 		OSSL_Raise(eX509AttributeError, "");
diff --git a/ossl_x509crl.c b/ossl_x509crl.c
index c76ca5a..f001053 100644
--- a/ossl_x509crl.c
+++ b/ossl_x509crl.c
@@ -94,15 +94,13 @@ ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
 		case T_NIL:
 			crl = X509_CRL_new();
 			break;
-		case T_STRING:
+		default:
+			buffer = rb_String(buffer);
 			if (!(in = BIO_new_mem_buf(RSTRING(buffer)->ptr, -1))) {
 				OSSL_Raise(eX509CRLError, "");
 			}
 			crl = PEM_read_bio_X509_CRL(in, NULL, NULL, NULL);
 			BIO_free(in);
-			break;
-		default:
-			rb_raise(rb_eTypeError, "unsupported type");
 	}
 	if (!crl)
 		OSSL_Raise(eX509CRLError, "");
@@ -385,7 +383,7 @@ ossl_x509crl_to_pem(VALUE self)
 }
 
 static VALUE 
-ossl_x509crl_to_str(VALUE self)
+ossl_x509crl_to_text(VALUE self)
 {
 	ossl_x509crl *crlp = NULL;
 	BIO *out = NULL;
@@ -514,7 +512,8 @@ Init_ossl_x509crl(VALUE module)
 	rb_define_method(cX509CRL, "sign", ossl_x509crl_sign, 1);
 	rb_define_method(cX509CRL, "verify", ossl_x509crl_verify, 1);
 	rb_define_method(cX509CRL, "to_pem", ossl_x509crl_to_pem, 0);
-	rb_define_method(cX509CRL, "to_str", ossl_x509crl_to_str, 0);
+	rb_define_alias(cX509CRL, "to_s", "to_pem");
+	rb_define_method(cX509CRL, "to_text", ossl_x509crl_to_text, 0);
 	rb_define_method(cX509CRL, "extensions", ossl_x509crl_get_extensions, 0);
 	rb_define_method(cX509CRL, "extensions=", ossl_x509crl_set_extensions, 1);
 	rb_define_method(cX509CRL, "add_extension", ossl_x509crl_add_extension, 1);
diff --git a/ossl_x509ext.c b/ossl_x509ext.c
index 491481d..484331d 100644
--- a/ossl_x509ext.c
+++ b/ossl_x509ext.c
@@ -223,7 +223,7 @@ ossl_x509extfactory_create_ext_from_array(VALUE self, VALUE ary)
 
 	/* key [0] */
 	item = RARRAY(ary)->ptr[0];
-	Check_Type(item, T_STRING);
+	item = rb_String(item);
 	if (!(nid = OBJ_ln2nid(RSTRING(item)->ptr)))
 		if (!(nid = OBJ_sn2nid(RSTRING(item)->ptr))) {
 			OSSL_Raise(eX509ExtensionError, "");
@@ -231,7 +231,7 @@ ossl_x509extfactory_create_ext_from_array(VALUE self, VALUE ary)
 
 	/* data [1] */
 	item = RARRAY(ary)->ptr[1];
-	Check_Type(item, T_STRING);
+	item = rb_String(item);
 
 	/* (optional) critical [2] */
 	if (RARRAY(ary)->len == 3 && RARRAY(ary)->ptr[2] == Qtrue) {
diff --git a/ossl_x509name.c b/ossl_x509name.c
index cd68834..d64b74f 100644
--- a/ossl_x509name.c
+++ b/ossl_x509name.c
@@ -88,8 +88,8 @@ ossl_x509name_hash_i(VALUE key, VALUE value, X509_NAME *name)
 {
 	int id, type;
 	
-	Check_Type(key, T_STRING);
-	Check_Type(value, T_STRING);
+	key = rb_String(key);
+	value = rb_String(value);
 	
 	if (!(id = OBJ_ln2nid(RSTRING(key)->ptr)))
 		if (!(id = OBJ_sn2nid(RSTRING(key)->ptr))) {
diff --git a/ossl_x509req.c b/ossl_x509req.c
index 285ff98..04ca6c0 100644
--- a/ossl_x509req.c
+++ b/ossl_x509req.c
@@ -115,15 +115,13 @@ ossl_x509req_initialize(int argc, VALUE *argv, VALUE self)
 		case T_NIL:
 			req = X509_REQ_new();
 			break;
-		case T_STRING:
+		default:
+			buffer = rb_String(buffer);
 			if (!(in = BIO_new_mem_buf(RSTRING(buffer)->ptr, -1))) {
 				OSSL_Raise(eX509RequestError, "");
 			}
 			req = PEM_read_bio_X509_REQ(in, NULL, NULL, NULL);
 			BIO_free(in);
-			break;
-		default:
-			rb_raise(rb_eTypeError, "unsupported type");
 	}
 	if (!req)
 		OSSL_Raise(eX509RequestError, "");
@@ -158,7 +156,7 @@ ossl_x509req_to_pem(VALUE self)
 }
 
 static VALUE 
-ossl_x509req_to_str(VALUE self)
+ossl_x509req_to_text(VALUE self)
 {
 	ossl_x509req *reqp = NULL;
 	BIO *out = NULL;
@@ -442,7 +440,8 @@ Init_ossl_x509req(VALUE module)
 	rb_define_singleton_method(cX509Request, "new", ossl_x509req_s_new, -1);
 	rb_define_method(cX509Request, "initialize", ossl_x509req_initialize, -1);
 	rb_define_method(cX509Request, "to_pem", ossl_x509req_to_pem, 0);
-	rb_define_method(cX509Request, "to_str", ossl_x509req_to_str, 0);
+	rb_define_alias(cX509Request, "to_s", "to_pem");
+	rb_define_method(cX509Request, "to_text", ossl_x509req_to_text, 0);
 	rb_define_method(cX509Request, "version", ossl_x509req_get_version, 0);
 	rb_define_method(cX509Request, "version=", ossl_x509req_set_version, 1);
 	rb_define_method(cX509Request, "subject", ossl_x509req_get_subject, 0);
diff --git a/ossl_x509revoked.c b/ossl_x509revoked.c
index be07ed6..efe532e 100644
--- a/ossl_x509revoked.c
+++ b/ossl_x509revoked.c
@@ -225,7 +225,7 @@ ossl_x509revoked_set_extensions(VALUE self, VALUE ary)
 	return ary;
 }
 
-static VALUE 
+static VALUE
 ossl_x509revoked_add_extension(VALUE self, VALUE ext)
 {
 	ossl_x509revoked *revp = NULL;
diff --git a/test/ossl_rsa.rb b/test/ossl_rsa.rb
index 1ab9cd1..266cece 100755
--- a/test/ossl_rsa.rb
+++ b/test/ossl_rsa.rb
@@ -11,9 +11,9 @@ p pub = RSA.new(File.open("./01pub.pem").read)
 p pub.private?
 puts exp = priv.export(DES.new(EDE3, CBC), "password")
 p priv2 = RSA.new(exp, "password")
-p priv.to_str == priv2.to_str
+p priv.to_text == priv2.to_text
 #puts priv.to_pem
-#puts pub.to_str
-#puts priv.to_str
+#puts pub.to_text
+#puts priv.to_text
 #puts pub.export
 
diff --git a/test/ossl_x509.rb b/test/ossl_x509.rb
index 1c65217..2feb780 100755
--- a/test/ossl_x509.rb
+++ b/test/ossl_x509.rb
@@ -11,7 +11,7 @@ p x509 = Certificate.new(File.open("./01cert.pem").read)
 #puts "Version = #{x509.version}"
 #p Name.new
 #p subject = x509.subject
-#p subject.to_str
+#p subject.to_s
 #p issuer = x509.issuer
 #p issuer.to_pem
 #p ary = issuer.to_a
@@ -23,15 +23,15 @@ p x509 = Certificate.new(File.open("./01cert.pem").read)
 #p x509.not_after
 #p k = x509.public_key
 #p k.private?
-#puts k.to_str
+#puts k.to_text
 #p priv = RSA.new(File.open("./01key.pem").read, "pejs8nek")
 #p priv.private?
 #p x509.public_key = priv
-#puts x509.public_key.to_str
-#p x509.issuer.to_str
+#puts x509.public_key.to_text
+#p x509.issuer.to_s
 #p x509.sign(priv,MD5.new)
-#p x509.issuer.to_str
-#puts x509.to_str
+#p x509.issuer.to_s
+#puts x509.to_text
 #x509.extensions.each_with_index {|e, i| p e.to_a}
 #puts "----end----"
 
@@ -41,7 +41,7 @@ name = [['C', 'CZ'],['O','Rokos'],['CN','pokusXXX']]
 #p n = Name.new(name)
 #p n.to_h
 #p n.to_a
-#p n.to_str
+#p n.to_s
 #exit
 p new.subject = Name.new(name)
 p new.issuer = Name.new(name)
@@ -55,7 +55,7 @@ maker = ExtensionFactory.new(nil, new) #only subject
 p ext1 = maker.create_extension(["basicConstraints","CA:FALSE,pathlen:5"])
 #p ext1.to_a
 #p ext1.to_h
-#p ext1.to_str
+#p ext1.to_s
 #exit
 p ext2 = maker.create_extension(["nsComment","OK, man!!!"])
 ###p digest = Digest::SHA1.new(new.public_key.to_der)
@@ -64,11 +64,11 @@ p ext3 = maker.create_extension(["subjectKeyIdentifier", "hash"])
 new.extensions = [ext1, ext2, ext3]
 maker.issuer_certificate = new # we needed subjectKeyInfo inside, now we have it
 p ext4 = maker.create_extension(["authorityKeyIdentifier", "keyid:always,issuer:always"])
-#puts ext1.to_str
+#puts ext1.to_s
 p new.add_extension(ext4)
 p new.sign(key, Digest::MD5.new)
 puts "===PEM==="
-puts new.to_str
+puts new.to_pem
 puts "===DER==="
 p new.to_der
 
diff --git a/test/ossl_x509crl.rb b/test/ossl_x509crl.rb
index e885447..01e8091 100755
--- a/test/ossl_x509crl.rb
+++ b/test/ossl_x509crl.rb
@@ -8,7 +8,7 @@ include PKey
 p ca = Certificate.new(File.open("./cacert.pem").read)
 p key = ca.public_key
 p crl = CRL.new(File.open("./01crl.pem").read)
-p crl.issuer.to_str
+p crl.issuer.to_s
 p crl.verify key
 p crl.verify RSA.new(1024)
 crl.revoked.each {|rev| p rev.time}
diff --git a/test/ossl_x509req.rb b/test/ossl_x509req.rb
index 95550d8..21701c5 100755
--- a/test/ossl_x509req.rb
+++ b/test/ossl_x509req.rb
@@ -9,7 +9,7 @@ p req = Request.new
 p req = Request.new(File.open("./01req.pem").read)
 p pkey = RSA.new(File.open("./02key.pem").read, "alfa")
 p k2 = Certificate.new(File.open("./02cert.pem").read).public_key
-#puts req.to_str
+#puts req.to_pem
 #p req.methods.sort
 p key = req.public_key
 p req.verify key
diff --git a/test/ossl_x509store.rb b/test/ossl_x509store.rb
index f76dd69..d70e85d 100755
--- a/test/ossl_x509store.rb
+++ b/test/ossl_x509store.rb
@@ -7,7 +7,7 @@ include X509
 verify_cb = Proc.new {|ok, x509_store|
   puts "\t\t====begin Verify===="
   puts "\t\tOK = #{ok}"
-  puts "\t\tchecking #{x509_store.cert.subject.to_str}"
+  puts "\t\tchecking #{x509_store.cert.subject.to_s}"
   puts "\t\tstatus = #{x509_store.verify_status} - that is \"#{x509_store.verify_message}\""
   puts "\t\t==== end Verify===="
   #raise "SOME ERROR!" # Cert will be rejected
@@ -17,11 +17,11 @@ verify_cb = Proc.new {|ok, x509_store|
 }
 							  
 p ca = Certificate.new(File.open("./cacert.pem").read)
-puts "CA = #{ca.subject.to_str}, serial = #{ca.serial}"
+puts "CA = #{ca.subject.to_s}, serial = #{ca.serial}"
 cakey = ca.public_key
 
 p cert = Certificate.new(File.open("./01cert.pem").read)
-puts "Cert = #{cert.subject.to_str}, serial = #{cert.serial}"
+puts "Cert = #{cert.subject.to_s}, serial = #{cert.serial}"
 key = cert.public_key
 
 p crl = CRL.new(File.open("./01crl.pem").read)
@@ -71,6 +71,6 @@ end
 
 puts "Trusted certs:"
 store.chain.each_with_index {|cert, i|
-	puts "> #{i} --- #{cert.subject.to_str}"
+	puts "> #{i} --- #{cert.subject.to_s}"
 }
 
diff --git a/test/pkcs7.rb b/test/pkcs7.rb
index b4f4b3b..8bd479b 100755
--- a/test/pkcs7.rb
+++ b/test/pkcs7.rb
@@ -32,7 +32,7 @@ p store.verify_callback = ver_cb
 p p7 = PKCS7.new(str)
 p p7.verify_data(store, data) {|signer|
   puts "GOT IT!"
-  p signer.name.to_str
+  p signer.name.to_s
   p signer.serial
   p signer.signed_time
 }
diff --git a/test/spki.rb b/test/spki.rb
index 0e5b7f1..f97a163 100644
--- a/test/spki.rb
+++ b/test/spki.rb
@@ -3,5 +3,5 @@ include OpenSSL
 
 puts txt = "MIICUDCCATgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUIhGCK7sr\r\nO+jHy7S1ZllFCEPzhlneTnjUnjZWuZEVu7c14NUhJzpNXg//6sCoiy5cQPaIYFIs\r\nded/PosTNfJVPX6El+bWk/2Elf5iVYcScRpf+RkUBR6T3WAMFPCajx3JFonhqhny\r\n5bSXU41h7/oLpnQkeeo76ujKoxjV6vl+y36jCeUAI+dzrWLznUswWVnWvdNt/z1h\r\npWILYtCKexLsz+aOqA6NdGTVDb8r+iDorU2KGL4BJjMXGr/LutYQjeVVXZTuaeN+\r\nxa75TVMcSEzvVQm8Dk1u3C3r3hm9I9zKnpta5NqiToR/fA85Qw5YhjEZMWT/Rj+7\r\nB5LBp5NcX35vAgMBAAEWEGNoYWxsZW5nZSBzdHJpbmcwDQYJKoZIhvcNAQEEBQAD\r\nggEBABdXwDZ9yDyyC5xw8rN/+/xAZSYa8xn4gsUEg4P/mM22WZaqh/NXroXUcU5F\r\nQBeGTYlT//wVlobLeES64Mk/FaCIXrZrLRAxb5QUYIupH2MifRU5XWriYcc6pp7S\r\nD1N+U6MOUFPMziqLf2AYqXBxuky1KhFeXuL6t9j1IadEY9UgTbUQ9Joyt50PoacM\r\ncc2i22GGdpowx7mrB0hnkmYmZ5CgQkrxNM2m4TCuuQwVIyaGgED5Xpa29QWaPhkM\r\njqjHBL4FOmPgYtaIFiFihQziYj5WYOtSEcIcEs/mHPx0lrY9V0fzp2yMGz+AQ3XF\r\nylBqpB33EBqXn/NGzHgWfdU1vEM="
 txt.gsub!(/(\r|\n)/,"")
-puts Netscape::SPKI.new(txt).to_str
+puts Netscape::SPKI.new(txt).to_s