trocla 0.0.9 → 0.0.10

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    M2RkMWM1NDdjNDY3MjU2YWEwZjM2YzA5YjYyOGQ5NjE5MTg2MmE2NA==
+  data.tar.gz: !binary |-
+    NTQ5ZTZlYmM5NjcxZWYwNDRhZWZjZjk5NzJjYWUwNmNlZTAyNDgxYQ==
+SHA512:
+  metadata.gz: !binary |-
+    Yzc5NTdkNzgyYmFlZmZlZjcyMWIxMzczY2JlODQ4MDY2NmIzZDMzYzcwN2I5
+    NTNiNTQ2ZjkyZmUwYjkzYzBkOTVhZTU2NjRkZTBiMTQxNjMwYTc4NGFjM2Rh
+    YThmYWE0YmY4NjYzNjM4ZTE3ZjE0YzgzYzRlYzUxZjlhMzhkNDU=
+  data.tar.gz: !binary |-
+    YWFiNWFhMzU5MzQ1NmZmYTE4ZGJhOTNiOThlNmI2NzY3ZmZhOWZkMmRhYzE1
+    OTJmZDVmZDUzYmViMWFjNWZmMTQwZGZiZmRlYzMwNzc2YjM0Mjc1NTY2MmQx
+    ZTJiMDNmMmZjYjY2MTViNmFkM2FkMGY3ZmY1NzRiOGRhMTNmNDY=

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
 rvm:
+  - 2.1.0
+  - 2.0.0
   - 1.9.3
   - 1.8.7

data/Gemfile

@@ -3,17 +3,15 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "moneta", "~> 0.7.2"
+gem "moneta", "~> 0.7"
 gem "highline"
-gem "bcrypt-ruby"
+gem "bcrypt"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.4.0"
+  gem "rspec", "~> 2.4"
   gem "rdoc", "~> 3.8"
   gem "mocha"
-  gem "bundler", "~> 1.2.3"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "jeweler"
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    bcrypt-ruby (2.1.4)
+    bcrypt (3.1.7)
     diff-lcs (1.1.3)
     git (1.2.5)
     highline (1.6.2)
@@ -10,9 +10,8 @@ GEM
       git (>= 1.2.5)
       rake
     mocha (0.9.12)
-    moneta (0.7.2)
+    moneta (0.7.20)
     rake (0.9.2)
-    rcov (0.9.9)
     rdoc (3.8)
     rspec (2.4.0)
       rspec-core (~> 2.4.0)
@@ -27,12 +26,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bcrypt-ruby
-  bundler (~> 1.2.3)
+  bcrypt
   highline
-  jeweler (~> 1.6.4)
+  jeweler
   mocha
-  moneta (~> 0.7.2)
-  rcov
+  moneta (~> 0.7)
   rdoc (~> 3.8)
-  rspec (~> 2.4.0)
+  rspec (~> 2.4)

data/bin/trocla

@@ -65,10 +65,11 @@ def set(options)
     password = options.delete(:password) || STDIN.read.chomp
   end
   format = options.delete(:trocla_format)
