jruby-openssl 0.9.5-java → 0.9.6-java

data/lib/jopenssl18/openssl/bn.rb

@@ -14,16 +14,6 @@
   $Id$
 =end
 
-##
-# Should we care what if somebody require this file directly?
-#require 'openssl'
-
-module OpenSSL
-  class BN
-    include Comparable
-  end # BN
-end # OpenSSL
-
 ##
 # Add double dispatch to Integer
 #

data/lib/jopenssl18/openssl/cipher.rb

@@ -20,46 +20,9 @@
 
 module OpenSSL
   class Cipher
-    %w(AES CAST5 BF DES IDEA RC2 RC4 RC5).each{|name|
-      klass = Class.new(Cipher){
-        define_method(:initialize){|*args|
-          cipher_name = args.inject(name){|n, arg| "#{n}-#{arg}" }
-          super(cipher_name)
-        }
-      }
-      const_set(name, klass)
-    }
-
-    %w(128 192 256).each{|keylen|
-      klass = Class.new(Cipher){
-        define_method(:initialize){|mode|
-          mode ||= "CBC"
-          cipher_name = "AES-#{keylen}-#{mode}"
-          super(cipher_name)
-        }
-      }
-      const_set("AES#{keylen}", klass)
-    }
-
-    # Generate, set, and return a random key.
-    # You must call cipher.encrypt or cipher.decrypt before calling this method.
-    def random_key
-      str = OpenSSL::Random.random_bytes(self.key_len)
-      self.key = str
-      return str
-    end
-
-    # Generate, set, and return a random iv.
-    # You must call cipher.encrypt or cipher.decrypt before calling this method.
-    def random_iv
-      str = OpenSSL::Random.random_bytes(self.iv_len)
-      self.iv = str
-      return str
-    end
-
     # This class is only provided for backwards compatibility.  Use OpenSSL::Digest in the future.
     class Cipher < Cipher
       # add warning
     end
   end # Cipher
-end # OpenSSL
+end # OpenSSL

data/lib/jopenssl18/openssl/digest.rb

@@ -20,34 +20,6 @@
 
 module OpenSSL
   class Digest
-
-    alg = %w(DSS DSS1 MD2 MD4 MD5 MDC2 RIPEMD160 SHA SHA1)
-    if OPENSSL_VERSION_NUMBER > 0x00908000
-      alg += %w(SHA224 SHA256 SHA384 SHA512)
-    end
-
-    def self.digest(name, data)
-        super(data, name)
-    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)
-    }
-
     # This class is only provided for backwards compatibility.  Use OpenSSL::Digest in the future.
     class Digest < Digest
       def initialize(*args)
@@ -55,7 +27,6 @@ module OpenSSL
         super(*args)
       end
     end
-
   end # Digest
 end # OpenSSL
 

data/lib/jopenssl18/openssl/ssl-internal.rb

@@ -19,34 +19,6 @@ require "fcntl"
 
 module OpenSSL
   module SSL
-    class SSLContext
-      DEFAULT_PARAMS = {
-        :ssl_version => "SSLv23",
-        :verify_mode => OpenSSL::SSL::VERIFY_PEER,
-        :ciphers => "ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW",
-        :options => OpenSSL::SSL::OP_ALL,
-      }
-
-      DEFAULT_CERT_STORE = OpenSSL::X509::Store.new
-      DEFAULT_CERT_STORE.set_default_paths
-      if defined?(OpenSSL::X509::V_FLAG_CRL_CHECK_ALL)
-        DEFAULT_CERT_STORE.flags = OpenSSL::X509::V_FLAG_CRL_CHECK_ALL
-      end
-
-      def set_params(params={})
-        params = DEFAULT_PARAMS.merge(params)
-        # ssl_version need to be set at first.
-        self.ssl_version = params.delete(:ssl_version)
-        params.each{|name, value| self.__send__("#{name}=", value) }
-        if self.verify_mode != OpenSSL::SSL::VERIFY_NONE
-          unless self.ca_file or self.ca_path or self.cert_store
-            self.cert_store = DEFAULT_CERT_STORE
-          end
-        end
-        return params
-      end
-    end
-
     module SocketForwarder
       def addr
         to_io.addr
@@ -95,7 +67,11 @@ module OpenSSL
             should_verify_common_name = false
             reg = Regexp.escape($1).gsub(/\\\*/, "[^.]+")
             return true if /\A#{reg}\z/i =~ hostname
-          elsif /\AIP Address:(.*)/ =~ general_name
+          # NOTE: somehow we need the IP: canonical form
+          # seems there were failures elsewhere when not
+          # not sure how that's possible possible to-do!
+          elsif /\AIP(?: Address)?:(.*)/ =~ general_name
+          #elsif /\AIP Address:(.*)/ =~ general_name
             should_verify_common_name = false
             return true if $1 == hostname
           end

