cryptic 1.0.0.beta.8 → 1.0.0.beta.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19cd7f5683be40e75d7457f388347ab393863d1c
-  data.tar.gz: d95bb120e657ac4c18ca6dd53c835dcf577ce64c
+  metadata.gz: e35bfdebfe81ab3a5f56618ad5a231e1f1db4e7d
+  data.tar.gz: 980067e2811eef4752ff7964ded44bbe546a59f4
 SHA512:
-  metadata.gz: 711a1bee6d4cc23f19ba6600d6e51055e665b34fc68a44bc7fce19bad589a129df2a9fa1b4472d4a0c848ca417331aeecfad83e47dee351334223f9f3981de94
-  data.tar.gz: d0445ac68371dc194064d75039a67a414152706dca59fe8eef8132d326bef753137287d535ebdd0053f88c8e516edb96ba599507664e8f7ba5ee9ab2e00977be
+  metadata.gz: a58727274617570b059f332d843236dd5c37aeb4397c2d48979e40357a07468b9beede0a5e6f8c47c1adb9e082a4f76f10c647d425fdc66983edc8b45b0b09c1
+  data.tar.gz: e99ecbd7df5eb8461512e93bfbed18434257284f0a457b0695678ade19b20533f6baf90dbb34ef43a7ff840262e3ba4f7a1a4e84c68ce58223143ec5e311c82c

data/bin/cryptic

@@ -62,7 +62,7 @@ class CrypticCLI < Thor
   method_option :passphrase, aliases: %w[-p], default: nil, desc: 'The passphrase to generate the private key with'
   method_option :path, aliases: %w[-o], default: '.', desc: 'Where to place the generated keys'
   def generate
-    keypair = Cryptic::Keypair.new(options[:passphrase], options[:bits])
+    keypair = Cryptic::Keypair.generate(options[:passphrase], options[:bits])
     keypair.save(options[:path])
     $stdout.puts "Generated keys saved as '#{File.expand_path(options[:path])}/cryptic_public.pem' and '#{File.expand_path(options[:path])}/cryptic_private.pem'"
   rescue Cryptic::KeyGenerationFailure => e

data/cryptic_private.pem

@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-256-CBC,7982FC649F5EDF03FA207CADC0B871BA
+DEK-Info: AES-256-CBC,16AE475ED7BBA9616BCC2ED1DD9767BA
 
-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
+2Q9bz24t9hKHCWtyP5PIETJyRUjrFJ+lLcBekXecjhGmjKNrJLPb5cE4GchEIUGs
+scRYO/UFntbBz+FVHk9pHMyl6ZEyF2notsgvw53EZoOHHjRbZhTI+jMZnpgA6fI2
+TjCyA2o91YyWBL07HxwlHntzyQ1X8CPsju9zAIV1rFPPC84Udkj5Ze5Gq/B9gRQH
+gKPSoW7HnixFrhn2tKYvCZo2AoTlgzuTNpcQa+wiXlDf99pvcqJ7+UtXqrRK5WHx
+gfm0TpZXZx9Pjq8PiV8nolkoGXgtnv9H5tTNFeFxz2KV/qFpllWYJc0MUQGC5+Wn
+rScUb44g0+wvnO28jT1TmCgIwmZVHrHR+19fhgg6bK/h2RiO1e1+vRk82ird4Izf
+O85mdsDC6fKCB0vwgvRTXpyo8fuo9yVYwZEdW3oW3xHi7wZ2Lu+2qG8gg3EAhU5Q
+K56e4sLeZVRZ7ElgNQUMgJpS3A5b9OgK9NyZRY7YwS8xJPeypn92Z5wOoSexypL/
+66EuALauS3Y2vBbD91i4Zu+MMCialWvkSnTVA9gwvgkfzc1Db0VJ6B36epDHvv0f
+ZFPKjiq1qK2u6sefSjRrICcqo7zYq4g5PTlcKh2gqJi3jPCXsBNa6RP2L3astvsf
+DkoyNg3fpS0eul+uomaiULyzm44Zgo2sitW6BziEzgAe4Nf5aCmec5EqtSSsi0/h
+p+hwZN38gK1wMNuasPJFaulXNv1SFhPzi1Vjr0xL+PatbqxcNikf1sL/u+PUb029
+cecDIZ+eKqbiYHaTaRd05RyIq7GQtmbQC18n4EQIvpVrc82cKtkpSNGTymSP/kHr
+tRiIx3WuGyzGmxYUVb/i1zZLwPJ/7wwIMW51Hh3H7TO9jcU/APHyP+MLXi0CDTWv
+XHkAsjz+gu/cqrRa/JeMQCYf/e7RgTew4bpBcmpI+bCWixMbAeL72bwClJjUbbwz
+tiF7XCiQgaD3st+l7GzkAHf55xL0qptcs/d/JsLBlNCF+Vc+7rpGJyCCHcM/stGz
+Y76E43Pd++P/steFLInzNZWZqjK0FNBTr1GfWPlYEFkpKeW/I0Cz3B4JPu1et8wx
+zdjmRe/0Q+O+b9I4Ox+KhxkUnQz7O3qsJ5om1TJNEaSE5yw0mBbLNzh84Lml4C9a
+qU3VxMJMngZMFuc9cnjogsBfbk10r4+zJ3c+YDq60pwn8gDuHQmSejxtHQhI5l+P
+QPN2cVgSVIQlOiYXZaCjSshlAJ6Hbm5BEDseaYb1ponARYFqChMtqa+gOC8V9mMq
+cTgncYYaCoi5EXNdLToE7pLp5vgEX0yN1aNvQPog5sYQgaHe03tOLK0ncdIryqtW
+PdRbqb+KgJPN+AI+n0CP9b+ucpjqQqEZe2H9oqgLtltYIRj3ads5/8tTWMhBqFpE
+bE8wwHIbp65f7fun3PAtMKNSq7QMdWxpuM10ECpzZR9r6hRzSjMwQpzRlm2N3pXj
+z5Ib4IIU/jKo2Vkn3ZzWwSbZLbDQRy8kYxHbudNKqCaSk8EhknNwNyWi1P3AtiHw
+k2CPcMSXvBo2cenorQbmkOgWboateZdlx8Sjpwfpd4WhiwHRsjxo3PSuzzhPWLP9
 -----END RSA PRIVATE KEY-----

