Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8893cdef8091
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3609f62a6210
Choose a head ref
  • 3 commits
  • 5 files changed
  • 1 contributor

Commits on Dec 14, 2016

  1. Copy the full SHA
    070ced4 View commit details
  2. Copy the full SHA
    2ec645e View commit details
  3. Copy the full SHA
    3609f62 View commit details
2 changes: 2 additions & 0 deletions lib/ruby/truffle/jruby-truffle-tool/lib/truffle/tool.rb
Original file line number Diff line number Diff line change
@@ -364,6 +364,8 @@ def initialize(argv, options = {})
@called_from_dir = Dir.pwd
@options[:global][:dir] = File.expand_path(@options[:global][:dir] || @called_from_dir)

log({ argv: argv, options: options }.pretty_inspect) if verbose?

Dir.chdir @options[:global][:dir] do
log "pwd is #{Dir.pwd}" if verbose?

16 changes: 0 additions & 16 deletions lib/ruby/truffle/truffle/bundler-workarounds.rb
Original file line number Diff line number Diff line change
@@ -432,22 +432,6 @@ def update(local_path, remote_path, retrying = nil)

module OpenSSL

module Cipher

cipher_new = <<-HEREDOC
==========================================
Workaround: Stub OpenSSL::Cipher.new
Called here:
lib/ruby/stdlib/rubygems/security.rb:372
HEREDOC
puts cipher_new if $VERBOSE

def self.new(enc)

end

end

verify_peer = <<-HEREDOC
==========================================
Workaround: Stub OpenSSL::SSL::VERIFY_PEER
41 changes: 21 additions & 20 deletions lib/ruby/truffle/truffle/digest.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
# code is released under a tri EPL/GPL/LGPL license. You can use it,
# redistribute it and/or modify it under the terms of the:
#
#
# Eclipse Public License version 1.0
# GNU General Public License version 2
# GNU Lesser General Public License version 2.1
@@ -71,20 +71,6 @@ def Digest.hexencode(message)
StringValue(message).unpack('H*').first
end

class Class
def self.digest(message)
digest = new
digest.update message
digest.digest
end

def self.hexdigest(message)
digest = new
digest.update message
digest.hexdigest
end
end

module Instance
def update(message)
Truffle::Digest.update @digest, message
@@ -140,9 +126,24 @@ def inspect

class Class
include Instance

def self.digest(message)
digest = new
digest.update message
digest.digest
end

def self.hexdigest(message)
digest = new
digest.update message
digest.hexdigest
end
end

class Base < Class
end

class MD5 < Class
class MD5 < Base
def initialize
@digest = Truffle::Digest.md5
end
@@ -152,7 +153,7 @@ def block_length
end
end

class SHA1 < Class
class SHA1 < Base
def initialize
@digest = Truffle::Digest.sha1
end
@@ -162,7 +163,7 @@ def block_length
end
end

class SHA256 < Class
class SHA256 < Base
def initialize
@digest = Truffle::Digest.sha256
end
@@ -172,7 +173,7 @@ def block_length
end
end

class SHA384 < Class
class SHA384 < Base
def initialize
@digest = Truffle::Digest.sha384
end
@@ -182,7 +183,7 @@ def block_length
end
end

class SHA512 < Class
class SHA512 < Base
def initialize
@digest = Truffle::Digest.sha512
end
3 changes: 2 additions & 1 deletion lib/ruby/truffle/truffle/openssl-stubs.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
dir = __FILE__[0...-3]
dir = File.join File.dirname(__FILE__),
File.basename(__FILE__, '.*')
$LOAD_PATH.unshift(dir)
require "#{dir}/openssl"
4 changes: 4 additions & 0 deletions lib/ruby/truffle/truffle/openssl-stubs/openssl.rb
Original file line number Diff line number Diff line change
@@ -62,6 +62,10 @@ def final
end

end

# valled in lib/ruby/stdlib/rubygems/security.rb:372
def self.new(enc)
end
end

module PKCS5