data/lib/jopenssl18/openssl/x509-internal.rb

@@ -16,49 +16,6 @@
 
 module OpenSSL
   module X509
-    class ExtensionFactory
-      def create_extension(*arg)
-        if arg.size > 1
-          create_ext(*arg)
-        else
-          send("create_ext_from_"+arg[0].class.name.downcase, arg[0])
-        end
-      end
-
-      def create_ext_from_array(ary)
-        raise ExtensionError, "unexpected array form" if ary.size > 3
-        create_ext(ary[0], ary[1], ary[2])
-      end
-
-      def create_ext_from_string(str) # "oid = critical, value"
-        oid, value = str.split(/=/, 2)
-        oid.strip!
-        value.strip!
-        create_ext(oid, value)
-      end
-
-      def create_ext_from_hash(hash)
-        create_ext(hash["oid"], hash["value"], hash["critical"])
-      end
-    end
-
-    class Extension
-      def to_s # "oid = critical, value"
-        str = self.oid
-        str << " = "
-        str << "critical, " if self.critical?
-        str << self.value.gsub(/\n/, ", ")
-      end
-
-      def to_h # {"oid"=>sn|ln, "value"=>value, "critical"=>true|false}
-        {"oid"=>self.oid,"value"=>self.value,"critical"=>self.critical?}
-      end
-
-      def to_a
-        [ self.oid, self.value, self.critical? ]
-      end
-    end
-
     class Name
       module RFC2253DN
         Special = ',=+<>#;'

data/lib/jopenssl19/openssl.rb

@@ -20,4 +20,3 @@ require 'openssl/config'
 require 'openssl/digest'
 require 'openssl/ssl-internal'
 require 'openssl/x509-internal'
-require 'krypt/ossl'

data/lib/jopenssl19/openssl/bn.rb

@@ -3,33 +3,27 @@
 # $RCSfile$
 #
 # = Ruby-space definitions that completes C-space funcs for BN
-# 
+#
 # = Info
 # 'OpenSSL for Ruby 2' project
 # Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
 # All rights reserved.
-# 
+#
 # = Licence
 # This program is licenced under the same licence as Ruby.
 # (See the file 'LICENCE'.)
-# 
+#
 # = Version
 # $Id$
 #
 #++
 
-module OpenSSL
-  class BN
-    include Comparable
-  end # BN
-end # OpenSSL
-
 ##
 # Add double dispatch to Integer
 #
 class Integer
   def to_bn
-    OpenSSL::BN::new(self.to_s(16), 16)
+    OpenSSL::BN::new(self)
   end
 end # Integer
 

data/lib/jopenssl19/openssl/cipher.rb

@@ -3,16 +3,16 @@
 # $RCSfile$
 #
 # = Ruby-space predefined Cipher subclasses
-# 
+#
 # = Info
 # 'OpenSSL for Ruby 2' project
 # Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
 # All rights reserved.
-# 
+#
 # = Licence
 # This program is licenced under the same licence as Ruby.
 # (See the file 'LICENCE'.)
-# 
+#
 # = Version
 # $Id$
 #
@@ -20,46 +20,9 @@
 
 module OpenSSL
   class Cipher
-    %w(AES CAST5 BF DES IDEA RC2 RC4 RC5).each{|name|
-      klass = Class.new(Cipher){
-        define_method(:initialize){|*args|
-          cipher_name = args.inject(name){|n, arg| "#{n}-#{arg}" }
-          super(cipher_name)
-        }
-      }
-      const_set(name, klass)
-    }
-
-    %w(128 192 256).each{|keylen|
-      klass = Class.new(Cipher){
-        define_method(:initialize){|mode|
-          mode ||= "CBC"
-          cipher_name = "AES-#{keylen}-#{mode}"
-          super(cipher_name)
-        }
-      }
-      const_set("AES#{keylen}", klass)
-    }
-
-    # Generate, set, and return a random key.
-    # You must call cipher.encrypt or cipher.decrypt before calling this method.
-    def random_key
-      str = OpenSSL::Random.random_bytes(self.key_len)
-      self.key = str
-      return str
-    end
-
-    # Generate, set, and return a random iv.
-    # You must call cipher.encrypt or cipher.decrypt before calling this method.
-    def random_iv
-      str = OpenSSL::Random.random_bytes(self.iv_len)
-      self.iv = str
-      return str
-    end
-
     # This class is only provided for backwards compatibility.  Use OpenSSL::Cipher in the future.
     class Cipher < Cipher
       # add warning
     end
   end # Cipher
-end # OpenSSL
+end # OpenSSL

data/lib/jopenssl19/openssl/digest.rb

@@ -3,16 +3,16 @@
 # $RCSfile$
 #
 # = Ruby-space predefined Digest subclasses