data/cryptic_public.pem

@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzOWt9cgkhxkdGs8SFlgZ
-BXCETwddfTg0zez/IeFiCAe8gcKQBDHa62jMbkwAg/tNAherRXqguWF9ZLm4ZTf3
-fxRHafj0KA83KLdLWcxaU1TsN/c2/DcDcsSwdgMKGz4YQR64RC6c98s/c0HZQzPj
-vEQPA/fU0LoFmGynZ9/pdEXQe6N3kzbpG8//64RxgFPco7g7HbZIVaRqyx3U4UgQ
-FKb+HoYDs5U+P6qz6TU4YFZbqglunptxKIjUZG7lywGPtDhD9gQf2n5n+wId4MgD
-xKwrj+ZQF220Mmq96LSm1a3BtiRhZInKLPn9Yr7JFh7CgVmqn2/50UVAbbdKKO4x
-TwIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA77uynFjDr8QenZojWGao
+beqNoMB7f64QmTa7dnLgU1VDtkBn4ni3lzCXbaILvNb3fSP26qnry1vbJmxxJxd+
+Vbz1Uo34+xGNmXRnQirY4PyOXrz6PhYScua/JvCr+mUo5tBz7SowG1UuH2eMWLyS
+pcttlnNFaPGeuXkSuaO95ObLcXJIJgQdvFB+yccjLV218GjYR4ncYmOGXs+lxQWI
+wywF2T160228JXWtNHwAfDe7cNUlgAknopMsTYuekMvDE9VB+vF0J+n+iRaQ3sOE
+oqyPBuRJii3fG3h/F6sB/cOvBwd5J688u7LVRHbQJ/5IQ33WOAb36GBv13uoEv7Y
+RwIDAQAB
 -----END PUBLIC KEY-----

data/lib/cryptic/keypair.rb

@@ -16,7 +16,7 @@ module Cryptic
     # Initializes a Cryptic::Keypair object from a private/public keypair
     #
     # @note The passphrase isn't saved
-    # @todo Use the Ruby 2 named parameters syntax vs. an opts hash
+    # @todo Code clean up between initialize and generate!
     # @todo Validate that keys are public/private
     # @param [String] private_key the private key (or file) to use
     # @param [Hash] opts additional options to configure your Keypair with
@@ -25,32 +25,41 @@ module Cryptic
     #   from
     # @return [Keypair] the initialized Cryptic::Keypair object
     def initialize(private_key, opts = { public_key: nil, passphrase: nil })
