diff --git a/sample/c_rehash.rb b/sample/c_rehash.rb
index 8282816b9..de4b66e90 100644
--- a/sample/c_rehash.rb
+++ b/sample/c_rehash.rb
@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'openssl'
-require 'digest/md5'
 
 class CHashDir
   include Enumerable
@@ -161,7 +160,7 @@ def hash_name(name)
   end
 
   def fingerprint(der)
-    Digest.hexdigest('MD5', der).upcase
+    OpenSSL::Digest.hexdigest('MD5', der).upcase
   end
 end
 
diff --git a/sample/echo_svr.rb b/sample/echo_svr.rb
index 1cc07b9b9..f20fb52bf 100644
--- a/sample/echo_svr.rb
+++ b/sample/echo_svr.rb
@@ -15,7 +15,7 @@
   cert = OpenSSL::X509::Certificate.new(File::read(cert_file))
   key  = OpenSSL::PKey.read(File::read(key_file))
 else
-  key = OpenSSL::PKey::RSA.new(512){ print "." }
+  key = OpenSSL::PKey::RSA.new(2048){ print "." }
   puts
   cert = OpenSSL::X509::Certificate.new
   cert.version = 2
@@ -25,7 +25,7 @@
   cert.issuer = name
   cert.not_before = Time.now
   cert.not_after = Time.now + 3600
-  cert.public_key = key.public_key
+  cert.public_key = key
   ef = OpenSSL::X509::ExtensionFactory.new(nil,cert)
   cert.extensions = [
     ef.create_extension("basicConstraints","CA:FALSE"),
@@ -37,7 +37,7 @@
   ef.issuer_certificate = cert
   cert.add_extension ef.create_extension("authorityKeyIdentifier",
                                          "keyid:always,issuer:always")
-  cert.sign(key, OpenSSL::Digest.new('SHA1'))
+  cert.sign(key, "SHA1")
 end
 
 ctx = OpenSSL::SSL::SSLContext.new()
diff --git a/sample/gen_csr.rb b/sample/gen_csr.rb
index baac9905b..34b23fec1 100644
--- a/sample/gen_csr.rb
+++ b/sample/gen_csr.rb
@@ -25,7 +25,7 @@ def usage
 if keypair_file
   keypair = OpenSSL::PKey.read(File.read(keypair_file))
 else
-  keypair = OpenSSL::PKey::RSA.new(1024) { putc "." }
+  keypair = OpenSSL::PKey::RSA.new(2048) { putc "." }
   puts
   puts "Writing #{keyout}..."
   File.open(keyout, "w", 0400) do |f|
@@ -38,8 +38,8 @@ def usage
 req = OpenSSL::X509::Request.new
 req.version = 0
 req.subject = name
-req.public_key = keypair.public_key
-req.sign(keypair, Digest.new('MD5'))
+req.public_key = keypair
+req.sign(keypair, "MD5")
 
 puts "Writing #{csrout}..."
 File.open(csrout, "w") do |f|