ossl_cryptor 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 063bae8ea6b7d56fe6e153bc3abc19fbe1a13811
-  data.tar.gz: af280d9d8f661ed7ac879fa0d66eda52e10e72cb
+  metadata.gz: 68c7f1866798498947bca0c80a4be4d5a60eb651
+  data.tar.gz: 4de274d8ae2bd083d7c37f14fca93ef7649e7d28
 SHA512:
-  metadata.gz: 3d74640cd7433fbda3a7749af35c41c5a35a065892c1fa4b0368770d5160bd02f93fa1ba2e401dc0d139e8fc5ac4c84c5a23c225f718b61ffc1a02677202f30f
-  data.tar.gz: fa9f2880869bc268e355efafe532c9d531e08b81f3a5dd502462b3f9076bbde26192dc1ef650d6ccdb459d4daa4c66392a823d69378bddbebe55926e7b828f2b
+  metadata.gz: 6d09200de2540d094f6cba28a44408bed5a1feb84ada882c8cb01bc78f0c7b4bf098d74e057b26898c0d19fd70901fd527806b3290596312338edfd19fb3b7f1
+  data.tar.gz: 5d59ba6f2c24846ef97758cb72207e95abc6594888d0999dcae70d5e864d96ca2962dba70638fa0fc891adb0fe9b741436e040a6a80a53f10c91739e8b2b0ba6

data/README.md

@@ -32,7 +32,7 @@ gem 'ossl_cryptor'
 cryptor = OsslCryptor::Cryptor.new(OsslCryptor::AES)
 
 # encrypt
-enc_value = cryptor.encrypt(aes_encrypt_value)
+enc_value = cryptor.encrypt("AES encrypt target value.")
 p enc_value
 
 # decrypt

data/lib/ossl_cryptor.rb

@@ -31,21 +31,21 @@ module OsslCryptor
       @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)
+      @key_iv = key_iv.nil? ? generate_key_iv(@mode, @pass, @salt, @key_iv_hash) : key_iv
     end
 
     # reset cipher instance.
     def reset
       @cipher = CipherGenerator.generate_cipher(@mode)
-      @key_iv = generate_key_iv(@mode, @default_key_iv, @pass, @salt, @key_iv_hash)
+      @key_iv = generate_key_iv(@mode, @pass, @salt, @key_iv_hash) if @key_iv.nil?
     end
 
     # encrypt value.
     # @param [String] value encrypt value.
+    # @param [boolean] encode_base64 encode base64 flag.
     # @return [String] encrypt result value.
     def encrypt(value, encode_base64=true)
 
@@ -57,7 +57,7 @@ module OsslCryptor
       encrypt_value = ""
       encrypt_value << @cipher.update(value)
       encrypt_value << @cipher.final
-      
+
       # encode base64.
       if encode_base64
         encrypt_value = Base64.encode64(encrypt_value)
@@ -68,6 +68,7 @@ module OsslCryptor
 
     # decrypt value.
     # @param [String] value decrypt value.
+    # @param [boolean] decode_base64 decode base64 flag.
     # @return [String] decrypt result value.
     def decrypt(value, decode_base64=true)
 
@@ -101,27 +102,19 @@ module OsslCryptor
 
     private
 
-    # setup cipher instance.
+    # generate cipher key and iv.
     # @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] 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)
-
-      cipher_key_iv = nil
-
-      # if key_iv = nil, generate key and iv.
-      if key_iv.nil?
-        salt = salt.nil? ? get_default_salt(mode) : salt
-        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_iv = key_iv
-      end
+    def generate_key_iv(mode, pass=nil, salt=nil, hash=nil)
+
+      salt = salt.nil? ? get_default_salt(mode) : salt
+      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 }
 
       cipher_key_iv
     end

data/lib/ossl_cryptor/cipher_generator.rb

@@ -10,9 +10,18 @@ module CipherGenerator
   DEFAULT_KEY_IV_HASH = "sha256"
 
   # generate cipher instance.
+  # @param [String] mode crypt mode.
   # @return [Cipher] cipher instance.
   def self.generate_cipher(mode)
     cipher = OpenSSL::Cipher.new(mode)
     cipher
   end
+
+  # generate random key and iv.
+  # @param [String] mode crypt mode.
+  # @return [Hash] key and iv hash. xx[:key] = key, xx[:iv] = iv
+  def self.generate_random_key_iv(mode)
+    cipher = OpenSSL::Cipher.new(mode)
+    key_iv = { key: cipher.random_key, iv: cipher.random_iv }
+  end
 end

data/lib/ossl_cryptor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ossl_cryptor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - h.shigemoto