Merge branch 'master' into logger

This commit is contained in:
ctz 2019-03-08 16:47:34 +00:00 committed by GitHub
commit 919e4284e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions

View File

@ -11,12 +11,12 @@ repository = "https://github.com/ctz/rustls"
categories = ["network-programming", "cryptography"]
[dependencies]
untrusted = "0.6.2"
base64 = "0.10"
log = { version = "0.4.0", optional = true }
ring = "0.14"
webpki = "0.19"
sct = "0.5"
untrusted = "0.6.2"
webpki = "0.19"
[features]
default = ["logging"]
@ -25,17 +25,17 @@ dangerous_configuration = []
quic = []
[dev-dependencies]
log = "0.4"
env_logger = "0.6.1"
mio = "0.6"
ct-logs = "0.5"
docopt = "1.0"
env_logger = "0.6.1"
log = "0.4"
mio = "0.6"
regex = "1.0"
serde = "1.0"
serde_derive = "1.0"
webpki-roots = "0.16"
ct-logs = "0.5"
regex = "1.0"
vecio = "0.1"
tempfile = "3.0"
vecio = "0.1"
webpki-roots = "0.16"
[[example]]
name = "bogo_shim"