loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

End use of deprecated openssl method (#7154)

Browse Source
This commit is contained in:
Benjamin Gill 2017-12-13 03:31:11 +00:00 committed by William Cheng
parent 8b61b1d466
commit 4dbb44b061
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/swagger-codegen/src/main/resources/rust-server/client.mustache
View File

@ -96,7 +96,7 @@ impl Client {
let mut ssl = openssl::ssl::SslConnectorBuilder::new(openssl::ssl::SslMethod::tls()).unwrap();
// Server authentication
ssl.builder_mut().set_ca_file(ca_certificate.clone()).unwrap();
ssl.set_ca_file(ca_certificate.clone()).unwrap();
let ssl = hyper_openssl::OpensslClient::from(ssl.build());
let connector = hyper::net::HttpsConnector::new(ssl);
@ -128,12 +128,12 @@ impl Client {
let mut ssl = openssl::ssl::SslConnectorBuilder::new(openssl::ssl::SslMethod::tls()).unwrap();
// Server authentication
ssl.builder_mut().set_ca_file(ca_certificate.clone()).unwrap();
ssl.set_ca_file(ca_certificate.clone()).unwrap();
// Client authentication
ssl.builder_mut().set_private_key_file(client_key.clone(), openssl::x509::X509_FILETYPE_PEM).unwrap();
ssl.builder_mut().set_certificate_chain_file(client_certificate.clone()).unwrap();
ssl.builder_mut().check_private_key().unwrap();
ssl.set_private_key_file(client_key.clone(), openssl::x509::X509_FILETYPE_PEM).unwrap();
ssl.set_certificate_chain_file(client_certificate.clone()).unwrap();
ssl.check_private_key().unwrap();
let ssl = hyper_openssl::OpensslClient::from(ssl.build());
let connector = hyper::net::HttpsConnector::new(ssl);

6
modules/swagger-codegen/src/main/resources/rust-server/example-server.mustache
View File

@ -33,9 +33,9 @@ fn ssl() -> Result<OpensslServer, ErrorStack> {
let mut ssl = SslAcceptorBuilder::mozilla_intermediate_raw(SslMethod::tls())?;
// Server authentication
ssl.builder_mut().set_private_key_file("examples/server-key.pem", X509_FILETYPE_PEM)?;
ssl.builder_mut().set_certificate_chain_file("examples/server-chain.pem")?;
ssl.builder_mut().check_private_key()?;
ssl.set_private_key_file("examples/server-key.pem", X509_FILETYPE_PEM)?;
ssl.set_certificate_chain_file("examples/server-chain.pem")?;
ssl.check_private_key()?;
Ok(OpensslServer::from(ssl.build()))
}

6
samples/server/petstore/rust-server/examples/server.rs
View File

@ -33,9 +33,9 @@ fn ssl() -> Result<OpensslServer, ErrorStack> {
let mut ssl = SslAcceptorBuilder::mozilla_intermediate_raw(SslMethod::tls())?;
// Server authentication
ssl.builder_mut().set_private_key_file("examples/server-key.pem", X509_FILETYPE_PEM)?;
ssl.builder_mut().set_certificate_chain_file("examples/server-chain.pem")?;
ssl.builder_mut().check_private_key()?;
ssl.set_private_key_file("examples/server-key.pem", X509_FILETYPE_PEM)?;
ssl.set_certificate_chain_file("examples/server-chain.pem")?;
ssl.check_private_key()?;
Ok(OpensslServer::from(ssl.build()))
}

10
samples/server/petstore/rust-server/src/client.rs
View File

@ -126,7 +126,7 @@ impl Client {
let mut ssl = openssl::ssl::SslConnectorBuilder::new(openssl::ssl::SslMethod::tls()).unwrap();
// Server authentication
ssl.builder_mut().set_ca_file(ca_certificate.clone()).unwrap();
ssl.set_ca_file(ca_certificate.clone()).unwrap();
let ssl = hyper_openssl::OpensslClient::from(ssl.build());
let connector = hyper::net::HttpsConnector::new(ssl);
@ -158,12 +158,12 @@ impl Client {
let mut ssl = openssl::ssl::SslConnectorBuilder::new(openssl::ssl::SslMethod::tls()).unwrap();
// Server authentication
ssl.builder_mut().set_ca_file(ca_certificate.clone()).unwrap();
ssl.set_ca_file(ca_certificate.clone()).unwrap();
// Client authentication
ssl.builder_mut().set_private_key_file(client_key.clone(), openssl::x509::X509_FILETYPE_PEM).unwrap();
ssl.builder_mut().set_certificate_chain_file(client_certificate.clone()).unwrap();
ssl.builder_mut().check_private_key().unwrap();
ssl.set_private_key_file(client_key.clone(), openssl::x509::X509_FILETYPE_PEM).unwrap();
ssl.set_certificate_chain_file(client_certificate.clone()).unwrap();
ssl.check_private_key().unwrap();
let ssl = hyper_openssl::OpensslClient::from(ssl.build());
let connector = hyper::net::HttpsConnector::new(ssl);