ossl_cryptor 0.1.0.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 369196e6ffdf50c0bb4b869458fb62bda29afa6c
-  data.tar.gz: a41973bc6fbef1e834543bc189b96f4366c6dba8
+  metadata.gz: 063bae8ea6b7d56fe6e153bc3abc19fbe1a13811
+  data.tar.gz: af280d9d8f661ed7ac879fa0d66eda52e10e72cb
 SHA512:
-  metadata.gz: 1d68ad535bde9c473a56910172dbe9c35f051a9f79a2aeef55377c189bab25c0c3dc5f5a56667f7c5ef8d612e6ffe29dbd5c8cf1f1e851fd54d4fb8f7dfe34cc
-  data.tar.gz: 7287695ecee81db4cd46631a5aab79d701e24e53a00b399bcd159e29a1c1c26cb9d33e2e0ab55f9461b0546b435f85bc2718cce820ac9f7ef791ce2229ba6a2f
+  metadata.gz: 3d74640cd7433fbda3a7749af35c41c5a35a065892c1fa4b0368770d5160bd02f93fa1ba2e401dc0d139e8fc5ac4c84c5a23c225f718b61ffc1a02677202f30f
+  data.tar.gz: fa9f2880869bc268e355efafe532c9d531e08b81f3a5dd502462b3f9076bbde26192dc1ef650d6ccdb459d4daa4c66392a823d69378bddbebe55926e7b828f2b

data/README.md

