tls-api 0.6

Author: str4d

grpc-examples/greeter/Cargo.toml

@@ -17,11 +17,11 @@ path = "../../grpc-protobuf"
 [dependencies]
 protobuf        = "2.23"
 futures         = "0.3.*"
-tls-api         = "0.5.0"
-tls-api-stub    = "0.5.0"
-tls-api-native-tls = "0.5.0"
+tls-api         = "0.6.0"
+tls-api-stub    = "0.6.0"
+tls-api-native-tls = "0.6.0"
 #httpbis         = "~0.9"
-httpbis         = { git = "https://github.com/stepancheg/rust-http2", rev = "87019df1f7cb264524be81bb5164d155d7196c31" }
+httpbis         = { git = "https://github.com/stepancheg/rust-http2", rev = "04410b1a07f937d94e075c813d05a68022f0c7c8" }
 #httpbis         = { path = "../../../rust-http2/httpbis" }
 env_logger      = "~0.9"
 

grpc-examples/route_guide/Cargo.toml

@@ -17,8 +17,8 @@ path = "../../grpc-protobuf"
 [dependencies]
 protobuf        = "2.23"
 futures         = "0.3.*"
-tls-api         = "0.5.0"
-tls-api-stub    = "0.5.0"
+tls-api         = "0.6.0"
+tls-api-stub    = "0.6.0"
 env_logger      = "0.9"
 rand            = "0.8"
 json            = "0.12"

grpc/Cargo.toml

@@ -16,10 +16,10 @@ log-ndc         = "0.3"
 futures         = "0.3.1"
 tokio = { version = "1.2.0", features = ["io-util", "net", "time", "rt"] }
 #httpbis         = "~0.9"
-httpbis         = { git = "https://github.com/stepancheg/rust-http2", rev = "87019df1f7cb264524be81bb5164d155d7196c31" }
+httpbis         = { git = "https://github.com/stepancheg/rust-http2", rev = "04410b1a07f937d94e075c813d05a68022f0c7c8" }
 #httpbis         = { path = "../../rust-http2/httpbis" }
-tls-api         = "0.5.0"
-tls-api-stub    = "0.5.0"
+tls-api         = "0.6.0"
+tls-api-stub    = "0.6.0"
 bytes           = "1.0.1"
 base64          = "0.13"
 

grpc/src/error.rs

@@ -87,6 +87,6 @@ impl From<metadata::MetadataDecodeError> for Error {
 
 impl From<Error> for httpbis::Error {
     fn from(err: Error) -> httpbis::Error {
-        httpbis::Error::StdError(Box::new(err))
+        httpbis::Error::User(format!("gRPC error: {}", err))
     }
 }

interop/Cargo.toml

@@ -18,7 +18,7 @@ log             = "0.4.*"
 env_logger      = "~0.9"
 protobuf        = "2.23"
 futures         = "0.3.*"
-tls-api         = "0.5.0"
+tls-api         = "0.6.0"
 chrono          = "0.4"
 clap            = "2.20.0"
 

long-tests/with-rust/Cargo.toml

@@ -18,7 +18,7 @@ path = "../../grpc-protobuf"
 log             = "0.4.*"
 env_logger      = "~0.9"
 protobuf        = "2.23"
-tls-api         = "0.5.0"
+tls-api         = "0.6.0"
 futures         = "0.3.*"
 
 [build-dependencies]