jruby-openssl 0.11.0.cr1-java → 0.12.2-java

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby-openssl
 version: !ruby/object:Gem::Version
-  version: 0.11.0.cr1
+  version: 0.12.2
 platform: java
 authors:
 - Karol Bucek
@@ -10,9 +10,10 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies: []
-description: JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.
+description: JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL
+  native library.
 email: self+jruby-openssl@kares.org
 executables: []
 extensions: []
@@ -27,41 +28,6 @@ files:
 - lib/jopenssl/_compat23.rb
 - lib/jopenssl/load.rb
 - lib/jopenssl/version.rb
-- lib/jopenssl19/openssl.rb
-- lib/jopenssl19/openssl/bn.rb
-- lib/jopenssl19/openssl/buffering.rb
-- lib/jopenssl19/openssl/cipher.rb
-- lib/jopenssl19/openssl/config.rb
-- lib/jopenssl19/openssl/digest.rb
-- lib/jopenssl19/openssl/ssl-internal.rb
-- lib/jopenssl19/openssl/ssl.rb
-- lib/jopenssl19/openssl/x509-internal.rb
-- lib/jopenssl19/openssl/x509.rb
-- lib/jopenssl21/openssl.rb
-- lib/jopenssl21/openssl/bn.rb
-- lib/jopenssl21/openssl/buffering.rb
-- lib/jopenssl21/openssl/cipher.rb
-- lib/jopenssl21/openssl/config.rb
-- 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/jopenssl23/openssl.rb
-- lib/jopenssl23/openssl/bn.rb
-- lib/jopenssl23/openssl/buffering.rb
-- lib/jopenssl23/openssl/cipher.rb
-- lib/jopenssl23/openssl/config.rb
-- lib/jopenssl23/openssl/digest.rb
-- lib/jopenssl23/openssl/pkey.rb
-- lib/jopenssl23/openssl/ssl.rb
-- lib/jopenssl23/openssl/x509.rb
 - lib/jruby-openssl.rb
 - lib/openssl.rb
 - lib/openssl/bn.rb
@@ -69,12 +35,12 @@ files:
 - lib/openssl/cipher.rb
 - lib/openssl/config.rb
 - lib/openssl/digest.rb
+- lib/openssl/hmac.rb
+- lib/openssl/marshal.rb
 - lib/openssl/pkcs12.rb
 - lib/openssl/pkcs5.rb
 - lib/openssl/pkey.rb
-- lib/openssl/ssl-internal.rb
 - lib/openssl/ssl.rb
-- lib/openssl/x509-internal.rb
 - lib/openssl/x509.rb
 - lib/org/bouncycastle/bcpkix-jdk15on/1.68/bcpkix-jdk15on-1.68.jar
 - lib/org/bouncycastle/bcprov-jdk15on/1.68/bcprov-jdk15on-1.68.jar
@@ -94,18 +60,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.8
+      version: '0'
 requirements:
 - jar org.bouncycastle:bcprov-jdk15on, 1.68
 - jar org.bouncycastle:bcpkix-jdk15on, 1.68
 - jar org.bouncycastle:bctls-jdk15on,  1.68
-rubyforge_project:
-rubygems_version: 2.6.14.1
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: JRuby OpenSSL

data/lib/jopenssl19/openssl/bn.rb

@@ -1,29 +0,0 @@
-#--
-#
-# $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$
-#
-#++
-
-##
-# Add double dispatch to Integer
-#
-class Integer
-  def to_bn
-    OpenSSL::BN::new(self)
-  end
-end # Integer
-

data/lib/jopenssl19/openssl/buffering.rb