-      @private_key = OpenSSL::PKey::RSA.new(
-                       if File.exists?(private_key)
-                         File.read(private_key)
-                       else
-                         private_key
-                       end,
-                       opts[:passphrase]
-                     )
-
-      unless @private_key.private?
-        raise(
-          Cryptic::InvalidKey,
-          "Public key '#{private_key}' provided as a private key."
-        )
+      if private_key.is_a? OpenSSL::PKey::RSA
+        @private_key = private_key
+      elsif !private_key.to_pem.eql? ''
+        @private_key = OpenSSL::PKey::RSA.new(
+                         if File.exists?(private_key)
+                           File.read(private_key)
+                         else
+                           private_key
+                         end,
+                         opts[:passphrase]
+                       )
+        unless @private_key.private?
+          raise(
+            Cryptic::InvalidKey,
+            "Public key '#{private_key}' provided as a private key."
+          )
+        end
       end
 
-      @public_key = OpenSSL::PKey::RSA.new(
-                      if opts[:public_key] && File.exists?(opts[:public_key])
-                        File.read(opts[:public_key])
-                      elsif opts[:public_key]
-                        opts[:public_key]
-                      else
-                        @private_key
-                      end,
-                      opts[:passphrase]
-                    ).public_key
+      if public_key.is_a? OpenSSL::PKey::RSA
+        @public_key = public_key
+      else
+        @public_key = OpenSSL::PKey::RSA.new(
+                        if opts[:public_key] && File.exists?(opts[:public_key].to_s)
+                          File.read(opts[:public_key])
+                        elsif opts[:public_key]
+                          opts[:public_key]
+                        else
+                          require 'pry'
+                          binding.pry
+                          @private_key or raise(Cryptic::KeyNotFound)
+                        end,
+                        opts[:passphrase]
+                      ).public_key
+      end
     rescue OpenSSL::PKey::RSAError => e
       if e.message.eql? 'Neither PUB key nor PRIV key:: not enough data'
         if @private_key.nil?
@@ -73,16 +82,21 @@ module Cryptic
     # @param [Fixnum] size the amount of bits to use in your key
     # @return [Keypair] an object representing a private/public keypair
     def self.generate(passphrase = nil, size = 2048)
-      # OPTIMIZE: There are so many hammers in here it looks like we're playing
-      # Whack-a-mole
       # TODO: Find a better way to handle retries
       attempts ||= 0
       attempts += 1
 
-      rsa_key = OpenSSL::PKey::RSA.new(size)
-      cipher ||= OpenSSL::Cipher::AES256.new(:CBC)
+      rsa_key = OpenSSL::PKey::RSA.new(size, passphrase)
+      cipher = OpenSSL::Cipher::AES256.new(:CBC)
 
-      new(rsa_key.to_pem(cipher, passphrase), { public_key: rsa_key.public_key.to_pem, passphrase: passphrase })
+      new(
+        rsa_key,
+        {
+          cipher: cipher,
+          public_key: rsa_key.public_key,
+          passphrase: passphrase
+        }
+      )
     rescue OpenSSL::PKey::RSAError => e
       if e.message =~ /^read key$/
         retry unless attempts > 1
@@ -97,19 +111,22 @@ module Cryptic
     # @todo Document what save may raise
     # @todo Update this method
     # @return [String] returns the path files were saved to
-    def save(path = '.')
-      if @private_key.to_pem.eql?('') || @public_key.to_pem.eql?('')
+    def save(path = '.', opts = { cipher: OpenSSL::Cipher::AES256.new(:CBC), passphrase: nil})
+      priv = @private_key.to_pem(opts[:cipher], opts[:passphrase])
+      pub = (opts[:public_key] || @public_key || @private_key.public_key).to_pem
+
+      if priv.eql?('') || pub.eql?('')
         raise Cryptic::KeyGenerationFailure, "The keypair was never successfully generated"
       end
 
       FileUtils.mkdir_p(File.dirname(path))
 
       File.open("#{File.expand_path(path)}/cryptic_private.pem", 'w') do |file|
-        file.write @private_key
+        file.write priv
       end
 
       File.open("#{File.expand_path(path)}/cryptic_public.pem", 'w') do |file|
-        file.write @public_key
+        file.write pub
       end
 
       path

data/lib/cryptic/version.rb

@@ -1,4 +1,4 @@
 module Cryptic
   # The version of the cryptic gem
-  VERSION = '1.0.0.beta.8'
+  VERSION = '1.0.0.beta.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cryptic
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.8
+  version: 1.0.0.beta.9
 platform: ruby
 authors:
 - Erran Carey