1 files changed, 70 insertions, 70 deletions
diff --git a/lib/puppet/ssl/base.rb b/lib/puppet/ssl/base.rb
index 745d733dc..f9bbcac64 100644
--- a/lib/puppet/ssl/base.rb
+++ b/lib/puppet/ssl/base.rb
@@ -2,78 +2,78 @@ require 'puppet/ssl'
 
 # The base class for wrapping SSL instances.
 class Puppet::SSL::Base
-    # For now, use the YAML separator.
-    SEPARATOR = "\n---\n"
-
-    def self.from_multiple_s(text)
-        text.split(SEPARATOR).collect { |inst| from_s(inst) }
-    end
-
-    def self.to_multiple_s(instances)
-        instances.collect { |inst| inst.to_s }.join(SEPARATOR)
-    end
-
-    def self.wraps(klass)
-        @wrapped_class = klass
-    end
-
-    def self.wrapped_class
-        raise(Puppet::DevError, "#{self} has not declared what class it wraps") unless defined?(@wrapped_class)
-        @wrapped_class
-    end
-
-    attr_accessor :name, :content
-
-    # Is this file for the CA?
-    def ca?
-        name == Puppet::SSL::Host.ca_name
-    end
-
-    def generate
-        raise Puppet::DevError, "#{self.class} did not override 'generate'"
-    end
-
-    def initialize(name)
-        @name = name.to_s.downcase
+  # For now, use the YAML separator.
+  SEPARATOR = "\n---\n"
+
+  def self.from_multiple_s(text)
+    text.split(SEPARATOR).collect { |inst| from_s(inst) }
+  end
+
+  def self.to_multiple_s(instances)
+    instances.collect { |inst| inst.to_s }.join(SEPARATOR)
+  end
+
+  def self.wraps(klass)
+    @wrapped_class = klass
+  end
+
+  def self.wrapped_class
+    raise(Puppet::DevError, "#{self} has not declared what class it wraps") unless defined?(@wrapped_class)
+    @wrapped_class
+  end
+
+  attr_accessor :name, :content
+
+  # Is this file for the CA?
+  def ca?
+    name == Puppet::SSL::Host.ca_name
+  end
+
+  def generate
+    raise Puppet::DevError, "#{self.class} did not override 'generate'"
+  end
+
+  def initialize(name)
+    @name = name.to_s.downcase
+  end
+
+  # Read content from disk appropriately.
+  def read(path)
+    @content = wrapped_class.new(File.read(path))
+  end
+
+  # Convert our thing to pem.
+  def to_s
+    return "" unless content
+    content.to_pem
+  end
+
+  # Provide the full text of the thing we're dealing with.
+  def to_text
+    return "" unless content
+    content.to_text
+  end
+
+  def fingerprint(md = :MD5)
+    require 'openssl/digest'
+
+    # ruby 1.8.x openssl digest constants are string
+    # but in 1.9.x they are symbols
+    mds = md.to_s.upcase
+    if OpenSSL::Digest.constants.include?(mds)
+      md = mds
+    elsif OpenSSL::Digest.constants.include?(mds.to_sym)
+      md = mds.to_sym
+    else
+      raise ArgumentError, "#{md} is not a valid digest algorithm for fingerprinting certificate #{name}"
     end
 
-    # Read content from disk appropriately.
-    def read(path)
-        @content = wrapped_class.new(File.read(path))
-    end
+    OpenSSL::Digest.const_get(md).hexdigest(content.to_der).scan(/../).join(':').upcase
+  end
 
-    # Convert our thing to pem.
-    def to_s
-        return "" unless content
-        content.to_pem
-    end
+  private
 
-    # Provide the full text of the thing we're dealing with.
-    def to_text
-        return "" unless content
-        content.to_text
-    end
-
-    def fingerprint(md = :MD5)
-        require 'openssl/digest'
-
-        # ruby 1.8.x openssl digest constants are string
-        # but in 1.9.x they are symbols
-        mds = md.to_s.upcase
-        if OpenSSL::Digest.constants.include?(mds)
-            md = mds
-        elsif OpenSSL::Digest.constants.include?(mds.to_sym)
-            md = mds.to_sym
-        else
-            raise ArgumentError, "#{md} is not a valid digest algorithm for fingerprinting certificate #{name}"
-        end
-
-        OpenSSL::Digest.const_get(md).hexdigest(content.to_der).scan(/../).join(':').upcase
-    end
-
-    private
-
-    def wrapped_class
-        self.class.wrapped_class
-    end
+  def wrapped_class
+    self.class.wrapped_class
+  end
 end