jruby-openssl 0.9.7-java → 0.9.8-java
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/History.md +68 -23
- data/Rakefile +12 -1
- data/lib/jopenssl.jar +0 -0
- data/lib/jopenssl/load.rb +22 -17
- data/lib/jopenssl/version.rb +1 -1
- data/lib/jopenssl18/openssl/ssl-internal.rb +1 -44
- data/lib/jopenssl19/openssl/config.rb +164 -5
- data/lib/jopenssl19/openssl/ssl-internal.rb +15 -51
- data/lib/jopenssl21/openssl/bn.rb +0 -1
- data/lib/jopenssl21/openssl/buffering.rb +1 -449
- data/lib/jopenssl21/openssl/cipher.rb +1 -28
- data/lib/jopenssl21/openssl/config.rb +1 -313
- data/lib/jopenssl21/openssl/digest.rb +1 -49
- data/lib/jopenssl21/openssl/ssl.rb +1 -205
- data/lib/jopenssl22/openssl.rb +22 -0
- data/lib/jopenssl22/openssl/bn.rb +39 -0
- data/lib/jopenssl22/openssl/buffering.rb +456 -0
- data/lib/jopenssl22/openssl/cipher.rb +28 -0
- data/lib/jopenssl22/openssl/config.rb +313 -0
- data/lib/jopenssl22/openssl/digest.rb +54 -0
- data/lib/jopenssl22/openssl/ssl.rb +193 -0
- data/lib/jopenssl22/openssl/x509.rb +139 -0
- data/lib/openssl/bn.rb +8 -6
- data/lib/openssl/buffering.rb +8 -6
- data/lib/openssl/cipher.rb +8 -6
- data/lib/openssl/config.rb +8 -6
- data/lib/openssl/digest.rb +8 -6
- data/lib/openssl/pkcs12.rb +3 -3
- data/lib/openssl/pkcs7.rb +6 -4
- data/lib/openssl/ssl-internal.rb +7 -5
- data/lib/openssl/ssl.rb +8 -6
- data/lib/openssl/x509-internal.rb +7 -5
- data/lib/openssl/x509.rb +8 -6
- metadata +23 -15
| @@ -1,28 +1 @@ | |
| 1 | 
            -
             | 
| 2 | 
            -
            #
         | 
| 3 | 
            -
            # $RCSfile$
         | 
| 4 | 
            -
            #
         | 
| 5 | 
            -
            # = Ruby-space predefined Cipher subclasses
         | 
| 6 | 
            -
            #
         | 
| 7 | 
            -
            # = Info
         | 
| 8 | 
            -
            # 'OpenSSL for Ruby 2' project
         | 
| 9 | 
            -
            # Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
         | 
| 10 | 
            -
            # All rights reserved.
         | 
| 11 | 
            -
            #
         | 
| 12 | 
            -
            # = Licence
         | 
| 13 | 
            -
            # This program is licenced under the same licence as Ruby.
         | 
| 14 | 
            -
            # (See the file 'LICENCE'.)
         | 
| 15 | 
            -
            #
         | 
| 16 | 
            -
            # = Version
         | 
| 17 | 
            -
            # $Id$
         | 
| 18 | 
            -
            #
         | 
| 19 | 
            -
            #++
         | 
| 20 | 
            -
             | 
| 21 | 
            -
            module OpenSSL
         | 
| 22 | 
            -
              class Cipher
         | 
| 23 | 
            -
                # This class is only provided for backwards compatibility.  Use OpenSSL::Cipher in the future.
         | 
| 24 | 
            -
                class Cipher < Cipher
         | 
| 25 | 
            -
                  # add warning
         | 
| 26 | 
            -
                end
         | 
| 27 | 
            -
              end # Cipher
         | 
| 28 | 
            -
            end # OpenSSL
         | 
| 1 | 
            +
            load 'jopenssl22/openssl/cipher.rb'
         | 
| @@ -1,313 +1 @@ | |
| 1 | 
            -
             | 
| 2 | 
            -
            = Ruby-space definitions that completes C-space funcs for Config
         | 
| 3 | 
            -
             | 
| 4 | 
            -
            = Info
         | 
| 5 | 
            -
              Copyright (C) 2010  Hiroshi Nakamura <nahi@ruby-lang.org>
         | 
| 6 | 
            -
             | 
| 7 | 
            -
            = Licence
         | 
| 8 | 
            -
              This program is licenced under the same licence as Ruby.
         | 
| 9 | 
            -
              (See the file 'LICENCE'.)
         | 
| 10 | 
            -
             | 
| 11 | 
            -
            =end
         | 
| 12 | 
            -
             | 
| 13 | 
            -
            require 'stringio'
         | 
| 14 | 
            -
             | 
| 15 | 
            -
            module OpenSSL
         | 
| 16 | 
            -
              class Config
         | 