@@ -1,449 +0,0 @@
-=begin
-= $RCSfile$ -- Buffering mix-in module.
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id$
-=end
-
-##
-# OpenSSL IO buffering mix-in module.
-#
-# This module allows an OpenSSL::SSL::SSLSocket to behave like an IO.
-
-module OpenSSL::Buffering
-  include Enumerable
-
-  ##
-  # The "sync mode" of the SSLSocket.
-  #
-  # See IO#sync for full details.
-
-  attr_accessor :sync
-
-  ##
-  # Default size to read from or write to the SSLSocket for buffer operations.
-
-  BLOCK_SIZE = 1024*16
-
-  def initialize(*args)
-    @eof = false
-    @rbuffer = ""
-    @sync = @io.sync
-  end
-
-  #
-  # for reading.
-  #
-  private
-
-  ##
-  # Fills the buffer from the underlying SSLSocket
-
-  def fill_rbuff
-    begin
-      @rbuffer << self.sysread(BLOCK_SIZE)
-    rescue Errno::EAGAIN
-      retry
-    rescue EOFError
-      @eof = true
-    end
-  end
-
-  ##
-  # Consumes +size+ bytes from the buffer
-
-  def consume_rbuff(size=nil)
-    if @rbuffer.empty?
-      nil
-    else
-      size = @rbuffer.size unless size
-      ret = @rbuffer[0, size]
-      @rbuffer[0, size] = ""
-      ret
-    end
-  end
-
-  public
-
-  ##
-  # Reads +size+ bytes from the stream.  If +buf+ is provided it must
-  # reference a string which will receive the data.
-  #
-  # See IO#read for full details.
-
-  def read(size=nil, buf=nil)
-    if size == 0
-      if buf
-        buf.clear
-        return buf
-      else
-        return ""
-      end
-    end
-    until @eof
-      break if size && size <= @rbuffer.size
-      fill_rbuff
-    end
-    ret = consume_rbuff(size) || ""
-    if buf
-      buf.replace(ret)
-      ret = buf
-    end
-    (size && ret.empty?) ? nil : ret
-  end
-
-  ##
-  # Reads at most +maxlen+ bytes from the stream.  If +buf+ is provided it
-  # must reference a string which will receive the data.
-  #
-  # See IO#readpartial for full details.
-
-  def readpartial(maxlen, buf=nil)
-    if maxlen == 0
-      if buf
-        buf.clear
-        return buf
-      else
-        return ""
-      end
-    end
-    if @rbuffer.empty?
-      begin
-        return sysread(maxlen, buf)
-      rescue Errno::EAGAIN
-        retry
-      end
-    end
-    ret = consume_rbuff(maxlen)
-    if buf
-      buf.replace(ret)
-      ret = buf
-    end
-    raise EOFError if ret.empty?
-    ret
-  end
-
-  ##
-  # Reads at most +maxlen+ bytes in the non-blocking manner.
-  #
-  # When no data can be read without blocking it raises
-  # OpenSSL::SSL::SSLError extended by IO::WaitReadable or IO::WaitWritable.
-  #
-  # IO::WaitReadable means SSL needs to read internally so read_nonblock
-  # should be called again when the underlying IO is readable.
-  #
-  # IO::WaitWritable means SSL needs to write internally so read_nonblock
-  # should be called again after the underlying IO is writable.
-  #
-  # OpenSSL::Buffering#read_nonblock needs two rescue clause as follows:
-  #
-  #   # emulates blocking read (readpartial).
-  #   begin
-  #     result = ssl.read_nonblock(maxlen)
-  #   rescue IO::WaitReadable
-  #     IO.select([io])
-  #     retry
-  #   rescue IO::WaitWritable
-  #     IO.select(nil, [io])
-  #     retry
-  #   end
-  #
-  # Note that one reason that read_nonblock writes to the underlying IO is
-  # when the peer requests a new TLS/SSL handshake.  See openssl the FAQ for
-  # more details.  http://www.openssl.org/support/faq.html
-
-  def read_nonblock(maxlen, buf=nil)
-    if maxlen == 0
-      if buf
-        buf.clear
-        return buf
-      else
-        return ""
-      end
-    end
-    if @rbuffer.empty?
-      return sysread_nonblock(maxlen, buf)
-    end
-    ret = consume_rbuff(maxlen)
-    if buf
-      buf.replace(ret)
-      ret = buf
-    end
-    raise EOFError if ret.empty?
-    ret
-  end
-
-  ##
-  # Reads the next "line+ from the stream.  Lines are separated by +eol+.  If
-  # +limit+ is provided the result will not be longer than the given number of
-  # bytes.
-  #
-  # +eol+ may be a String or Regexp.
-  #
-  # Unlike IO#gets the line read will not be assigned to +$_+.
-  #
-  # Unlike IO#gets the separator must be provided if a limit is provided.
-
-  def gets(eol=$/, limit=nil)
-    idx = @rbuffer.index(eol)
-    until @eof
-      break if idx
-      fill_rbuff
-      idx = @rbuffer.index(eol)
-    end
-    if eol.is_a?(Regexp)
-      size = idx ? idx+$&.size : nil
-    else
-      size = idx ? idx+eol.size : nil
-    end
-    if limit and limit >= 0
-      size = [size, limit].min
-    end
-    consume_rbuff(size)
-  end
-
-  ##
-  # Executes the block for every line in the stream where lines are separated
-  # by +eol+.
-  #
-  # See also #gets
-
-  def each(eol=$/)
-    while line = self.gets(eol)
-      yield line
-    end
-  end
-  alias each_line each
-
-  ##
-  # Reads lines from the stream which are separated by +eol+.
-  #
-  # See also #gets
-
-  def readlines(eol=$/)
-    ary = []
-    while line = self.gets(eol)
-      ary << line
-    end
-    ary
-  end
-
-  ##
-  # Reads a line from the stream which is separated by +eol+.
-  #
-  # Raises EOFError if at end of file.
-
-  def readline(eol=$/)
-    raise EOFError if eof?
-    gets(eol)
-  end
-
-  ##
-  # Reads one character from the stream.  Returns nil if called at end of
-  # file.
-
-  def getc
-    read(1)
-  end
-
-  ##
-  # Calls the given block once for each byte in the stream.
-
-  def each_byte # :yields: byte
-    while c = getc
-      yield(c.ord)
-    end
-  end
-
-  ##
-  # Reads a one-character string from the stream.  Raises an EOFError at end
-  # of file.
-
-  def readchar
-    raise EOFError if eof?
-    getc
-  end
-
-  ##
-  # Pushes character +c+ back onto the stream such that a subsequent buffered
-  # character read will return it.
-  #
-  # Unlike IO#getc multiple bytes may be pushed back onto the stream.
-  #
-  # Has no effect on unbuffered reads (such as #sysread).
-
-  def ungetc(c)
-    @rbuffer[0,0] = c.chr
-  end
-
-  ##
-  # Returns true if the stream is at file which means there is no more data to
-  # be read.
-
-  def eof?
-    fill_rbuff if !@eof && @rbuffer.empty?
-    @eof && @rbuffer.empty?
-  end
-  alias eof eof?
-
-  #
-  # for writing.
-  #
-  private
-
-  ##
-  # Writes +s+ to the buffer.  When the buffer is full or #sync is true the
-  # buffer is flushed to the underlying socket.
-
-  def do_write(s)
-    @wbuffer = "" unless defined? @wbuffer
-    @wbuffer << s
-    @wbuffer.force_encoding(Encoding::BINARY)
-    @sync ||= false
-    if @sync or @wbuffer.size > BLOCK_SIZE or idx = @wbuffer.rindex($/)
-      remain = idx ? idx + $/.size : @wbuffer.length
-      nwritten = 0
-      while remain > 0
-        str = @wbuffer[nwritten,remain]
-        begin
-          nwrote = syswrite(str)
-        rescue Errno::EAGAIN
-          retry
-        end
-        remain -= nwrote
-        nwritten += nwrote
-      end
-      @wbuffer[0,nwritten] = ""
-    end
-  end
-
-  public
-
-  ##
-  # Writes +s+ to the stream.  If the argument is not a string it will be
-  # converted using String#to_s.  Returns the number of bytes written.
-
-  def write(s)
-    do_write(s)
-    s.bytesize
-  end
-
-  ##
-  # Writes +str+ in the non-blocking manner.
-  #
-  # If there is buffered data, it is flushed first.  This may block.
-  #
-  # write_nonblock returns number of bytes written to the SSL connection.
-  #
-  # When no data can be written without blocking it raises
-  # OpenSSL::SSL::SSLError extended by IO::WaitReadable or IO::WaitWritable.
-  #
-  # IO::WaitReadable means SSL needs to read internally so write_nonblock
-  # should be called again after the underlying IO is readable.
-  #
-  # IO::WaitWritable means SSL needs to write internally so write_nonblock
-  # should be called again after underlying IO is writable.
-  #
-  # So OpenSSL::Buffering#write_nonblock needs two rescue clause as follows.
-  #
-  #   # emulates blocking write.
-  #   begin
-  #     result = ssl.write_nonblock(str)
-  #   rescue IO::WaitReadable
-  #     IO.select([io])
-  #     retry
-  #   rescue IO::WaitWritable
-  #     IO.select(nil, [io])
-  #     retry
-  #   end
-  #
-  # Note that one reason that write_nonblock reads from the underlying IO
-  # is when the peer requests a new TLS/SSL handshake.  See the openssl FAQ
-  # for more details.  http://www.openssl.org/support/faq.html
-
-  def write_nonblock(s)
-    flush
-    syswrite_nonblock(s)
-  end
-
-  ##
-  # Writes +s+ to the stream.  +s+ will be converted to a String using
-  # String#to_s.
-
-  def << (s)
-    do_write(s)
-    self
-  end
-
-  ##
-  # Writes +args+ to the stream along with a record separator.
-  #
-  # See IO#puts for full details.
-
-  def puts(*args)
-    s = ""
-    if args.empty?
-      s << "\n"
-    end
-    args.each{|arg|
-      s << arg.to_s
-      if $/ && /\n\z/ !~ s
-        s << "\n"
-      end
-    }
-    do_write(s)
-    nil
-  end
-
-  ##
-  # Writes +args+ to the stream.
-  #
-  # See IO#print for full details.
-
-  def print(*args)
-    s = ""
-    args.each{ |arg| s << arg.to_s }
-    do_write(s)
-    nil
-  end
-
-  ##
-  # Formats and writes to the stream converting parameters under control of
-  # the format string.
-  #
-  # See Kernel#sprintf for format string details.
-
-  def printf(s, *args)
-    do_write(s % args)
-    nil
-  end
-
-  ##
-  # Flushes buffered data to the SSLSocket.
-
-  def flush
-    osync = @sync
-    @sync = true
-    do_write ""
-    return self
-  ensure
-    @sync = osync
-  end
-
-  ##
-  # Closes the SSLSocket and flushes any unwritten data.
-
-  def close
-    flush rescue nil
-    sysclose
-  end
-end

data/lib/jopenssl19/openssl/cipher.rb

@@ -1,28 +0,0 @@
-#--
-#
-# $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$
-#
-#++
-
-module OpenSSL
-  class Cipher
-    # This class is only provided for backwards compatibility.  Use OpenSSL::Cipher in the future.
-    class Cipher < Cipher
-      # add warning
-    end
-  end # Cipher
-end # OpenSSL