Merge tag '0.8.0'

Release 0.8.0

1 files changed, 0 insertions, 83 deletions

diff --git a/provider_base/lib/macros/keys.rb b/provider_base/lib/macros/keys.rb
deleted file mode 100644
index 0ed7ccd0..00000000
--- a/provider_base/lib/macros/keys.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-# encoding: utf-8
-
-#
-# Macro for dealing with cryptographic keys
-#
-
-module LeapCli
-  module Macro
-
-    #
-    # return the path to the tor public key
-    # generating key if it is missing
-    #
-    def tor_public_key_path(path_name, key_type)
-      path = file_path(path_name)
-      if path.nil?
-        generate_tor_key(key_type)
-        file_path(path_name)
-      else
-        path
-      end
-    end
-
-    #
-    # return the path to the tor private key
-    # generating key if it is missing
-    #
-    def tor_private_key_path(path_name, key_type)
-      path = file_path(path_name)
-      if path.nil?
-        generate_tor_key(key_type)
-        file_path(path_name)
-      else
-        path
-      end
-    end
-
-    #
-    # Generates a onion_address from a public RSA key file.
-    #
-    # path_name is the named path of the Tor public key.
-    #
-    # Basically, an onion address is nothing more than a base32 encoding
-    # of the first 10 bytes of a sha1 digest of the public key.
-    #
-    # Additionally, Tor ignores the 22 byte header of the public key
-    # before taking the sha1 digest.
-    #
-    def onion_address(path_name)
-      require 'base32'
-      require 'base64'
-      require 'openssl'
-      path = Path.find_file([path_name, self.name])
-      if path && File.exists?(path)
-        public_key_str = File.readlines(path).grep(/^[^-]/).join
-        public_key     = Base64.decode64(public_key_str)
-        public_key     = public_key.slice(22..-1) # Tor ignores the 22 byte SPKI header
-        sha1sum        = Digest::SHA1.new.digest(public_key)
-        Base32.encode(sha1sum.slice(0,10)).downcase
-      else
-        LeapCli.log :warning, 'Tor public key file "%s" does not exist' % tor_public_key_path
-      end
-    end
-
-    private
-
-    def generate_tor_key(key_type)
-      if key_type == 'RSA'
-        require 'certificate_authority'
-        keypair = CertificateAuthority::MemoryKeyMaterial.new
-        bit_size = 1024
-        LeapCli.log :generating, "%s bit RSA Tor key" % bit_size do
-          keypair.generate_key(bit_size)
-          LeapCli::Util.write_file! [:node_tor_priv_key, self.name], keypair.private_key.to_pem
-          LeapCli::Util.write_file! [:node_tor_pub_key, self.name], keypair.public_key.to_pem
-        end
-      else
-        LeapCli.bail! 'tor.key.type of %s is not yet supported' % key_type
-      end
-    end
-
-  end
-end