| 17 | 
            -
                include Enumerable
         | 
| 18 | 
            -
             | 
| 19 | 
            -
                class << self
         | 
| 20 | 
            -
                  def parse(str)
         | 
| 21 | 
            -
                    c = new()
         | 
| 22 | 
            -
                    parse_config(StringIO.new(str)).each do |section, hash|
         | 
| 23 | 
            -
                      c[section] = hash
         | 
| 24 | 
            -
                    end
         | 
| 25 | 
            -
                    c
         | 
| 26 | 
            -
                  end
         | 
| 27 | 
            -
             | 
| 28 | 
            -
                  alias load new
         | 
| 29 | 
            -
             | 
| 30 | 
            -
                  def parse_config(io)
         | 
| 31 | 
            -
                    begin
         | 
| 32 | 
            -
                      parse_config_lines(io)
         | 
| 33 | 
            -
                    rescue ConfigError => e
         | 
| 34 | 
            -
                      e.message.replace("error in line #{io.lineno}: " + e.message)
         | 
| 35 | 
            -
                      raise
         | 
| 36 | 
            -
                    end
         | 
| 37 | 
            -
                  end
         | 
| 38 | 
            -
             | 
| 39 | 
            -
                  def get_key_string(data, section, key) # :nodoc:
         | 
| 40 | 
            -
                    if v = data[section] && data[section][key]
         | 
| 41 | 
            -
                      return v
         | 
| 42 | 
            -
                    elsif section == 'ENV'
         | 
| 43 | 
            -
                      if v = ENV[key]
         | 
| 44 | 
            -
                        return v
         | 
| 45 | 
            -
                      end
         | 
| 46 | 
            -
                    end
         | 
| 47 | 
            -
                    if v = data['default'] && data['default'][key]
         | 
| 48 | 
            -
                      return v
         | 
| 49 | 
            -
                    end
         | 
| 50 | 
            -
                  end
         | 
| 51 | 
            -
             | 
| 52 | 
            -
                private
         | 
| 53 | 
            -
             | 
| 54 | 
            -
                  def parse_config_lines(io)
         | 
| 55 | 
            -
                    section = 'default'
         | 
| 56 | 
            -
                    data = {section => {}}
         | 
| 57 | 
            -
                    while definition = get_definition(io)
         | 
| 58 | 
            -
                      definition = clear_comments(definition)
         | 
| 59 | 
            -
                      next if definition.empty?
         | 
| 60 | 
            -
                      if definition[0] == ?[
         | 
| 61 | 
            -
                        if /\[([^\]]*)\]/ =~ definition
         | 
| 62 | 
            -
                          section = $1.strip
         | 
| 63 | 
            -
                          data[section] ||= {}
         | 
| 64 | 
            -
                        else
         | 
| 65 | 
            -
                          raise ConfigError, "missing close square bracket"
         | 
| 66 | 
            -
                        end
         | 
| 67 | 
            -
                      else
         | 
| 68 | 
            -
                        if /\A([^:\s]*)(?:::([^:\s]*))?\s*=(.*)\z/ =~ definition
         | 
| 69 | 
            -
                          if $2
         | 
| 70 | 
            -
                            section = $1
         | 
| 71 | 
            -
                            key = $2
         | 
| 72 | 
            -
                          else
         | 
| 73 | 
            -
                            key = $1
         | 
| 74 | 
            -
                          end
         | 
| 75 | 
            -
                          value = unescape_value(data, section, $3)
         | 
| 76 | 
            -
                          (data[section] ||= {})[key] = value.strip
         | 
| 77 | 
            -
                        else
         | 
| 78 | 
            -
                          raise ConfigError, "missing equal sign"
         | 
| 79 | 
            -
                        end
         | 
| 80 | 
            -
                      end
         | 
| 81 | 
            -
                    end
         | 
| 82 | 
            -
                    data
         | 
| 83 | 
            -
                  end
         | 
| 84 | 
            -
             | 
| 85 | 
            -
                  # escape with backslash
         | 
| 86 | 
            -
                  QUOTE_REGEXP_SQ = /\A([^'\\]*(?:\\.[^'\\]*)*)'/
         | 
| 87 | 
            -
                  # escape with backslash and doubled dq
         | 
