jruby-openssl 0.9.7-java → 0.9.8-java

data/lib/jopenssl22/openssl/x509.rb

@@ -0,0 +1,139 @@
+#--
+#
+# $RCSfile$
+#
+# = Ruby-space definitions that completes C-space funcs for X509 and 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$
+#
+#++
+
+module OpenSSL
+  module X509
+    class Name
+      module RFC2253DN
+        Special = ',=+<>#;'
+        HexChar = /[0-9a-fA-F]/
+        HexPair = /#{HexChar}#{HexChar}/
+        HexString = /#{HexPair}+/
+        Pair = /\\(?:[#{Special}]|\\|"|#{HexPair})/
+        StringChar = /[^\\"#{Special}]/
+        QuoteChar = /[^\\"]/
+        AttributeType = /[a-zA-Z][0-9a-zA-Z]*|[0-9]+(?:\.[0-9]+)*/
+        AttributeValue = /
+          (?!["#])((?:#{StringChar}|#{Pair})*)|
+          \#(#{HexString})|
+          "((?:#{QuoteChar}|#{Pair})*)"
+        /x
+        TypeAndValue = /\A(#{AttributeType})=#{AttributeValue}/
+
+        module_function
+
+        def expand_pair(str)
+          return nil unless str
+          return str.gsub(Pair){
+            pair = $&
+            case pair.size
+            when 2 then pair[1,1]
+            when 3 then Integer("0x#{pair[1,2]}").chr
+            else raise OpenSSL::X509::NameError, "invalid pair: #{str}"
+            end
+          }
+        end
+
+        def expand_hexstring(str)
+          return nil unless str
+          der = str.gsub(HexPair){$&.to_i(16).chr }
+          a1 = OpenSSL::ASN1.decode(der)
+          return a1.value, a1.tag
+        end
+
+        def expand_value(str1, str2, str3)
+          value = expand_pair(str1)
+          value, tag = expand_hexstring(str2) unless value
+          value = expand_pair(str3) unless value
+          return value, tag
+        end
+
+        def scan(dn)
+          str = dn
+          ary = []
+          while true
+            if md = TypeAndValue.match(str)
+              remain = md.post_match
+              type = md[1]
+              value, tag = expand_value(md[2], md[3], md[4]) rescue nil
+              if value
+                type_and_value = [type, value]
+                type_and_value.push(tag) if tag
+                ary.unshift(type_and_value)
+                if remain.length > 2 && remain[0] == ?,
+                  str = remain[1..-1]
+                  next
+                elsif remain.length > 2 && remain[0] == ?+
+                  raise OpenSSL::X509::NameError,
+                    "multi-valued RDN is not supported: #{dn}"
+                elsif remain.empty?
+                  break
+                end
+              end
+            end
+            msg_dn = dn[0, dn.length - str.length] + " =>" + str
+            raise OpenSSL::X509::NameError, "malformed RDN: #{msg_dn}"
+          end
+          return ary
+        end
+      end
+
+      class << self
+        def parse_rfc2253(str, template=OBJECT_TYPE_TEMPLATE)
+          ary = OpenSSL::X509::Name::RFC2253DN.scan(str)
+          self.new(ary, template)
+        end
+
+        def parse_openssl(str, template=OBJECT_TYPE_TEMPLATE)
+          ary = str.scan(/\s*([^\/,]+)\s*/).collect{|i| i[0].split("=", 2) }
+          self.new(ary, template)
+        end
+
+        alias parse parse_openssl
+      end
+
+      def pretty_print(q)
+        q.object_group(self) {
+          q.text ' '
+          q.text to_s(OpenSSL::X509::Name::RFC2253)
+        }
+      end
+    end
+
+    class StoreContext
+      def cleanup
+        warn "(#{caller.first}) OpenSSL::X509::StoreContext#cleanup is deprecated with no replacement" if $VERBOSE
+      end
+    end
+
+    class Certificate
+      def pretty_print(q)
+        q.object_group(self) {
+          q.breakable
+          q.text 'subject='; q.pp self.subject; q.text ','; q.breakable
+          q.text 'issuer='; q.pp self.issuer; q.text ','; q.breakable
+          q.text 'serial='; q.pp self.serial; q.text ','; q.breakable
+          q.text 'not_before='; q.pp self.not_before; q.text ','; q.breakable
+          q.text 'not_after='; q.pp self.not_after
+        }
+      end
+    end
+  end
+end

data/lib/openssl/bn.rb

@@ -1,7 +1,9 @@
-if RUBY_VERSION >= '2.1.0'
-  load('jopenssl21/openssl/bn.rb')
-elsif RUBY_VERSION >= '1.9.0'
-  load('jopenssl19/openssl/bn.rb')
+if RUBY_VERSION > '2.2'
+  load "jopenssl22/openssl/#{File.basename(__FILE__)}"
+elsif RUBY_VERSION > '2.1'
+  load "jopenssl21/openssl/#{File.basename(__FILE__)}"
+elsif RUBY_VERSION > '1.9'
+  load "jopenssl19/openssl/#{File.basename(__FILE__)}"
 else
-  load('jopenssl18/openssl/bn.rb')
-end
+  load "jopenssl18/openssl/#{File.basename(__FILE__)}"
+end

data/lib/openssl/buffering.rb

@@ -1,7 +1,9 @@
-if RUBY_VERSION >= '2.1.0'
-  load('jopenssl21/openssl/buffering.rb')
-elsif RUBY_VERSION >= '1.9.0'
-  load('jopenssl19/openssl/buffering.rb')
+if RUBY_VERSION > '2.2'
+  load "jopenssl22/openssl/#{File.basename(__FILE__)}"
+elsif RUBY_VERSION > '2.1'
+  load "jopenssl21/openssl/#{File.basename(__FILE__)}"
+elsif RUBY_VERSION > '1.9'
+  load "jopenssl19/openssl/#{File.basename(__FILE__)}"
 else
-  load('jopenssl18/openssl/buffering.rb')
-end
+  load "jopenssl18/openssl/#{File.basename(__FILE__)}"
+end

data/lib/openssl/cipher.rb

@@ -1,7 +1,9 @@
-if RUBY_VERSION >= '2.1.0'
-  load('jopenssl21/openssl/cipher.rb')
-elsif RUBY_VERSION >= '1.9.0'
-  load('jopenssl19/openssl/cipher.rb')
+if RUBY_VERSION > '2.2'
+  load "jopenssl22/openssl/#{File.basename(__FILE__)}"
+elsif RUBY_VERSION > '2.1'
+  load "jopenssl21/openssl/#{File.basename(__FILE__)}"
+elsif RUBY_VERSION > '1.9'
+  load "jopenssl19/openssl/#{File.basename(__FILE__)}"
 else
-  load('jopenssl18/openssl/cipher.rb')
-end
+  load "jopenssl18/openssl/#{File.basename(__FILE__)}"
+end

data/lib/openssl/config.rb

@@ -1,7 +1,9 @@
-if RUBY_VERSION >= '2.1.0'
-  load('jopenssl21/openssl/config.rb')
-elsif RUBY_VERSION >= '1.9.0'
-  load('jopenssl19/openssl/config.rb')
+if RUBY_VERSION > '2.2'
+  load "jopenssl22/openssl/#{File.basename(__FILE__)}"
+elsif RUBY_VERSION > '2.1'
+  load "jopenssl21/openssl/#{File.basename(__FILE__)}"
+elsif RUBY_VERSION > '1.9'
+  load "jopenssl19/openssl/#{File.basename(__FILE__)}"
 else
-  load('jopenssl18/openssl/config.rb')
-end
+  load "jopenssl18/openssl/#{File.basename(__FILE__)}"
+end

data/lib/openssl/digest.rb

@@ -1,7 +1,9 @@
-if RUBY_VERSION >= '2.1.0'
-  load('jopenssl21/openssl/digest.rb')
-elsif RUBY_VERSION >= '1.9.0'
-  load('jopenssl19/openssl/digest.rb')
+if RUBY_VERSION > '2.2'
+  load "jopenssl22/openssl/#{File.basename(__FILE__)}"
+elsif RUBY_VERSION > '2.1'
+  load "jopenssl21/openssl/#{File.basename(__FILE__)}"
+elsif RUBY_VERSION > '1.9'
+  load "jopenssl19/openssl/#{File.basename(__FILE__)}"
 else
-  load('jopenssl18/openssl/digest.rb')
-end
+  load "jopenssl18/openssl/#{File.basename(__FILE__)}"
+end

data/lib/openssl/pkcs12.rb

@@ -72,11 +72,11 @@ module OpenSSL
                 end
             end
           end
+          break
         end
-        break
       end
     rescue java.lang.Exception => e
-      raise PKCS12Error, "Exception: #{e}"
+      raise PKCS12Error, e.inspect
     end
 
     def generate(pass, alias_name, key, cert, ca = nil)
@@ -93,7 +93,7 @@ module OpenSSL
       rescue java.security.KeyStoreException, java.security.cert.CertificateException => e
         raise PKCS12Error, e.message
       rescue java.security.GeneralSecurityException, java.io.IOException => e
-        raise PKCS12Error, "Exception: #{e}"
+        raise PKCS12Error, e.inspect
       end
 
       @der = String.from_java_bytes(der_bytes)

data/lib/openssl/pkcs7.rb

@@ -1,7 +1,9 @@
-if RUBY_VERSION >= '2.1.0'
+if RUBY_VERSION > '2.2'
+  raise LoadError, "no such library in 2.2: openssl/pkcs7"
+elsif RUBY_VERSION > '2.1'
   raise LoadError, "no such library in 2.1: openssl/pkcs7"
-elsif RUBY_VERSION >= '1.9.0'
+elsif RUBY_VERSION > '1.9'
   raise LoadError, "no such library in 1.9: openssl/pkcs7"
 else
-  load('jopenssl18/openssl/pkcs7.rb')
-end
+  load "jopenssl18/openssl/pkcs7.rb"
+end

data/lib/openssl/ssl-internal.rb

@@ -1,7 +1,9 @@
-if RUBY_VERSION >= '2.1.0'
+if RUBY_VERSION > '2.2'
+  raise LoadError, "no such library in 2.2: openssl/ssl-internal.rb"
+elsif RUBY_VERSION > '2.1'
   raise LoadError, "no such library in 2.1: openssl/ssl-internal.rb"
-elsif RUBY_VERSION >= '1.9.0'
-  load('jopenssl19/openssl/ssl-internal.rb')
+elsif RUBY_VERSION > '1.9'
+  load "jopenssl19/openssl/#{File.basename(__FILE__)}"
 else
-  load('jopenssl18/openssl/ssl-internal.rb')
-end
+  load "jopenssl18/openssl/#{File.basename(__FILE__)}"
+end

data/lib/openssl/ssl.rb

@@ -1,7 +1,9 @@
-if RUBY_VERSION >= '2.1.0'
-  load('jopenssl21/openssl/ssl.rb')
-elsif RUBY_VERSION >= '1.9.0'
-  load('jopenssl19/openssl/ssl.rb')
+if RUBY_VERSION > '2.2'
+  load "jopenssl22/openssl/#{File.basename(__FILE__)}"
+elsif RUBY_VERSION > '2.1'
+  load "jopenssl21/openssl/#{File.basename(__FILE__)}"
+elsif RUBY_VERSION > '1.9'
+  load "jopenssl19/openssl/#{File.basename(__FILE__)}"
 else
-  load('jopenssl18/openssl/ssl.rb')
-end
+  load "jopenssl18/openssl/#{File.basename(__FILE__)}"
+end

data/lib/openssl/x509-internal.rb

@@ -1,7 +1,9 @@
-if RUBY_VERSION >= '2.1.0'
+if RUBY_VERSION > '2.2'
+  raise LoadError, "no such library in 2.2: openssl/x509-internal.rb"
+elsif RUBY_VERSION > '2.1'
   raise LoadError, "no such library in 2.1: openssl/x509-internal.rb"
-elsif RUBY_VERSION >= '1.9.0'
-  load('jopenssl19/openssl/x509-internal.rb')
+elsif RUBY_VERSION > '1.9'
+  load "jopenssl19/openssl/#{File.basename(__FILE__)}"
 else
-  load('jopenssl18/openssl/x509-internal.rb')
-end
+  load "jopenssl18/openssl/#{File.basename(__FILE__)}"
+end

data/lib/openssl/x509.rb

@@ -1,7 +1,9 @@
-if RUBY_VERSION >= '2.1.0'
-  load('jopenssl21/openssl/x509.rb')
-elsif RUBY_VERSION >= '1.9.0'
-  load('jopenssl19/openssl/x509.rb')
+if RUBY_VERSION > '2.2'
+  load "jopenssl22/openssl/#{File.basename(__FILE__)}"
+elsif RUBY_VERSION > '2.1'
+  load "jopenssl21/openssl/#{File.basename(__FILE__)}"
+elsif RUBY_VERSION > '1.9'
+  load "jopenssl19/openssl/#{File.basename(__FILE__)}"
 else
-  load('jopenssl18/openssl/x509.rb')
-end
+  load "jopenssl18/openssl/#{File.basename(__FILE__)}"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby-openssl
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: java
 authors:
 - Ola Bini
@@ -9,50 +9,50 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: jar-dependencies
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0
-  name: jar-dependencies
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: mocha
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
-- !ruby/object:Gem::Dependency
+        version: 1.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
-  name: mocha
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: ruby-maven
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: ruby-maven
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.
 email: ola.bini@gmail.com
 executables: []
@@ -94,6 +94,14 @@ files:
 - lib/jopenssl21/openssl/digest.rb
 - lib/jopenssl21/openssl/ssl.rb
 - lib/jopenssl21/openssl/x509.rb
+- lib/jopenssl22/openssl.rb
+- lib/jopenssl22/openssl/bn.rb
+- lib/jopenssl22/openssl/buffering.rb
+- lib/jopenssl22/openssl/cipher.rb
+- lib/jopenssl22/openssl/config.rb
+- lib/jopenssl22/openssl/digest.rb
+- lib/jopenssl22/openssl/ssl.rb
+- lib/jopenssl22/openssl/x509.rb
 - lib/jruby-openssl.rb
 - lib/openssl.rb
 - lib/openssl/bn.rb