Skip to content

Commit c159b8e

Browse files
author
Stephen von Takach
committed
remove ruby 1.9 from travis
1 parent 91720dc commit c159b8e

File tree

4 files changed

+7
-31
lines changed

4 files changed

+7
-31
lines changed

.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
language: ruby
22
rvm:
3-
- "1.9.3"
4-
- "2.0.0"
3+
- "2.1"
54
- ruby-head
6-
- rbx-2.2.1
7-
- jruby-19mode # JRuby in 1.9 mode
5+
- rbx-2
86
- jruby-20mode

Rakefile

Lines changed: 0 additions & 19 deletions
This file was deleted.

lib/ruby-tls/ssl.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module SSL
4444
attach_function :BIO_new_mem_buf, [:string, :buffer_length], :bio
4545
attach_function :EVP_PKEY_free, [:evp_key], :void
4646

47-
callback :pem_password_cb, [:buffer_out, :buffer_length, :read_write_flag, :user_data], :pass_length
47+
callback :pem_password_cb, [:pointer, :buffer_length, :read_write_flag, :user_data], :pass_length
4848
attach_function :PEM_read_bio_PrivateKey, [:bio, :evp_key_pointer, :pem_password_cb, :user_data], :evp_key
4949

5050
attach_function :X509_free, [:x509], :void
@@ -196,8 +196,8 @@ def self.SSL_CTX_sess_set_cache_size(ssl_ctx, op)
196196
keystr
197197

198198

199-
BuiltinPasswdCB = FFI::Function.new(:int, [:buffer_out, :int, :int, :pointer]) do |buffer, len, flag, data|
200-
buffer.put_string(0, 'kittycat')
199+
BuiltinPasswdCB = FFI::Function.new(:int, [:pointer, :int, :int, :pointer]) do |buffer, len, flag, data|
200+
buffer.write_string('kittycat')
201201
8
202202
end
203203

ruby-tls.gemspec

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
77
s.version = RubyTls::VERSION
88
s.authors = ["Stephen von Takach"]
99
s.email = ["[email protected]"]
10-
s.licenses = ["Ruby", "GPL"]
10+
s.licenses = ["MIT"]
1111
s.homepage = "https://github.com/cotag/ruby-tls"
1212
s.summary = "Abstract TLS for Ruby"
1313
s.description = <<-EOF
@@ -17,17 +17,14 @@ Gem::Specification.new do |s|
1717

1818
s.add_dependency 'ffi-compiler', '>= 0.0.2'
1919
s.add_dependency 'thread_safe'
20-
s.add_dependency 'rake'
2120

2221
s.add_development_dependency 'rspec'
2322
s.add_development_dependency 'yard'
2423

2524

26-
s.files = Dir["{lib}/**/*"] + %w(Rakefile ruby-tls.gemspec README.md EM-LICENSE)
27-
s.files += ["ext/tls/ssl.cpp", "ext/tls/ssl.h", "ext/tls/page.cpp", "ext/tls/page.h"]
25+
s.files = Dir["{lib}/**/*"] + %w(ruby-tls.gemspec README.md)
2826
s.test_files = Dir["spec/**/*"]
2927
s.extra_rdoc_files = ["README.md"]
3028

31-
s.extensions << "ext/Rakefile"
3229
s.require_paths = ["lib"]
3330
end

0 commit comments

Comments
 (0)