mirror of https://github.com/ctz/rustls
update examples to use pki_types re-export
We now re-export the rustls-pki-types crate. I think that means our preferred way for crates to consume pki-types is through the re-exports.
This commit is contained in:
parent
3a35efe7dd
commit
0963cca28d
|
@ -1,6 +1,6 @@
|
|||
use std::{fs, io};
|
||||
|
||||
use pki_types::{CertificateDer, PrivateKeyDer};
|
||||
use rustls::pki_types::{CertificateDer, PrivateKeyDer};
|
||||
|
||||
#[derive(PartialEq, Clone, Copy, Debug)]
|
||||
pub enum KeyType {
|
||||
|
|
|
@ -13,9 +13,11 @@ use std::time::Duration;
|
|||
use std::{fs, thread};
|
||||
|
||||
use docopt::Docopt;
|
||||
use pki_types::{CertificateDer, CertificateRevocationListDer, PrivateKeyDer, PrivatePkcs8KeyDer};
|
||||
use serde_derive::Deserialize;
|
||||
|
||||
use rustls::pki_types::{
|
||||
CertificateDer, CertificateRevocationListDer, PrivateKeyDer, PrivatePkcs8KeyDer,
|
||||
};
|
||||
use rustls::server::{Acceptor, ClientHello, ServerConfig, WebPkiClientVerifier};
|
||||
use rustls::RootCertStore;
|
||||
|
||||
|
|
|
@ -2,8 +2,7 @@ use std::io::{BufRead, BufReader, Write};
|
|||
use std::net::TcpStream;
|
||||
use std::sync::Arc;
|
||||
|
||||
use pki_types::ServerName;
|
||||
|
||||
use rustls::pki_types::ServerName;
|
||||
use rustls::RootCertStore;
|
||||
|
||||
fn start_connection(config: &Arc<rustls::ClientConfig>, domain_name: &str) {
|
||||
|
|
|
@ -5,10 +5,10 @@ use std::{fs, process, str};
|
|||
|
||||
use docopt::Docopt;
|
||||
use mio::net::TcpStream;
|
||||
use pki_types::{CertificateDer, PrivateKeyDer, ServerName};
|
||||
use serde::Deserialize;
|
||||
|
||||
use rustls::crypto::CryptoProvider;
|
||||
use rustls::pki_types::{CertificateDer, PrivateKeyDer, ServerName};
|
||||
use rustls::RootCertStore;
|
||||
|
||||
const CLIENT: mio::Token = mio::Token(0);
|
||||
|
|
|
@ -6,10 +6,10 @@ use std::{fs, net};
|
|||
use docopt::Docopt;
|
||||
use log::{debug, error};
|
||||
use mio::net::{TcpListener, TcpStream};
|
||||
use pki_types::{CertificateDer, CertificateRevocationListDer, PrivateKeyDer};
|
||||
use serde::Deserialize;
|
||||
|
||||
use rustls::crypto::{ring, CryptoProvider};
|
||||
use rustls::pki_types::{CertificateDer, CertificateRevocationListDer, PrivateKeyDer};
|
||||
use rustls::server::WebPkiClientVerifier;
|
||||
use rustls::{self, RootCertStore};
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
extern crate libfuzzer_sys;
|
||||
extern crate rustls;
|
||||
|
||||
use pki_types::ServerName;
|
||||
use rustls::pki_types::ServerName;
|
||||
|
||||
fuzz_target!(|data: &[u8]| {
|
||||
let _ = std::str::from_utf8(data)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use std::io::Write;
|
||||
use std::sync::Arc;
|
||||
|
||||
use pki_types::{CertificateDer, PrivateKeyDer, PrivatePkcs8KeyDer};
|
||||
use rustls::pki_types::{CertificateDer, PrivateKeyDer, PrivatePkcs8KeyDer};
|
||||
use rustls::server::Acceptor;
|
||||
use rustls::ServerConfig;
|
||||
|
||||
|
|
|
@ -6,8 +6,8 @@ extern crate std;
|
|||
|
||||
use alloc::sync::Arc;
|
||||
|
||||
use pki_types::PrivateKeyDer;
|
||||
use rustls::crypto::CryptoProvider;
|
||||
use rustls::pki_types::PrivateKeyDer;
|
||||
|
||||
mod aead;
|
||||
mod hash;
|
||||
|
|
|
@ -3,7 +3,7 @@ use alloc::sync::Arc;
|
|||
use alloc::vec::Vec;
|
||||
|
||||
use pkcs8::DecodePrivateKey;
|
||||
use pki_types::PrivateKeyDer;
|
||||
use rustls::pki_types::PrivateKeyDer;
|
||||
use rustls::sign::{Signer, SigningKey};
|
||||
use rustls::{SignatureAlgorithm, SignatureScheme};
|
||||
use signature::{RandomizedSigner, SignatureEncoding};
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
use der::Reader;
|
||||
use pki_types::{AlgorithmIdentifier, InvalidSignature, SignatureVerificationAlgorithm};
|
||||
use rsa::signature::Verifier;
|
||||
use rsa::{pkcs1v15, pss, BigUint, RsaPublicKey};
|
||||
use rustls::crypto::WebPkiSupportedAlgorithms;
|
||||
use rustls::pki_types::{AlgorithmIdentifier, InvalidSignature, SignatureVerificationAlgorithm};
|
||||
use rustls::SignatureScheme;
|
||||
use webpki::alg_id;
|
||||
|
||||
|
|
|
@ -532,7 +532,7 @@ pub mod version {
|
|||
pub use crate::versions::TLS13;
|
||||
}
|
||||
|
||||
/// Re-exports the contents of rustls-pki-types crate for easy access
|
||||
/// Re-exports the contents of the [rustls-pki-types](https://docs.rs/rustls-pki-types) crate for easy access
|
||||
pub mod pki_types {
|
||||
pub use pki_types::*;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue