* ext/openssl/extconf.rb: add check for OBJ_NAME_do_all_sorted.

* ext/openssl/ossl_cipher.c (ossl_s_ciphers): new method
  OpenSSL::Cipher.ciphers. it returns all the cipher names.

* ext/openssl/lib/openssl/cipher.rb:
  - add constants AES128, AES192, AES256. [ruby-dev:28610]
  - reimplement without eval()

* ext/openssl/lib/openssl/digest.rb: reimplement without eval().

* test/openssl/test_cipher.rb, test_digest: fix about reimplemented
  features.

* sample/openssl/cipher.rb: rewrite all.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10339 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 4 deletions

diff --git a/sample/openssl/cipher.rb b/sample/openssl/cipher.rb
index 844b6eea4e..6e8cdb9427 100644
--- a/sample/openssl/cipher.rb
+++ b/sample/openssl/cipher.rb
@@ -2,19 +2,22 @@
 require 'openssl'
 
 text = "abcdefghijklmnopqrstuvwxyz"
-key = "key"
+pass = "secret password"
+salt = "8 octets"        # or nil
 alg = "DES-EDE3-CBC"
 #alg = "AES-128-CBC"
 
 puts "--Setup--"
 puts %(clear text:    "#{text}")
-puts %(symmetric key: "#{key}")
+puts %(password:      "#{pass}")
+puts %(salt:          "#{salt}")
 puts %(cipher alg:    "#{alg}")
 puts
 
 puts "--Encrypting--"
 des = OpenSSL::Cipher::Cipher.new(alg)
-des.encrypt(key) #, "iv12345678")
+des.pkcs5_keyivgen(pass, salt)
+des.encrypt
 cipher =  des.update(text)
 cipher << des.final
 puts %(encrypted text: #{cipher.inspect})
@@ -22,7 +25,8 @@ puts
 
 puts "--Decrypting--"
 des = OpenSSL::Cipher::Cipher.new(alg)
-des.decrypt(key) #, "iv12345678")
+des.pkcs5_keyivgen(pass, salt)
+des.decrypt
 out =  des.update(cipher)
 out << des.final
 puts %(decrypted text: "#{out}")