#326733 by headius

Theme:
diff --git a/lib/ruby/site_ruby/1.8/jruby/openssl/builtin.rb b/lib/ruby/site_ruby/1.8/jruby/openssl/builtin.rb
index 2401864..4f06897 100644
--- a/lib/ruby/site_ruby/1.8/jruby/openssl/builtin.rb
+++ b/lib/ruby/site_ruby/1.8/jruby/openssl/builtin.rb
@@ -1,178 +1,175 @@
-begin
-  old_verbose, $VERBOSE = $VERBOSE, nil # silence warnings
-  require 'jruby/openssl/gem'
-rescue Exception
-ensure
-  $VERBOSE = old_verbose
-end
-
-module OpenSSL
-  VERSION = "1.0.0"
-  OPENSSL_VERSION = "OpenSSL 0.9.8b 04 May 2006 (JRuby fake)"
-
-  def self.determine_version
+# this will load the gem and library only if it's available
+require 'jruby/openssl/gem'
+
+unless defined?(OpenSSL::OPENSSL_VERSION)
+  module OpenSSL
+    VERSION = "1.0.0"
+    OPENSSL_VERSION = "OpenSSL 0.9.8b 04 May 2006 (JRuby fake)"
+
+    def self.determine_version
+      require 'java'
+      java.security.MessageDigest.getInstance("SHA224", PROVIDER);
+      9469999
+    rescue Exception
+      9469952
+    end
+    OPENSSL_VERSION_NUMBER = determine_version
+
     require 'java'
-    java.security.MessageDigest.getInstance("SHA224", PROVIDER);
-    9469999
-  rescue Exception
-    9469952
-  end
-  OPENSSL_VERSION_NUMBER = determine_version  
-  
-  require 'java'
-  class HMACError < OpenSSLError; end
-  class DigestError < OpenSSLError; end
-  
-  module Digest
-    class Digest
+    class HMACError < OpenSSLError; end
+    class DigestError < OpenSSLError; end
+
+    module Digest
+      class Digest
+        class << self
+          def digest(name, data)
+            self.new(name, data).digest
+          end
+          def hexdigest(name, data)
+            self.new(name, data).hexdigest
+          end
+        end
+
+        attr_reader :algorithm, :name, :data
+
+        def initialize(name, data = nil)
+          @name = name
+          @data = ""
+          create_digest
+          update(data) if data
+        end
+
+        def initialize_copy(dig)
+          initialize(dig.name, dig.data)
+        end
+
+        def update(d)
+          @data << d
+          @md.update(d.to_java_bytes)
+          self
+        end
+        alias_method :<<, :update
+
+        def digest
+          @md.reset
+          String.from_java_bytes @md.digest(@data.to_java_bytes)
+        end
+
+        def hexdigest
+          digest.unpack("H*")[0]
+        end
+        alias_method :to_s, :hexdigest
+        alias_method :inspect, :hexdigest
+
+        def ==(oth)
+          return false unless oth.kind_of? Digest
+          self.algorithm == oth.algorithm && self.digest == oth.digest
+        end
+
+        def reset
+          @md.reset
+          @data = ""
+        end
+
+        def size
+          @md.getDigestLength
+        end
+
+        private
+        def create_digest
+          @algorithm = case @name
+          when "DSS"
+            "SHA"
+          when "DSS1"
+            "SHA1"
+          else
+            @name
+          end
+          @md = java.security.MessageDigest.getInstance(@algorithm)
+        end
+      end
+
+      begin
+        old_verbose, $VERBOSE = $VERBOSE, nil # silence warnings
+        # from openssl/digest.rb -- define the concrete digest classes
+        alg = %w(DSS DSS1 MD2 MD4 MD5 MDC2 RIPEMD160 SHA SHA1)
+        if ::OpenSSL::OPENSSL_VERSION_NUMBER > 0x00908000
+          alg += %w(SHA224 SHA256 SHA384 SHA512)
+        end
+        alg.each{|name|
+          klass = Class.new(Digest){
+            define_method(:initialize){|*data|
+              if data.length > 1
+                raise ArgumentError,
+                "wrong number of arguments (#{data.length} for 1)"
+              end
+              super(name, data.first)
+            }
+          }
+          singleton = (class <<klass; self; end)
+          singleton.class_eval{
+            define_method(:digest){|data| Digest.digest(name, data) }
+            define_method(:hexdigest){|data| Digest.hexdigest(name, data) }
+          }
+          const_set(name, klass)
+        }
+      ensure
+        $VERBOSE = old_verbose
+      end
+    end
+
+    class HMAC
       class << self
-        def digest(name, data)
-          self.new(name, data).digest
+        def digest(dig, key, data)
+          self.new(key, dig).update(data).digest
         end
-        def hexdigest(name, data)
-          self.new(name, data).hexdigest
+
+        def hexdigest(dig, key, data)
+          self.new(key, dig).update(data).hexdigest
         end
       end
-      
-      attr_reader :algorithm, :name, :data
-      
-      def initialize(name, data = nil)
-        @name = name
+
+      attr_reader :name, :key, :data
+
+      def initialize(key, dig)
+        @name = "HMAC" + dig.algorithm
+        @key = key
         @data = ""
-        create_digest
-        update(data) if data
+        create_mac
       end