@@ -2,7 +2,8 @@
 
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/ossl_cryptor`. To experiment with that code, run `bin/console` for an interactive prompt.
 
-TODO: Delete this and the text above, and describe your gem
+This gem provide crypt process by DES and AES-256-CBC.
+Use openssl lib.
 
 ## Installation
 
@@ -22,7 +23,22 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+You implement the method of the AES-256-CBC as a sample.
+DES can also be run in the same way (only the specified mode is different).
+
+```ruby
+gem 'ossl_cryptor'
+
+cryptor = OsslCryptor::Cryptor.new(OsslCryptor::AES)
+
+# encrypt
+enc_value = cryptor.encrypt(aes_encrypt_value)
+p enc_value
+
+# decrypt
+dec_value = cryptor.decrypt(enc_value)
+p dec_value
+```
 
 ## Development
 
@@ -32,7 +48,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/ossl_cryptor. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/h-shigemoto/ossl_cryptor. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
 
 ## License

data/lib/ossl_cryptor/version.rb

@@ -1,3 +1,3 @@
 module OsslCryptor
-  VERSION = "0.1.0.1"
+  VERSION = "0.2.0"
 end

data/lib/ossl_cryptor.rb

@@ -1,7 +1,9 @@
 require "ossl_cryptor/version"
 require "ossl_cryptor/cipher_generator"
 require "base64"
+require "openssl"
 
+# openssl crypt module
 module OsslCryptor
 
   # DES Mode.
@@ -26,13 +28,20 @@ module OsslCryptor
       end
 
       # generate cipher instance.
-      @cipher = setup(mode, key_iv, pass, salt, key_iv_hash)
+      @cipher = CipherGenerator.generate_cipher(mode)
+      # set initialize parameter and generate key, iv
       @mode = mode
+      @default_key_iv = key_iv
+      @pass = pass.nil? ? CipherGenerator::DEFAULT_PASS : pass
+      @salt = salt
+      @key_iv_hash = key_iv_hash.nil? ? CipherGenerator::DEFAULT_KEY_IV_HASH : key_iv_hash
+      @key_iv = generate_key_iv(@mode, @default_key_iv, @pass, @salt, @key_iv_hash)
     end
 
     # reset cipher instance.
     def reset
-      @cipher = setup(@mode, @key)
+      @cipher = CipherGenerator.generate_cipher(@mode)
+      @key_iv = generate_key_iv(@mode, @default_key_iv, @pass, @salt, @key_iv_hash)
     end
 
     # encrypt value.
@@ -42,9 +51,13 @@ module OsslCryptor
 
       # prepare encrypt.
       @cipher.encrypt
+      set_key_iv
 
       # encrypt.
-      encrypt_value = @cipher.update(value) + @cipher.final
+      encrypt_value = ""
+      encrypt_value << @cipher.update(value)
+      encrypt_value << @cipher.final
+      
       # encode base64.
       if encode_base64
         encrypt_value = Base64.encode64(encrypt_value)
@@ -60,18 +73,17 @@ module OsslCryptor
 
       # prepare decrypt.
       @cipher.decrypt
+      set_key_iv
 
       # decode base64.
       if decode_base64
         value = Base64.decode64(value)
       end
 
-      if @mode == AES
-        @cipher.padding = 0
-      end
-
       # decrypt.
-      decrypt_value = @cipher.update(value) + @cipher.final
+      decrypt_value = ""
+      decrypt_value << @cipher.update(value)
+      decrypt_value << @cipher.final
       decrypt_value
     end
 
@@ -90,39 +102,31 @@ module OsslCryptor
     private
 
     # setup cipher instance.
-    # @param [String] mode cipher mode.
+    # @param [String] mode crypt mode.
     # @param [Hash] key_iv key and iv. key_iv[:key] = key, key_iv[:iv] = iv
     # @param [String] pass password, if pass = nil, use CipherGenerator::DEFAULT_PASS
     # @param [String] salt salt data. if salt = nil, use random salt.
-    # @param [String] key_iv_hash use hash algorithm when key and iv generate. if key_iv_hash = nil, use CipherGenerator::DEFAULT_KEY_IV_HASH
-    # @return [Cipher] cipher instance.
-    def setup (mode, key_iv=nil, pass=nil, salt=nil, key_iv_hash=nil)
+    # @param [String] hash use hash algorithm when key and iv generate. if key_iv_hash = nil, use CipherGenerator::DEFAULT_KEY_IV_HASH
+    # @return [Hash] key and iv hash.
+    def generate_key_iv(mode, key_iv=nil, pass=nil, salt=nil, hash=nil)
 
-      # generate OpenSSL::Cipher instance.
-      cipher = CipherGenerator.generate_cipher(mode)
+      cipher_key_iv = nil
 
       # if key_iv = nil, generate key and iv.
       if key_iv.nil?
-        pass = pass.nil? ? CipherGenerator::DEFAULT_PASS : pass
         salt = salt.nil? ? get_default_salt(mode) : salt
-        hash = key_iv_hash.nil? ? CipherGenerator::DEFAULT_KEY_IV_HASH : key_iv_hash
-        key_len = cipher.key_len + cipher.iv_len
-        key_iv_str = OpenSSL::PKCS5.pbkdf2_hmac(pass, salt, 2000, key_len, hash)
-        key = key_iv_str[0, cipher.key_len]
-        iv = key_iv_str[cipher.key_len, key_len]
-        cipher.key = key
-        cipher.iv = iv
-        @key_iv = { key: key, iv: iv }
+        key_iv_str = OpenSSL::PKCS5.pbkdf2_hmac(pass, salt, 2000, (@cipher.key_len + @cipher.iv_len), hash)
+        key = key_iv_str[0, @cipher.key_len]
+        iv = key_iv_str[@cipher.key_len, @cipher.iv_len]
+        cipher_key_iv = { key: key, iv: iv }
       else
-        cipher.key = key_iv[:key]
-        cipher.iv = key_iv[:iv]
-        @key_iv = key_iv
+        cipher_key_iv = key_iv
       end
 
-      cipher
+      cipher_key_iv
     end
 
-    # get default sold depend on mode.
+    # get default salt depend on mode.
     # @param [String] mode cipher mode.
     # @return [String] default salt.
     def get_default_salt(mode)
@@ -137,6 +141,12 @@ module OsslCryptor
 
       default_salt
     end
+
+    # set key and iv to cipher instance.
+    def set_key_iv
+      @cipher.key = @key_iv[:key]
+      @cipher.iv = @key_iv[:iv]
+    end
   end
 
   # get available crypt mode.

data/ossl_cryptor.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["corporation.ore@gmail.com"]
 
   spec.summary       = %q{This gem provide crypt by AES-256-CBC and DES.}
-  spec.description   = %q{This gem provide crypt by AES-256-CBC and DES. Use openssl lib. But now, only DES of properly available.}
+  spec.description   = %q{This gem provide crypt by AES-256-CBC and DES. Use openssl lib.}
   spec.homepage      = "https://github.com/h-shigemoto/ossl_cryptor"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ossl_cryptor
 version: !ruby/object:Gem::Version
-  version: 0.1.0.1
+  version: 0.2.0
 platform: ruby
 authors:
 - h.shigemoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-26 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,8 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: This gem provide crypt by AES-256-CBC and DES. Use openssl lib. But now,
-  only DES of properly available.
+description: This gem provide crypt by AES-256-CBC and DES. Use openssl lib.
 email:
 - corporation.ore@gmail.com
 executables: []