Skip to content

Commit

Permalink
Merge pull request #32 from erubboli/master
Browse files Browse the repository at this point in the history
add ecdh_curve option for EM connection
  • Loading branch information
prdn authored Jun 29, 2017
2 parents 3ff2f41 + c02dc34 commit 8e46cbb
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 1 deletion.
File renamed without changes.
1 change: 1 addition & 0 deletions examples/worker_ssl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
c = Grenache::Http.new(grape_address: "http://127.0.0.1:40002/",
key: File.expand_path('.') + "/ssl/127.0.0.1.key",
cert_pem: File.expand_path('.') + "/ssl/127.0.0.1.chain.crt",
cert_ecdh_curve: 'secp384r1',
ca: File.expand_path('.') + "/ssl/ca.crt",
service_host: "localhost")

Expand Down
2 changes: 2 additions & 0 deletions lib/grenache/http.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ def start_http_service(port, &block)
server.ssl_options = {
private_key_file: config.key,
cert_chain_file: config.cert_pem,
ecdh_curve: config.cert_ecdh_curve,
verify_peer: true
}

server.backend.ca_cert = File.read config.ca
end
server.start
Expand Down
2 changes: 1 addition & 1 deletion lib/grenache/http/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Grenache
module HTTP
VERSION = "0.2.12"
VERSION = "0.2.13"
end
end

0 comments on commit 8e46cbb

Please sign in to comment.