-      
-      def initialize_copy(dig)
-        initialize(dig.name, dig.data)
+
+      def initialize_copy(hmac)
+        @name = hmac.name
+        @key = hmac.key
+        @data = hmac.data
+        create_mac
       end
-      
+
       def update(d)
         @data << d
-        @md.update(d.to_java_bytes)
         self
       end
       alias_method :<<, :update
-      
+
       def digest
-        @md.reset
-        String.from_java_bytes @md.digest(@data.to_java_bytes)
+        @mac.reset
+        String.from_java_bytes @mac.doFinal(@data.to_java_bytes)
       end
-      
+
       def hexdigest
         digest.unpack("H*")[0]
       end
-      alias_method :to_s, :hexdigest
+
       alias_method :inspect, :hexdigest
-      
-      def ==(oth)
-        return false unless oth.kind_of? Digest
-        self.algorithm == oth.algorithm && self.digest == oth.digest
-      end
-      
-      def reset
-        @md.reset
-        @data = ""
-      end
-      
-      def size
-        @md.getDigestLength
-      end
-      
-      private
-      def create_digest
-        @algorithm = case @name
-        when "DSS"
-          "SHA"
-        when "DSS1"
-          "SHA1"
-        else
-          @name
-        end
-        @md = java.security.MessageDigest.getInstance(@algorithm)
-      end
-    end
-    
-    begin
-      old_verbose, $VERBOSE = $VERBOSE, nil # silence warnings
-      # from openssl/digest.rb -- define the concrete digest classes
-      alg = %w(DSS DSS1 MD2 MD4 MD5 MDC2 RIPEMD160 SHA SHA1)
-      if ::OpenSSL::OPENSSL_VERSION_NUMBER > 0x00908000
-        alg += %w(SHA224 SHA256 SHA384 SHA512)
-      end
-      alg.each{|name|
-        klass = Class.new(Digest){
-          define_method(:initialize){|*data|
-            if data.length > 1
-              raise ArgumentError,
-              "wrong number of arguments (#{data.length} for 1)"
-            end
-            super(name, data.first)
-          }
-        }
-        singleton = (class <<klass; self; end)
-        singleton.class_eval{
-          define_method(:digest){|data| Digest.digest(name, data) }
-          define_method(:hexdigest){|data| Digest.hexdigest(name, data) }
-        }
-        const_set(name, klass)
-      }
-    ensure
-      $VERBOSE = old_verbose
-    end
-  end
-  
-  class HMAC
-    class << self
-      def digest(dig, key, data)
-        self.new(key, dig).update(data).digest
-      end
+      alias_method :to_s, :hexdigest

-      def hexdigest(dig, key, data)
-        self.new(key, dig).update(data).hexdigest
+      private
+      def create_mac
+        @mac = javax.crypto.Mac.getInstance(@name)
+        @mac.init(javax.crypto.spec.SecretKeySpec.new(@key.to_java_bytes, @name))
       end
     end
-
-    attr_reader :name, :key, :data
-    
-    def initialize(key, dig)
-      @name = "HMAC" + dig.algorithm
-      @key = key
-      @data = ""
-      create_mac
-    end
-    
-    def initialize_copy(hmac)
-      @name = hmac.name
-      @key = hmac.key
-      @data = hmac.data
-      create_mac
-    end
-
-    def update(d)
-      @data << d
-      self
-    end
-    alias_method :<<, :update
-
-    def digest
-      @mac.reset
-      String.from_java_bytes @mac.doFinal(@data.to_java_bytes)
-    end
-    
-    def hexdigest
-      digest.unpack("H*")[0]
-    end
-
-    alias_method :inspect, :hexdigest
-    alias_method :to_s, :hexdigest
-    
-    private
-    def create_mac
-      @mac = javax.crypto.Mac.getInstance(@name)
-      @mac.init(javax.crypto.spec.SecretKeySpec.new(@key.to_java_bytes, @name))
-    end
-  end
-  warn %{JRuby limited openssl loaded. gem install jruby-openssl for full support.
+    warn %{JRuby limited openssl loaded. gem install jruby-openssl for full support.
 http://wiki.jruby.org/wiki/JRuby_Builtin_OpenSSL}
-end unless defined?(OpenSSL::OPENSSL_VERSION)
\ No newline at end of file
+  end
+end
\ No newline at end of file
diff --git a/lib/ruby/site_ruby/1.8/jruby/openssl/gem.rb b/lib/ruby/site_ruby/1.8/jruby/openssl/gem.rb
index a41aa47..ff3a345 100644
--- a/lib/ruby/site_ruby/1.8/jruby/openssl/gem.rb
+++ b/lib/ruby/site_ruby/1.8/jruby/openssl/gem.rb
@@ -1,17 +1,12 @@
+require 'rubygems'
+
+# try to load openssl in various ways, including from a gem
 begin
-  old_verbose, $VERBOSE = $VERBOSE, nil # silence warnings
-  require 'rubygems'
-  tried_gem = false
-  begin
-    require 'openssl.rb'
-  rescue LoadError
-    unless tried_gem
-      tried_gem = true
-      gem 'jruby-openssl'
-      retry
-    end
-  end
-ensure
-  $VERBOSE = old_verbose
+  gem 'jruby-openssl'
+  gem_success = true
+rescue Gem::LoadError => e
+  # we ignore this
+  gem_success = false
 end

+require 'openssl.rb' if gem_success