-  Trocla.new(options.delete(:config_file)).set_password(
+  trocla = Trocla.new(options.delete(:config_file))
+  trocla.set_password(
     options.delete(:trocla_key),
     format,
-    Trocla::Formats[format].format(password, options.delete(:other_options).shift.to_s)
+    trocla.formats(format).format(password, options.delete(:other_options).shift.to_s)
   )
   ""
 end

data/lib/VERSION

@@ -1,4 +1,4 @@
 major:0
 minor:0
-patch:9
+patch:10
 build:

data/lib/trocla/default_config.yaml

@@ -2,6 +2,7 @@
 options:
     random: true
     length: 12
+    charset: default
 adapter: :YAML
 adapter_options:
     :file: '/tmp/trocla.yaml'

data/lib/trocla/formats/bcrypt.rb

@@ -1,4 +1,4 @@
-class Trocla::Formats::Bcrypt
+class Trocla::Formats::Bcrypt < Trocla::Formats::Base
   require 'bcrypt'
   def format(plain_password,options={})
     BCrypt::Password.create(plain_password).to_s

data/lib/trocla/formats/md5crypt.rb

@@ -1,5 +1,5 @@
 # salted crypt
-class Trocla::Formats::Md5crypt
+class Trocla::Formats::Md5crypt < Trocla::Formats::Base
   def format(plain_password,options={})
      plain_password.crypt('$1$' << Trocla::Util.salt << '$')
   end

data/lib/trocla/formats/mysql.rb

@@ -1,6 +1,6 @@
-class Trocla::Formats::Mysql
+class Trocla::Formats::Mysql < Trocla::Formats::Base
   require 'digest/sha1'
   def format(plain_password,options={})
     "*" + Digest::SHA1.hexdigest(Digest::SHA1.digest(plain_password)).upcase
   end
-end
+end

data/lib/trocla/formats/pgsql.rb

@@ -1,4 +1,4 @@
-class Trocla::Formats::Pgsql
+class Trocla::Formats::Pgsql < Trocla::Formats::Base
   require 'digest/md5'
   def format(plain_password,options={})
     raise "You need pass the username as an option to use this format" unless options['username'] 

data/lib/trocla/formats/plain.rb

@@ -1,7 +1,7 @@
-class Trocla::Formats::Plain
+class Trocla::Formats::Plain < Trocla::Formats::Base
   
   def format(plain_password,options={})
     plain_password
   end
   
-end
+end

data/lib/trocla/formats/sha1.rb

@@ -0,0 +1,7 @@
+class Trocla::Formats::Sha1 < Trocla::Formats::Base
+  require 'digest/sha1'
+  require 'base64'
+  def format(plain_password,options={})
+    '{SHA}' + Base64.encode64(Digest::SHA1.digest(plain_password))
+  end
+end

data/lib/trocla/formats/sha256crypt.rb

@@ -1,5 +1,5 @@
 # salted crypt
-class Trocla::Formats::Sha256crypt
+class Trocla::Formats::Sha256crypt < Trocla::Formats::Base
   def format(plain_password,options={})
      plain_password.crypt('$5$' << Trocla::Util.salt << '$')
   end

data/lib/trocla/formats/sha512crypt.rb

@@ -1,5 +1,5 @@
 # salted crypt
-class Trocla::Formats::Sha512crypt
+class Trocla::Formats::Sha512crypt < Trocla::Formats::Base
   def format(plain_password,options={})
      plain_password.crypt('$6$' << Trocla::Util.salt << '$')
   end

data/lib/trocla/formats/ssha.rb

@@ -1,7 +1,7 @@
 # salted crypt
 require 'base64'
 require 'digest'
-class Trocla::Formats::Ssha
+class Trocla::Formats::Ssha < Trocla::Formats::Base
   def format(plain_password,options={})
      salt = options['salt'] || Trocla::Util.salt(16)
      "{SSHA}"+Base64.encode64("#{Digest::SHA1.digest("#{plain_password}#{salt}")}#{salt}").chomp

data/lib/trocla/formats/x509.rb

@@ -0,0 +1,128 @@
+class Trocla::Formats::X509 < Trocla::Formats::Base
+  require 'openssl'
+  def format(plain_password,options={})
+
+    if plain_password.match(/-----BEGIN RSA PRIVATE KEY-----.*-----END RSA PRIVATE KEY-----.*-----BEGIN CERTIFICATE-----.*-----END CERTIFICATE-----/m)
+      # just an import, don't generate any new keys
+      return plain_password
+    end
+
+    if options['subject']
+      subject = options['subject']
+    elsif options['CN']
+      subject = ''
+      ['C','ST','L','O','OU','CN','emailAddress'].each do |field|
+        subject << "/#{field}=#{options[field]}" if options[field]
+      end
+    else
+      raise "You need to pass \"subject\" or \"CN\" as an option to use this format"
+    end
+    sign_with = options['ca'] || nil
+    keysize = options['keysize'] || 2048
+    serial = options['serial'] || 1
+    days = options['days'] || 365
+    altnames = options['altnames'] || nil
+    altnames.collect { |v| "DNS:#{v}" }.join(', ') if altnames
+
+    begin
+      key = mkkey(keysize)
+    rescue Exception => e
+      raise "Private key for #{subject} creation failed: #{e.message}"
+    end
+
+    if sign_with # certificate signed with CA
+      begin
+        ca = OpenSSL::X509::Certificate.new(getca(sign_with))
+        cakey = OpenSSL::PKey::RSA.new(getca(sign_with))
+        caserial = getserial(sign_with, serial)
+      rescue Exception => e
+        raise "Value of #{sign_with} can't be loaded as CA: #{e.message}"
+      end
+
+      begin
+        subj = OpenSSL::X509::Name.parse(subject)
+        request = mkreq(subj, key.public_key)
+        request.sign(key, OpenSSL::Digest::SHA1.new)
+      rescue Exception => e
+        raise "Certificate request #{subject} creation failed: #{e.message}"
+      end
+
+      begin
+        csr_cert = mkcert(caserial, request.subject, ca, request.public_key, days, altnames)
+        csr_cert.sign(cakey, OpenSSL::Digest::SHA1.new)
+        setserial(sign_with, caserial)
+      rescue Exception => e
+        raise "Certificate #{subject} signing failed: #{e.message}"
+      end
+
+      key.send("to_pem") + csr_cert.send("to_pem")
+    else # self-signed certificate
+      begin
+        subj = OpenSSL::X509::Name.parse(subject)
+        cert = mkcert(serial, subj, nil, key.public_key, days, altnames)
+        cert.sign(key, OpenSSL::Digest::SHA1.new)
+      rescue Exception => e
+        raise "Self-signed certificate #{subject} creation failed: #{e.message}"
+      end
+
+      key.send("to_pem") + cert.send("to_pem")
+    end
+  end
+  private
+
+  # nice help: https://gist.github.com/mitfik/1922961
+
+  def mkkey(len)
+    OpenSSL::PKey::RSA.generate(len)
+  end
+
+  def mkreq(subject,public_key)
+    request = OpenSSL::X509::Request.new
+    request.version = 0
+    request.subject = subject
+    request.public_key = public_key
+
+    request
+  end
+
+  def mkcert(serial,subject,issuer,public_key,days,altnames)
+    cert = OpenSSL::X509::Certificate.new
+    issuer = cert if issuer == nil
+    cert.subject = subject
+    cert.issuer = issuer.subject
+    cert.not_before = Time.now
+    cert.not_after = Time.now + days * 24 * 60 * 60
+    cert.public_key = public_key
+    cert.serial = serial
+    cert.version = 2
+
+    ef = OpenSSL::X509::ExtensionFactory.new
+    ef.subject_certificate = cert
+    ef.issuer_certificate = issuer
+    cert.extensions = [ ef.create_extension("subjectKeyIdentifier", "hash") ]
+    cert.add_extension ef.create_extension("basicConstraints","CA:TRUE", true) if subject == issuer
+    cert.add_extension ef.create_extension("basicConstraints","CA:FALSE", true) if subject != issuer
+    cert.add_extension ef.create_extension("keyUsage", "nonRepudiation, digitalSignature, keyEncipherment", true)
+    cert.add_extension ef.create_extension("subjectAltName", altnames, true) if altnames
+    cert.add_extension ef.create_extension("authorityKeyIdentifier", "keyid:always,issuer:always")
+
+    cert
+  end
+
+  def getca(ca)
+    trocla.get_password(ca,'x509')
+  end
+
+  def getserial(ca,serial)
+    newser = trocla.get_password("#{ca}_serial",'plain')
+    if newser
+      newser + 1
+    else
+      serial
+    end
+  end
+
+  def setserial(ca,serial)
+    trocla.set_password("#{ca}_serial",'plain',serial)
+  end
+end

data/lib/trocla/formats.rb

@@ -1,32 +1,40 @@
 class Trocla::Formats
+
+  class Base
+    attr_reader :trocla
+    def initialize(trocla)
+      @trocla = trocla
+    end
+  end
+
   class << self
     def [](format)
       formats[format.downcase]
     end
-    
+
     def all
       Dir[File.expand_path(File.join(File.dirname(__FILE__),'formats','*.rb'))].collect{|f| File.basename(f,'.rb').downcase }
     end
-    
+
     def available?(format)
       all.include?(format.downcase)
     end
-    
+
     private
     def formats
       @@formats ||= Hash.new do |hash, format|
         format = format.downcase
         if File.exists?(path(format))
           require "trocla/formats/#{format}"
-          hash[format] = (eval "Trocla::Formats::#{format.capitalize}").new
+          hash[format] = (eval "Trocla::Formats::#{format.capitalize}")
         else
           raise "Format #{format} is not supported!"
         end
       end
     end
-    
+
     def path(format)
       File.expand_path(File.join(File.dirname(__FILE__),'formats',"#{format}.rb"))
     end
   end
-end
+end

data/lib/trocla/util.rb

@@ -2,23 +2,39 @@ require 'securerandom'
 class Trocla
   class Util
     class << self
-      def random_str(length=12)
-        (1..length).collect{|a| chars[SecureRandom.random_number(chars.size)] }.join.to_s
+      def random_str(length=12, charset='default')
+        _charsets = charsets[charset]
+        (1..length).collect{|a| _charsets[SecureRandom.random_number(_charsets.size)] }.join.to_s
       end
 
       def salt(length=8)
-        (1..length).collect{|a| normal_chars[SecureRandom.random_number(normal_chars.size)] }.join.to_s
+        (1..length).collect{|a| alphanumeric[SecureRandom.random_number(alphanumeric.size)] }.join.to_s
       end
 
       private
+
+      def charsets
+        @charsets ||= {
+          'default'       => chars,
+          'alphanumeric'  => alphanumeric,
+          'shellsafe'     => shellsafe,
+        }
+      end
+
       def chars
-        @chars ||= normal_chars + special_chars
+        @chars ||= shellsafe + special_chars
       end
-      def normal_chars
-        @normal_chars ||= ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a
+      def shellsafe
+        @chars ||= alphanumeric + shellsafe_chars
+      end
+      def alphanumeric
+        @alphanumeric ||= ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a
       end
       def special_chars
-        @special_chars ||= "+*%/()@&=?![]{}-_.,;:".split(//)
+        @special_chars ||= "*()&![]{}-".split(//)
+      end
+      def shellsafe_chars
+        @shellsafe_chars ||= "+%/@=?_.,:".split(//)
       end
     end
   end

data/lib/trocla.rb

@@ -3,11 +3,11 @@ require 'trocla/util'
 require 'trocla/formats'
 
 class Trocla
-  
+
   def initialize(config_file=nil)
     if config_file
       @config_file = File.expand_path(config_file)
-    elsif File.exists?(def_config_file=File.expand_path('~/.troclarc.yaml')) || File.exists?(def_config_file=File.expand_path('/etc/troclarc.yaml')) 
+    elsif File.exists?(def_config_file=File.expand_path('~/.troclarc.yaml')) || File.exists?(def_config_file=File.expand_path('/etc/troclarc.yaml'))
       @config_file = def_config_file
     end
   end
@@ -20,27 +20,27 @@ class Trocla
       return password
     end
 
-    plain_pwd = get_password(key,'plain') 
+    plain_pwd = get_password(key,'plain')
     if options['random'] && plain_pwd.nil?
-      plain_pwd = Trocla::Util.random_str(options['length'])
-      set_password(key,'plain',plain_pwd) unless format == 'plain' 
+      plain_pwd = Trocla::Util.random_str(options['length'].to_i,options['charset'])
+      set_password(key,'plain',plain_pwd) unless format == 'plain'
     elsif !options['random'] && plain_pwd.nil?
       raise "Password must be present as plaintext if you don't want a random password"
     end
-    set_password(key,format,Trocla::Formats[format].format(plain_pwd,options))
+    set_password(key,format,self.formats(format).format(plain_pwd,options))
   end
-  
+
   def get_password(key,format)
     cache.fetch(key,{})[format]
   end
-  
+
   def reset_password(key,format,options={})
     set_password(key,format,nil)
     password(key,format,options)
   end
-  
+
   def delete_password(key,format=nil)
-    if format.nil? 
+    if format.nil?
       cache.delete(key)
     else
       old_val = (h = cache.fetch(key,{})).delete(format)
@@ -48,7 +48,7 @@ class Trocla
       old_val
     end
   end
-  
+
   def set_password(key,format,password)
     if (format == 'plain')
       h = (cache[key] = { 'plain' => password })
@@ -57,22 +57,26 @@ class Trocla
     end
     h[format]
   end
-  
+
+  def formats(format)
+    (@format_cache||={})[format] ||= Trocla::Formats[format].new(self)
+  end
+
   private
   def cache
     @cache ||= build_cache
   end
-  
+
   def build_cache
     require 'moneta'
     lconfig = config
     Moneta.new(lconfig['adapter'], lconfig['adapter_options']||{})
   end
-  
+
   def config
     @config ||= read_config
   end
-  
+
   def read_config
     if @config_file.nil?
       default_config
@@ -81,10 +85,10 @@ class Trocla
       default_config.merge(YAML.load(File.read(@config_file)))
     end
   end
-  
+
   def default_config
       require 'yaml'
       YAML.load(File.read(File.expand_path(File.join(File.dirname(__FILE__),'trocla','default_config.yaml'))))
   end
-  
+
 end

data/spec/trocla_spec.rb

@@ -120,7 +120,8 @@ describe "Trocla" do
   
   def format_options
     @format_options ||= Hash.new({}).merge({
-      'pgsql' => { 'username' => 'test' }
+      'pgsql' => { 'username' => 'test' },
+      'x509'  => { 'CN' => 'test' },
     })
   end
   

data/trocla.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: trocla 0.0.10 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trocla"
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["mh"]
-  s.date = "2013-10-03"
+  s.date = "2014-06-27"
   s.description = "Trocla helps you to generate random passwords and to store them in various formats (plain, MD5, bcrypt) for later retrival."
   s.email = "mh+trocla@immerda.ch"
   s.executables = ["trocla"]
@@ -36,9 +38,11 @@ Gem::Specification.new do |s|
     "lib/trocla/formats/mysql.rb",
     "lib/trocla/formats/pgsql.rb",
     "lib/trocla/formats/plain.rb",
+    "lib/trocla/formats/sha1.rb",
     "lib/trocla/formats/sha256crypt.rb",
     "lib/trocla/formats/sha512crypt.rb",
     "lib/trocla/formats/ssha.rb",
+    "lib/trocla/formats/x509.rb",
     "lib/trocla/util.rb",
     "lib/trocla/version.rb",
     "spec/data/.keep",
@@ -49,44 +53,37 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://tech.immerda.ch/2011/12/trocla-get-hashed-passwords-out-of-puppet-manifests/"
   s.licenses = ["GPLv3"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.3.0"
   s.summary = "Trocla a simple password generator and storage"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<moneta>, ["~> 0.7.2"])
       s.add_runtime_dependency(%q<highline>, [">= 0"])
-      s.add_runtime_dependency(%q<bcrypt-ruby>, [">= 0"])
+      s.add_runtime_dependency(%q<bcrypt>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.8"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.2.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<moneta>, ["~> 0.7.2"])
       s.add_dependency(%q<highline>, [">= 0"])
-      s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
+      s.add_dependency(%q<bcrypt>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.8"])
       s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.2.3"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<moneta>, ["~> 0.7.2"])
     s.add_dependency(%q<highline>, [">= 0"])
-    s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
+    s.add_dependency(%q<bcrypt>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.4.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.8"])
     s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.2.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: trocla
 version: !ruby/object:Gem::Version
-  version: 0.0.9
-  prerelease: 
+  version: 0.0.10
 platform: ruby
 authors:
 - mh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,15 +34,13 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bcrypt-ruby
+  name: bcrypt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,31 +90,13 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,27 +104,10 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.4
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Trocla helps you to generate random passwords and to store them in various
   formats (plain, MD5, bcrypt) for later retrival.
 email: mh+trocla@immerda.ch
@@ -183,9 +136,11 @@ files:
 - lib/trocla/formats/mysql.rb
 - lib/trocla/formats/pgsql.rb
 - lib/trocla/formats/plain.rb
+- lib/trocla/formats/sha1.rb
 - lib/trocla/formats/sha256crypt.rb
 - lib/trocla/formats/sha512crypt.rb
 - lib/trocla/formats/ssha.rb
+- lib/trocla/formats/x509.rb
 - lib/trocla/util.rb
 - lib/trocla/version.rb
 - spec/data/.keep
@@ -196,29 +151,25 @@ files:
 homepage: https://tech.immerda.ch/2011/12/trocla-get-hashed-passwords-out-of-puppet-manifests/
 licenses:
 - GPLv3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -851903621501958623
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.3.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Trocla a simple password generator and storage
 test_files: []