-# 
+#
 # = Info
 # 'OpenSSL for Ruby 2' project
 # Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
 # All rights reserved.
-# 
+#
 # = Licence
 # This program is licenced under the same licence as Ruby.
 # (See the file 'LICENCE'.)
-# 
+#
 # = Version
 # $Id$
 #
@@ -20,45 +20,6 @@
 
 module OpenSSL
   class Digest
-
-    alg = %w(DSS DSS1 MD2 MD4 MD5 MDC2 RIPEMD160 SHA SHA1)
-    if OPENSSL_VERSION_NUMBER > 0x00908000
-      alg += %w(SHA224 SHA256 SHA384 SHA512)
-    end
-
-    # Return the +data+ hash computed with +name+ Digest. +name+ is either the
-    # long name or short name of a supported digest algorithm.
-    #
-    # === Examples
-    #
-    #   OpenSSL::Digest.digest("SHA256, "abc")
-    #
-    # which is equivalent to:
-    #
-    #   OpenSSL::Digest::SHA256.digest("abc")
-
-    def self.digest(name, data)
-        super(data, name)
-    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)
-    }
-
     # This class is only provided for backwards compatibility.  Use OpenSSL::Digest in the future.
     class Digest < Digest
       def initialize(*args)
@@ -66,7 +27,6 @@ module OpenSSL
         super(*args)
       end
     end
-
   end # Digest
 end # OpenSSL
 

data/lib/jopenssl19/openssl/ssl-internal.rb

@@ -19,32 +19,6 @@ require "fcntl"
 
 module OpenSSL
   module SSL
-    class SSLContext
-      DEFAULT_PARAMS = {
-        :ssl_version => "SSLv23",
-        :verify_mode => OpenSSL::SSL::VERIFY_PEER,
-        :ciphers => "ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW",
-        :options => OpenSSL::SSL::OP_ALL,
-      }
-
-      DEFAULT_CERT_STORE = OpenSSL::X509::Store.new
-      DEFAULT_CERT_STORE.set_default_paths
-      if defined?(OpenSSL::X509::V_FLAG_CRL_CHECK_ALL)
-        DEFAULT_CERT_STORE.flags = OpenSSL::X509::V_FLAG_CRL_CHECK_ALL
-      end
-
-      def set_params(params={})
-        params = DEFAULT_PARAMS.merge(params)
-        params.each{|name, value| self.__send__("#{name}=", value) }
-        if self.verify_mode != OpenSSL::SSL::VERIFY_NONE
-          unless self.ca_file or self.ca_path or self.cert_store
-            self.cert_store = DEFAULT_CERT_STORE
-          end
-        end
-        return params
-      end
-    end
-
     module SocketForwarder
       def addr
         to_io.addr
@@ -93,7 +67,11 @@ module OpenSSL
             should_verify_common_name = false
             reg = Regexp.escape($1).gsub(/\\\*/, "[^.]+")
             return true if /\A#{reg}\z/i =~ hostname
-          elsif /\AIP Address:(.*)/ =~ general_name
+          # NOTE: somehow we need the IP: canonical form
+          # seems there were failures elsewhere when not
+          # not sure how that's possible possible to-do!
+          elsif /\AIP(?: Address)?:(.*)/ =~ general_name
+          #elsif /\AIP Address:(.*)/ =~ general_name
             should_verify_common_name = false
             return true if $1 == hostname
           end

data/lib/jopenssl19/openssl/x509-internal.rb

@@ -16,49 +16,6 @@
 
 module OpenSSL
   module X509
-    class ExtensionFactory
-      def create_extension(*arg)
-        if arg.size > 1
-          create_ext(*arg)
-        else
-          send("create_ext_from_"+arg[0].class.name.downcase, arg[0])
-        end
-      end
-
-      def create_ext_from_array(ary)
-        raise ExtensionError, "unexpected array form" if ary.size > 3
-        create_ext(ary[0], ary[1], ary[2])
-      end
-
-      def create_ext_from_string(str) # "oid = critical, value"
-        oid, value = str.split(/=/, 2)
-        oid.strip!
-        value.strip!
-        create_ext(oid, value)
-      end
-
-      def create_ext_from_hash(hash)
-        create_ext(hash["oid"], hash["value"], hash["critical"])
-      end
-    end
-
-    class Extension
-      def to_s # "oid = critical, value"
-        str = self.oid
-        str << " = "
-        str << "critical, " if self.critical?
-        str << self.value.gsub(/\n/, ", ")
-      end
-
-      def to_h # {"oid"=>sn|ln, "value"=>value, "critical"=>true|false}
-        {"oid"=>self.oid,"value"=>self.value,"critical"=>self.critical?}
-      end
-
-      def to_a
-        [ self.oid, self.value, self.critical? ]
-      end
-    end
-
     class Name
       module RFC2253DN
         Special = ',=+<>#;'