Skip to content

Commit

Permalink
Support TLS with SNI via a CertificateManager r=ferjm
Browse files Browse the repository at this point in the history
  • Loading branch information
samgiles committed Mar 17, 2016
1 parent d1f8c76 commit b35592c
Show file tree
Hide file tree
Showing 17 changed files with 788 additions and 99 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,6 @@ node_modules

# Foxbox config
foxbox.conf

# Generated certs
certs
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ script:
- $TRAVIS_BUILD_DIR/tools/execute-unit-tests-with-coverage
- jshint static/main/js/*.js static/setup/js/*.js test/selenium/*.js test/integration/lib/*.js test/integration/test/*.js
- npm run test-integration # starts foxbox and kills it within the test script
- (cargo run -- -l $BOX_LOCAL_NAME -p $BOX_PORT &> /dev/null &) ; npm run test-selenium
- (cargo run -- -l $BOX_LOCAL_NAME -p $BOX_PORT --disable-tls &> /dev/null &) ; npm run test-selenium
51 changes: 29 additions & 22 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ foxbox_users = { git = "https://github.com/fxbox/users.git", rev = "3db32f0" }
get_if_addrs = "0.3.1"
hyper = "0.7.2"
multicast_dns = { git = "https://github.com/fxbox/multicast-dns.git", rev = "a6e4bcc" }
iron = "0.2.6"
iron-cors = { git = "https://github.com/fxbox/iron-cors.git", rev = "137d42f" }
libc = "0.2.7"
log = "0.3"
mio = { git = "https://github.com/carllerche/mio.git" }
mount = "0.0.10"
nix = { git = "https://github.com/nix-rust/nix.git", rev = "138080" } # Until 0.5.1 is released
openssl = "0.7.6"
openssl-sys = "0.7.6"
router = "0.1.0"
rust-crypto = "0.2.34"
rustc-serialize = "0.3"
Expand All @@ -39,10 +40,15 @@ unicase = "1.3.0"
time = "0.1"
timer = "0.1.6"
uuid = "0.1.18"
url = "0.5.5"
url = "0.5.7"
ws = { git = "https://github.com/housleyjk/ws-rs.git", rev = "d154fc5" }
xml-rs = "0.3.0"

[dependencies.iron]
version = "0.2.6"
default-features = true
features = ["ssl"]

[dev-dependencies]
stainless = "0.1.4"
iron-test = "0.2.0"
Expand Down
Loading

0 comments on commit b35592c

Please sign in to comment.