| 88 | 
            -
                  QUOTE_REGEXP_DQ = /\A([^"\\]*(?:""[^"\\]*|\\.[^"\\]*)*)"/
         | 
| 89 | 
            -
                  # escaped char map
         | 
| 90 | 
            -
                  ESCAPE_MAP = {
         | 
| 91 | 
            -
                    "r" => "\r",
         | 
| 92 | 
            -
                    "n" => "\n",
         | 
| 93 | 
            -
                    "b" => "\b",
         | 
| 94 | 
            -
                    "t" => "\t",
         | 
| 95 | 
            -
                  }
         | 
| 96 | 
            -
             | 
| 97 | 
            -
                  def unescape_value(data, section, value)
         | 
| 98 | 
            -
                    scanned = []
         | 
| 99 | 
            -
                    while m = value.match(/['"\\$]/)
         | 
| 100 | 
            -
                      scanned << m.pre_match
         | 
| 101 | 
            -
                      c = m[0]
         | 
| 102 | 
            -
                      value = m.post_match
         | 
| 103 | 
            -
                      case c
         | 
| 104 | 
            -
                      when "'"
         | 
| 105 | 
            -
                        if m = value.match(QUOTE_REGEXP_SQ)
         | 
| 106 | 
            -
                          scanned << m[1].gsub(/\\(.)/, '\\1')
         | 
| 107 | 
            -
                          value = m.post_match
         | 
| 108 | 
            -
                        else
         | 
| 109 | 
            -
                          break
         | 
| 110 | 
            -
                        end
         | 
| 111 | 
            -
                      when '"'
         | 
| 112 | 
            -
                        if m = value.match(QUOTE_REGEXP_DQ)
         | 
| 113 | 
            -
                          scanned << m[1].gsub(/""/, '').gsub(/\\(.)/, '\\1')
         | 
| 114 | 
            -
                          value = m.post_match
         | 
| 115 | 
            -
                        else
         | 
| 116 | 
            -
                          break
         | 
| 117 | 
            -
                        end
         | 
| 118 | 
            -
                      when "\\"
         | 
| 119 | 
            -
                        c = value.slice!(0, 1)
         | 
| 120 | 
            -
                        scanned << (ESCAPE_MAP[c] || c)
         | 
| 121 | 
            -
                      when "$"
         | 
| 122 | 
            -
                        ref, value = extract_reference(value)
         | 
| 123 | 
            -
                        refsec = section
         | 
| 124 | 
            -
                        if ref.index('::')
         | 
| 125 | 
            -
                          refsec, ref = ref.split('::', 2)
         | 
| 126 | 
            -
                        end
         | 
| 127 | 
            -
                        if v = get_key_string(data, refsec, ref)
         | 
| 128 | 
            -
                          scanned << v
         | 
| 129 | 
            -
                        else
         | 
| 130 | 
            -
                          raise ConfigError, "variable has no value"
         | 
| 131 | 
            -
                        end
         | 
| 132 | 
            -
                      else
         | 
| 133 | 
            -
                        raise 'must not reaced'
         | 
| 134 | 
            -
                      end
         | 
| 135 | 
            -
                    end
         | 
| 136 | 
            -
                    scanned << value
         | 
| 137 | 
            -
                    scanned.join
         | 
| 138 | 
            -
                  end
         | 
| 139 | 
            -
             | 
| 140 | 
            -
                  def extract_reference(value)
         | 
| 141 | 
            -
                    rest = ''
         | 
| 142 | 
            -
                    if m = value.match(/\(([^)]*)\)|\{([^}]*)\}/)
         | 
| 143 | 
            -
                      value = m[1] || m[2]
         | 
| 144 | 
            -
                      rest = m.post_match
         | 
| 145 | 
            -
                    elsif [?(, ?{].include?(value[0])
         | 
| 146 | 
            -
                      raise ConfigError, "no close brace"
         | 
| 147 | 
            -
                    end
         | 
| 148 | 
            -
                    if m = value.match(/[a-zA-Z0-9_]*(?:::[a-zA-Z0-9_]*)?/)
         | 
| 149 | 
            -
                      return m[0], m.post_match + rest
         | 
| 150 | 
            -
                    else
         | 
| 151 | 
            -
                      raise
         | 
| 152 | 
            -
                    end
         | 
| 153 | 
            -
                  end
         | 
| 154 | 
            -
             | 
| 155 | 
            -
                  def clear_comments(line)
         | 
| 156 | 
            -
                    # FCOMMENT
         | 
| 157 | 
            -
                    if m = line.match(/\A([\t\n\f ]*);.*\z/)
         | 
| 158 | 
            -
                      return m[1]
         | 
| 159 | 
            -
                    end
         | 
| 160 | 
            -
                    # COMMENT
         | 
| 161 | 
            -
                    scanned = []
         | 
| 162 | 
            -
                    while m = line.match(/[#'"\\]/)
         | 
| 163 | 
            -
                      scanned << m.pre_match
         | 
| 164 | 
            -
                      c = m[0]
         | 
| 165 | 
            -
                      line = m.post_match
         | 
| 166 | 
            -
                      case c
         | 
| 167 | 
            -
                      when '#'
         | 
| 168 | 
            -
                        line = nil
         | 
| 169 | 
            -
                        break
         | 
| 170 | 
            -
                      when "'", '"'
         | 
| 171 | 
            -
                        regexp = (c == "'") ? QUOTE_REGEXP_SQ : QUOTE_REGEXP_DQ
         | 
| 172 | 
            -
                        scanned << c
         | 
| 173 | 
            -
                        if m = line.match(regexp)
         | 
| 174 | 
            -
                          scanned << m[0]
         | 
| 175 | 
            -
                          line = m.post_match
         | 
| 176 | 
            -
                        else
         | 
| 177 | 
            -
                          scanned << line
         | 
| 178 | 
            -
                          line = nil
         | 
| 179 | 
            -
                          break
         | 
| 180 | 
            -
                        end
         | 
| 181 | 
            -
                      when "\\"
         | 
| 182 | 
            -
                        scanned << c
         | 
| 183 | 
            -
                        scanned << line.slice!(0, 1)
         | 
| 184 | 
            -
                      else
         | 
| 185 | 
            -
                        raise 'must not reaced'
         | 
| 186 | 
            -
                      end
         | 
| 187 | 
            -
                    end
         | 
| 188 | 
            -
                    scanned << line
         | 
| 189 | 
            -
                    scanned.join
         | 
| 190 | 
            -
                  end
         | 
| 191 | 
            -
             | 
| 192 | 
            -
                  def get_definition(io)
         | 
| 193 | 
            -
                    if line = get_line(io)
         | 
| 194 | 
            -
                      while /[^\\]\\\z/ =~ line
         | 
| 195 | 
            -
                        if extra = get_line(io)
         | 
| 196 | 
            -
                          line += extra
         | 
| 197 | 
            -
                        else
         | 
| 198 | 
            -
                          break
         | 
| 199 | 
            -
                        end
         | 
| 200 | 
            -
                      end
         | 
| 201 | 
            -
                      return line.strip
         | 
| 202 | 
            -
                    end
         | 
| 203 | 
            -
                  end
         | 
| 204 | 
            -
             | 
| 205 | 
            -
                  def get_line(io)
         | 
| 206 | 
            -
                    if line = io.gets
         | 
| 207 | 
            -
                      line.gsub(/[\r\n]*/, '')
         | 
| 208 | 
            -
                    end
         | 
| 209 | 
            -
                  end
         | 
| 210 | 
            -
                end
         | 
| 211 | 
            -
             | 
| 212 | 
            -
                def initialize(filename = nil)
         | 
| 213 | 
            -
                  @data = {}
         | 
| 214 | 
            -
                  if filename
         | 
| 215 | 
            -
                    File.open(filename.to_s) do |file|
         | 
| 216 | 
            -
                      Config.parse_config(file).each do |section, hash|
         | 
| 217 | 
            -
                        self[section] = hash
         | 
| 218 | 
            -
                      end
         | 
| 219 | 
            -
                    end
         | 
| 220 | 
            -
                  end
         | 
| 221 | 
            -
                end
         | 
| 222 | 
            -
             | 
| 223 | 
            -
                def get_value(section, key)
         | 
| 224 | 
            -
                  if section.nil?
         | 
| 225 | 
            -
                    raise TypeError.new('nil not allowed')
         | 
| 226 | 
            -
                  end
         | 
| 227 | 
            -
                  section = 'default' if section.empty?
         | 
| 228 | 
            -
                  get_key_string(section, key)
         | 
| 229 | 
            -
                end
         | 
| 230 | 
            -
             | 
| 231 | 
            -
                def value(arg1, arg2 = nil)
         | 
| 232 | 
            -
                  warn('Config#value is deprecated; use Config#get_value')
         | 
| 233 | 
            -
                  if arg2.nil?
         | 
| 234 | 
            -
                    section, key = 'default', arg1
         | 
| 235 | 
            -
                  else
         | 
| 236 | 
            -
                    section, key = arg1, arg2
         | 
| 237 | 
            -
                  end
         | 
| 238 | 
            -
                  section ||= 'default'
         | 
| 239 | 
            -
                  section = 'default' if section.empty?
         | 
| 240 | 
            -
                  get_key_string(section, key)
         | 
| 241 | 
            -
                end
         | 
| 242 | 
            -
             | 
| 243 | 
            -
                def add_value(section, key, value)
         | 
| 244 | 
            -
                  check_modify
         | 
| 245 | 
            -
                  (@data[section] ||= {})[key] = value
         | 
| 246 | 
            -
                end
         | 
| 247 | 
            -
             | 
| 248 | 
            -
                def [](section)
         | 
| 249 | 
            -
                  @data[section] || {}
         | 
| 250 | 
            -
                end
         | 
| 251 | 
            -
             | 
| 252 | 
            -
                def section(name)
         | 
| 253 | 
            -
                  warn('Config#section is deprecated; use Config#[]')
         | 
| 254 | 
            -
                  @data[name] || {}
         | 
| 255 | 
            -
                end
         | 
| 256 | 
            -
             | 
| 257 | 
            -
                def []=(section, pairs)
         | 
| 258 | 
            -
                  check_modify
         | 
| 259 | 
            -
                  @data[section] ||= {}
         | 
| 260 | 
            -
                  pairs.each do |key, value|
         | 
| 261 | 
            -
                    self.add_value(section, key, value)
         | 
| 262 | 
            -
                  end
         | 
| 263 | 
            -
                end
         | 
| 264 | 
            -
             | 
| 265 | 
            -
                def sections
         | 
| 266 | 
            -
                  @data.keys
         | 
| 267 | 
            -
                end
         | 
| 268 | 
            -
             | 
| 269 | 
            -
                def to_s
         | 
| 270 | 
            -
                  ary = []
         | 
| 271 | 
            -
                  @data.keys.sort.each do |section|
         | 
| 272 | 
            -
                    ary << "[ #{section} ]\n"
         | 
| 273 | 
            -
                    @data[section].keys.each do |key|
         | 
| 274 | 
            -
                      ary << "#{key}=#{@data[section][key]}\n"
         | 
| 275 | 
            -
                    end
         | 
| 276 | 
            -
                    ary << "\n"
         | 
| 277 | 
            -
                  end
         | 
| 278 | 
            -
                  ary.join
         | 
| 279 | 
            -
                end
         | 
| 280 | 
            -
             | 
| 281 | 
            -
                def each
         | 
| 282 | 
            -
                  @data.each do |section, hash|
         | 
| 283 | 
            -
                    hash.each do |key, value|
         | 
| 284 | 
            -
                      yield [section, key, value]
         | 
| 285 | 
            -
                    end
         | 
| 286 | 
            -
                  end
         | 
| 287 | 
            -
                end
         | 
| 288 | 
            -
             | 
| 289 | 
            -
                def inspect
         | 
| 290 | 
            -
                  "#<#{self.class.name} sections=#{sections.inspect}>"
         | 
| 291 | 
            -
                end
         | 
| 292 | 
            -
             | 
| 293 | 
            -
              protected
         | 
| 294 | 
            -
             | 
| 295 | 
            -
                def data
         | 
| 296 | 
            -
                  @data
         | 
| 297 | 
            -
                end
         | 
| 298 | 
            -
             | 
| 299 | 
            -
              private
         | 
| 300 | 
            -
             | 
| 301 | 
            -
                def initialize_copy(other)
         | 
| 302 | 
            -
                  @data = other.data.dup
         | 
| 303 | 
            -
                end
         | 
| 304 | 
            -
             | 
| 305 | 
            -
                def check_modify
         | 
| 306 | 
            -
                  raise TypeError.new("Insecure: can't modify OpenSSL config") if frozen?
         | 
| 307 | 
            -
                end
         | 
| 308 | 
            -
             | 
| 309 | 
            -
                def get_key_string(section, key)
         | 
| 310 | 
            -
                  Config.get_key_string(@data, section, key)
         | 
| 311 | 
            -
                end
         | 
| 312 | 
            -
              end
         | 
| 313 | 
            -
            end
         | 
| 1 | 
            +
            load 'jopenssl22/openssl/config.rb'
         | 
| @@ -1,49 +1 @@ | |
| 1 | 
            -
             | 
| 2 | 
            -
            #
         | 
| 3 | 
            -
            # $RCSfile$
         | 
| 4 | 
            -
            #
         | 
| 5 | 
            -
            # = Ruby-space predefined Digest subclasses
         | 
| 6 | 
            -
            #
         | 
| 7 | 
            -
            # = Info
         | 
| 8 | 
            -
            # 'OpenSSL for Ruby 2' project
         | 
| 9 | 
            -
            # Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
         | 
| 10 | 
            -
            # All rights reserved.
         | 
| 11 | 
            -
            #
         | 
| 12 | 
            -
            # = Licence
         | 
| 13 | 
            -
            # This program is licenced under the same licence as Ruby.
         | 
| 14 | 
            -
            # (See the file 'LICENCE'.)
         | 
| 15 | 
            -
            #
         | 
| 16 | 
            -
            # = Version
         | 
| 17 | 
            -
            # $Id$
         | 
| 18 | 
            -
            #
         | 
| 19 | 
            -
            #++
         | 
| 20 | 
            -
             | 
| 21 | 
            -
            module OpenSSL
         | 
| 22 | 
            -
              class Digest
         | 
| 23 | 
            -
                # This class is only provided for backwards compatibility.  Use OpenSSL::Digest in the future.
         | 
| 24 | 
            -
                class Digest < Digest
         | 
| 25 | 
            -
                  def initialize(*args)
         | 
| 26 | 
            -
                    # add warning
         | 
| 27 | 
            -
                    super(*args)
         | 
| 28 | 
            -
                  end
         | 
| 29 | 
            -
                end
         | 
| 30 | 
            -
              end # Digest
         | 
| 31 | 
            -
             | 
| 32 | 
            -
              # Returns a Digest subclass by +name+.
         | 
| 33 | 
            -
              #
         | 
| 34 | 
            -
              #   require 'openssl'
         | 
| 35 | 
            -
              #
         | 
| 36 | 
            -
              #   OpenSSL::Digest("MD5")
         | 
| 37 | 
            -
              #   # => OpenSSL::Digest::MD5
         | 
| 38 | 
            -
              #
         | 
| 39 | 
            -
              #   Digest("Foo")
         | 
| 40 | 
            -
              #   # => NameError: wrong constant name Foo
         | 
| 41 | 
            -
             | 
| 42 | 
            -
              def Digest(name)
         | 
| 43 | 
            -
                OpenSSL::Digest.const_get(name)
         | 
| 44 | 
            -
              end
         | 
| 45 | 
            -
              
         | 
| 46 | 
            -
              module_function :Digest
         | 
| 47 | 
            -
             | 
| 48 | 
            -
            end # OpenSSL
         | 
| 49 | 
            -
             | 
| 1 | 
            +
            load 'jopenssl22/openssl/digest.rb'
         | 
| @@ -1,205 +1 @@ | |
| 1 | 
            -
             | 
| 2 | 
            -
            = $RCSfile$ -- Ruby-space definitions that completes C-space funcs for SSL
         | 
| 3 | 
            -
             | 
| 4 | 
            -
            = Info
         | 
| 5 | 
            -
              'OpenSSL for Ruby 2' project
         | 
| 6 | 
            -
              Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
         | 
| 7 | 
            -
              All rights reserved.
         | 
| 8 | 
            -
             | 
| 9 | 
            -
            = Licence
         | 
| 10 | 
            -
              This program is licenced under the same licence as Ruby.
         | 
| 11 | 
            -
              (See the file 'LICENCE'.)
         | 
| 12 | 
            -
             | 
| 13 | 
            -
            = Version
         | 
| 14 | 
            -
              $Id$
         | 
| 15 | 
            -
            =end
         | 
| 16 | 
            -
             | 
| 17 | 
            -
            require "openssl/buffering"
         | 
| 18 | 
            -
            require "fcntl"
         | 
| 19 | 
            -
             | 
| 20 | 
            -
            module OpenSSL
         | 
| 21 | 
            -
              module SSL
         | 
| 22 | 
            -
                module SocketForwarder
         | 
| 23 | 
            -
                  def addr
         | 
| 24 | 
            -
                    to_io.addr
         | 
| 25 | 
            -
                  end
         | 
| 26 | 
            -
             | 
| 27 | 
            -
                  def peeraddr
         | 
| 28 | 
            -
                    to_io.peeraddr
         | 
| 29 | 
            -
                  end
         | 
| 30 | 
            -
             | 
| 31 | 
            -
                  def setsockopt(level, optname, optval)
         | 
| 32 | 
            -
                    to_io.setsockopt(level, optname, optval)
         | 
| 33 | 
            -
                  end
         | 
| 34 | 
            -
             | 
| 35 | 
            -
                  def getsockopt(level, optname)
         | 
| 36 | 
            -
                    to_io.getsockopt(level, optname)
         | 
| 37 | 
            -
                  end
         | 
| 38 | 
            -
             | 
| 39 | 
            -
                  def fcntl(*args)
         | 
| 40 | 
            -
                    to_io.fcntl(*args)
         | 
| 41 | 
            -
                  end
         | 
| 42 | 
            -
             | 
| 43 | 
            -
                  def closed?
         | 
| 44 | 
            -
                    to_io.closed?
         | 
| 45 | 
            -
                  end
         | 
| 46 | 
            -
             | 
| 47 | 
            -
                  def do_not_reverse_lookup=(flag)
         | 
| 48 | 
            -
                    to_io.do_not_reverse_lookup = flag
         | 
| 49 | 
            -
                  end
         | 
| 50 | 
            -
                end
         | 
| 51 | 
            -
             | 
| 52 | 
            -
                module Nonblock
         | 
| 53 | 
            -
                  def initialize(*args)
         | 
| 54 | 
            -
                    flag = File::NONBLOCK
         | 
| 55 | 
            -
                    flag |= @io.fcntl(Fcntl::F_GETFL) if defined?(Fcntl::F_GETFL)
         | 
| 56 | 
            -
                    @io.fcntl(Fcntl::F_SETFL, flag)
         | 
| 57 | 
            -
                    super
         | 
| 58 | 
            -
                  end
         | 
| 59 | 
            -
                end
         | 
| 60 | 
            -
             | 
| 61 | 
            -
                # FIXME: Using the old non-ASN1 logic here because our ASN1 appears to
         | 
| 62 | 
            -
                # return the wrong types for some decoded objects. See #1102
         | 
| 63 | 
            -
                def verify_certificate_identity(cert, hostname)
         | 
| 64 | 
            -
                  should_verify_common_name = true
         | 
| 65 | 
            -
                  cert.extensions.each{|ext|
         | 
| 66 | 
            -
                    next if ext.oid != "subjectAltName"
         | 
| 67 | 
            -
                    ext.value.split(/,\s+/).each{|general_name|
         | 
| 68 | 
            -
                      if /\ADNS:(.*)/ =~ general_name
         | 
| 69 | 
            -
                        should_verify_common_name = false
         | 
| 70 | 
            -
                        reg = Regexp.escape($1).gsub(/\\\*/, "[^.]+")
         | 
| 71 | 
            -
                        return true if /\A#{reg}\z/i =~ hostname
         | 
| 72 | 
            -
                      # NOTE: somehow we need the IP: canonical form
         | 
| 73 | 
            -
                      # seems there were failures elsewhere when not
         | 
| 74 | 
            -
                      # not sure how that's possible possible to-do!
         | 
| 75 | 
            -
                      elsif /\AIP(?: Address)?:(.*)/ =~ general_name
         | 
| 76 | 
            -
                      #elsif /\AIP Address:(.*)/ =~ general_name
         | 
| 77 | 
            -
                        should_verify_common_name = false
         | 
| 78 | 
            -
                        return true if $1 == hostname
         | 
| 79 | 
            -
                      end
         | 
| 80 | 
            -
                    }
         | 
| 81 | 
            -
                  }
         | 
| 82 | 
            -
                  if should_verify_common_name
         | 
| 83 | 
            -
                    cert.subject.to_a.each{|oid, value|
         | 
| 84 | 
            -
                      if oid == "CN"
         | 
| 85 | 
            -
                        reg = Regexp.escape(value).gsub(/\\\*/, "[^.]+")
         | 
| 86 | 
            -
                        return true if /\A#{reg}\z/i =~ hostname
         | 
| 87 | 
            -
                      end
         | 
| 88 | 
            -
                    }
         | 
| 89 | 
            -
                  end
         | 
| 90 | 
            -
                  return false
         | 
| 91 | 
            -
                end
         | 
| 92 | 
            -
            =begin
         | 
| 93 | 
            -
                def verify_certificate_identity(cert, hostname)
         | 
| 94 | 
            -
                  should_verify_common_name = true
         | 
| 95 | 
            -
                  cert.extensions.each{|ext|
         | 
| 96 | 
            -
                    next if ext.oid != "subjectAltName"
         | 
| 97 | 
            -
                    ostr = OpenSSL::ASN1.decode(ext.to_der).value.last
         | 
| 98 | 
            -
                    sequence = OpenSSL::ASN1.decode(ostr.value)
         | 
| 99 | 
            -
                    sequence.value.each{|san|
         | 
| 100 | 
            -
                      case san.tag
         | 
| 101 | 
            -
                      when 2 # dNSName in GeneralName (RFC5280)
         | 
| 102 | 
            -
                        should_verify_common_name = false
         | 
| 103 | 
            -
                        reg = Regexp.escape(san.value).gsub(/\\\*/, "[^.]+")
         | 
| 104 | 
            -
                        return true if /\A#{reg}\z/i =~ hostname
         | 
| 105 | 
            -
                      when 7 # iPAddress in GeneralName (RFC5280)
         | 
| 106 | 
            -
                        should_verify_common_name = false
         | 
| 107 | 
            -
                        # follows GENERAL_NAME_print() in x509v3/v3_alt.c
         | 
| 108 | 
            -
                        if san.value.size == 4
         | 
| 109 | 
            -
                          return true if san.value.unpack('C*').join('.') == hostname
         | 
| 110 | 
            -
                        elsif san.value.size == 16
         | 
| 111 | 
            -
                          return true if san.value.unpack('n*').map { |e| sprintf("%X", e) }.join(':') == hostname
         | 
| 112 | 
            -
                        end
         | 
| 113 | 
            -
                      end
         | 
| 114 | 
            -
                    }
         | 
| 115 | 
            -
                  }
         | 
| 116 | 
            -
                  if should_verify_common_name
         | 
| 117 | 
            -
                    cert.subject.to_a.each{|oid, value|
         | 
| 118 | 
            -
                      if oid == "CN"
         | 
| 119 | 
            -
                        reg = Regexp.escape(value).gsub(/\\\*/, "[^.]+")
         | 
| 120 | 
            -
                        return true if /\A#{reg}\z/i =~ hostname
         | 
| 121 | 
            -
                      end
         | 
| 122 | 
            -
                    }
         | 
| 123 | 
            -
                  end
         | 
| 124 | 
            -
                  return false
         | 
| 125 | 
            -
                end
         | 
| 126 | 
            -
            =end
         | 
| 127 | 
            -
                module_function :verify_certificate_identity
         | 
| 128 | 
            -
             | 
| 129 | 
            -
                class SSLSocket
         | 
| 130 | 
            -
                  include Buffering
         | 
| 131 | 
            -
                  include SocketForwarder
         | 
| 132 | 
            -
                  include Nonblock
         | 
| 133 | 
            -
             | 
| 134 | 
            -
                  def post_connection_check(hostname)
         | 
| 135 | 
            -
                    unless OpenSSL::SSL.verify_certificate_identity(peer_cert, hostname)
         | 
| 136 | 
            -
                      raise SSLError, "hostname \"#{hostname}\" does not match the server certificate"
         | 
| 137 | 
            -
                    end
         | 
| 138 | 
            -
                    return true
         | 
| 139 | 
            -
                  end
         | 
| 140 | 
            -
             | 
| 141 | 
            -
                  def session
         | 
| 142 | 
            -
                    SSL::Session.new(self)
         | 
| 143 | 
            -
                  rescue SSL::Session::SessionError
         | 
| 144 | 
            -
                    nil
         | 
| 145 | 
            -
                  end
         | 
| 146 | 
            -
                end
         | 
| 147 | 
            -
             | 
| 148 | 
            -
                ##
         | 
| 149 | 
            -
                # SSLServer represents a TCP/IP server socket with Secure Sockets Layer.
         | 
| 150 | 
            -
                class SSLServer
         | 
| 151 | 
            -
                  include SocketForwarder
         | 
| 152 | 
            -
                  # When true then #accept works exactly the same as TCPServer#accept
         | 
| 153 | 
            -
                  attr_accessor :start_immediately
         | 
| 154 | 
            -
             | 
| 155 | 
            -
                  # Creates a new instance of SSLServer.
         | 
| 156 | 
            -
                  # * +srv+ is an instance of TCPServer.
         | 
| 157 | 
            -
                  # * +ctx+ is an instance of OpenSSL::SSL::SSLContext.
         | 
| 158 | 
            -
                  def initialize(svr, ctx)
         | 
| 159 | 
            -
                    @svr = svr
         | 
| 160 | 
            -
                    @ctx = ctx
         | 
| 161 | 
            -
                    unless ctx.session_id_context
         | 
| 162 | 
            -
                      # see #6137 - session id may not exceed 32 bytes
         | 
| 163 | 
            -
                      prng = ::Random.new($0.hash)
         | 
| 164 | 
            -
                      session_id = prng.bytes(16).unpack('H*')[0]
         | 
| 165 | 
            -
                      @ctx.session_id_context = session_id
         | 
| 166 | 
            -
                    end
         | 
| 167 | 
            -
                    @start_immediately = true
         | 
| 168 | 
            -
                  end
         | 
| 169 | 
            -
             | 
| 170 | 
            -
                  # Returns the TCPServer passed to the SSLServer when initialized.
         | 
| 171 | 
            -
                  def to_io
         | 
| 172 | 
            -
                    @svr
         | 
| 173 | 
            -
                  end
         | 
| 174 | 
            -
             | 
| 175 | 
            -
                  # See TCPServer#listen for details.
         | 
| 176 | 
            -
                  def listen(backlog=5)
         | 
| 177 | 
            -
                    @svr.listen(backlog)
         | 
| 178 | 
            -
                  end
         | 
| 179 | 
            -
             | 
| 180 | 
            -
                  # See BasicSocket#shutdown for details.
         | 
| 181 | 
            -
                  def shutdown(how=Socket::SHUT_RDWR)
         | 
| 182 | 
            -
                    @svr.shutdown(how)
         | 
| 183 | 
            -
                  end
         | 
| 184 | 
            -
             | 
| 185 | 
            -
                  # Works similar to TCPServer#accept.
         | 
| 186 | 
            -
                  def accept
         | 
| 187 | 
            -
                    sock = @svr.accept
         | 
| 188 | 
            -
                    begin
         | 
| 189 | 
            -
                      ssl = OpenSSL::SSL::SSLSocket.new(sock, @ctx)
         | 
| 190 | 
            -
                      ssl.sync_close = true
         | 
| 191 | 
            -
                      ssl.accept if @start_immediately
         | 
| 192 | 
            -
                      ssl
         | 
| 193 | 
            -
                    rescue SSLError => ex
         | 
| 194 | 
            -
                      sock.close
         | 
| 195 | 
            -
                      raise ex
         | 
| 196 | 
            -
                    end
         | 
| 197 | 
            -
                  end
         | 
| 198 | 
            -
             | 
| 199 | 
            -
                  # See IO#close for details.
         | 
| 200 | 
            -
                  def close
         | 
| 201 | 
            -
                    @svr.close
         | 
| 202 | 
            -
                  end
         | 
| 203 | 
            -
                end
         | 
| 204 | 
            -
              end
         | 
| 205 | 
            -
            end
         | 
| 1 | 
            +
            load 'jopenssl22/openssl/ssl.rb'
         |