ossl_rsa 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac8949541ed64d36f11d126f7981d3fbad99dd14
-  data.tar.gz: 4694f0f07b2e42f76819bfba86a60167e3ec937b
+  metadata.gz: 4722726425bfb5c98d8bf2864b7387201dfd3eb4
+  data.tar.gz: 665d4724c96ede018fccce48dc3d18cef598b405
 SHA512:
-  metadata.gz: c39aa7e72c211ac4c612fe53e36824f4abc443b2240b5a71a51263f2be41ce10cd449f1d5a40331f14275cb90310b19600e36172b57f98b84ac86c48fb3ee2b9
-  data.tar.gz: 36fdefe2c5826bbd802cf78e8f45c19d52e632906b7ec327eae3cc90015aba74dbfb480a27e6a7fef5e89173ede5f9adda0c44eadde0eba9857f486ae722f0bd
+  metadata.gz: 0d9cc67d80da2e7833fc659035fdd3b7908930982f70d6342efb8937dd1f883a1a008ff4f395c14e1aba747b8e8107b1000133b4f59c98f9d55b3ecf85a83fed
+  data.tar.gz: 89374e7e94ad577f1104f1a4d2a597d86c3190ed3a97fc45fa6e6e730967ebe9e808c4f9c0840cbd12cde81f080c59de1e6c9ce968e23cbfc649087722f7a32c

data/lib/ossl_rsa.rb

@@ -1,6 +1,7 @@
 require "ossl_rsa/version"
 require "ossl_rsa/rsa"
 require "ossl_rsa/file_op"
+require "ossl_rsa/generator"
 
 # openssl rsa module.
 module OsslRsa

data/lib/ossl_rsa/generator.rb

@@ -0,0 +1,66 @@
+require "openssl"
+
+# openssl rsa module.
+module OsslRsa
+
+  # generator class
+  class Generator
+
+    # generate OpenSSL::PKey::RSA instance.
+    # generate rsa instance by options.
+    # options[:size] : key size
+    # options[:obj] : pem or der
+    # options[:pass] : password
+    # @param [Hash] options generate options.
+    # @return [OpenSSL::PKey::RSA] rsa instance.
+    def self.generate(options)
+
+      rsa = nil
+      # if size and private exist, raise error.
+      if (!options[:size].nil? && !options[:obj].nil?)
+        raise OpenSSL::PKey::RSAError.new("size and obj is nil.")
+      end
+
+      # if exist size, generate use size, cipher.
+      unless options[:size].nil?
+        rsa = generate_rsa_by_size(options[:size])
+      end
+
+      # if exist obj, generate use obj, pass.
+      unless options[:obj].nil?
+        rsa = generate_rsa_by_key(options[:obj], options[:pass])
+      end
+
+      # raise Error
+      if rsa.nil?
+        raise OpenSSL::PKey::RSAError.new("fail create rsa instance.")
+      end
+
+      rsa
+    end
+
+    private
+
+    # generate rsa.
+    # @param [integer] size key size.
+    # @return [OpenSSL::PKey::RSA] rsa instance.
+    def self.generate_rsa_by_size(size)
+
+      # add seed.
+      OpenSSL::Random.seed(SecureRandom.hex(8))
+      # generate rsa instance.
+      rsa = OpenSSL::PKey::RSA.new(size)
+      rsa
+    end
+
+    # generate rsa.
+    # @param [String] pem / der.
+    # @param [String] pass password
+    # @return [OpenSSL::PKey::RSA] rsa instance.
+    def self.generate_rsa_by_key(obj, pass=nil)
+
+      rsa = OpenSSL::PKey::RSA.new(obj, pass)
+      rsa
+    end
+  end
+end

data/lib/ossl_rsa/rsa.rb

@@ -1,3 +1,4 @@
+require "ossl_rsa/generator"
 require "openssl"
 require "base64"
 require "securerandom"
@@ -16,25 +17,8 @@ module OsslRsa
     # @param [Hash] options generate options.
     def initialize(options={})
 
-      # if size and private exist, raise error.
-      if (!options[:size].nil? && !options[:obj].nil?)
-        raise OpenSSL::PKey::RSAError "size and obj is nil."
-      end
-
-      # if exist size, generate use size, cipher.
-      unless options[:size].nil?
-        @rsa = generate_rsa_by_size(options[:size])
-      end
-
-      # if exist obj, generate use obj, pass.
-      unless options[:obj].nil?
-        @rsa = generate_rsa_by_key(options[:obj], options[:pass])
-      end
-
-      # raise Error
-      if @rsa.nil?
-        raise OpenSSL::PKey::RSAError "fail create rsa instance."
-      end
+      # generate rsa instance.
+      @rsa = OsslRsa::Generator.generate(options)
     end
 
     # encrypt RSA. use public_key.
@@ -126,8 +110,8 @@ module OsslRsa
       save_path_pair = OsslRsa::FileOp.save(dir_path, save_key_pair, mode, add_now)
       save_path_pair
     end
+
     # save file key.
-    # filename is [private.xxx(pem or der)], [public.xxx(pem or der)]
     # @param [Hash] file_path_pair save file path pair. xxx[:private] = private file path, xxx[:public] = public file path.
     # @param [integer] mode pem or der.
     # @param [OpenSSL::Cipher] cipher cipher instance.
@@ -136,7 +120,7 @@ module OsslRsa
     def to_specify_file(file_path_pair, mode, cipher=nil, pass=nil)
 
       save_key_pair = key_pair(mode, cipher, pass)
-      
+
       # save file.
       save_path_pair = OsslRsa::FileOp.save_file(save_key_pair, file_path_pair, mode)
       save_path_pair
@@ -168,29 +152,17 @@ module OsslRsa
       { private: private_key, public: public_key }
     end
 
-    private
+    # get private and public key text.
+    # @return [Hash] key pair hash. xx[:private] = private_key, xx[:public] = public_key
+    def text_pair
 
-    # generate rsa.
-    # @param [integer] size key size.
-    # @return [OpenSSL::PKey::RSA] rsa instance.
-    def generate_rsa_by_size(size)
+      private_key = @rsa.to_text if @rsa.private?
+      public_key = @rsa.public_key.to_text if @rsa.public?
 
-      # add seed.
-      OpenSSL::Random.seed(SecureRandom.hex(8))
-      # generate rsa instance.
-      rsa = OpenSSL::PKey::RSA.new(size)
-      rsa
+      { private: private_key, public: public_key }
     end
 
-    # generate rsa.
-    # @param [String] pem / der.
-    # @param [String] pass password
-    # @return [OpenSSL::PKey::RSA] rsa instance.
-    def generate_rsa_by_key(obj, pass=nil)
-
-      rsa = OpenSSL::PKey::RSA.new(obj, pass)
-      rsa
-    end
+    private
 
     # get private key.
     # @param [integer] mode pem or der.

data/lib/ossl_rsa/version.rb

@@ -1,3 +1,3 @@
 module OsslRsa
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ossl_rsa
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - h.shigemoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - bin/setup
 - lib/ossl_rsa.rb
 - lib/ossl_rsa/file_op.rb
+- lib/ossl_rsa/generator.rb
 - lib/ossl_rsa/rsa.rb
 - lib/ossl_rsa/version.rb
 - ossl_rsa.gemspec