From 7fdf90f8fba58b74a64162052ca74913fdecb751 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Thu, 31 Dec 2020 19:48:09 +0100 Subject: [PATCH] Remove needless `fn main() {}` from doctests --- openssl/src/envelope.rs | 20 +++++++++----------- openssl/src/pkey.rs | 10 ++++------ openssl/src/rsa.rs | 10 ++++------ openssl/src/sha.rs | 18 +++++++----------- openssl/src/x509/extension.rs | 8 +++----- openssl/src/x509/store.rs | 32 +++++++++++++++----------------- 6 files changed, 42 insertions(+), 56 deletions(-) diff --git a/openssl/src/envelope.rs b/openssl/src/envelope.rs index 86ba63774..963bab34d 100644 --- a/openssl/src/envelope.rs +++ b/openssl/src/envelope.rs @@ -8,20 +8,18 @@ //! use openssl::pkey::PKey; //! use openssl::symm::Cipher; //! -//! fn main() { -//! let rsa = Rsa::generate(2048).unwrap(); -//! let key = PKey::from_rsa(rsa).unwrap(); +//! let rsa = Rsa::generate(2048).unwrap(); +//! let key = PKey::from_rsa(rsa).unwrap(); //! -//! let cipher = Cipher::aes_256_cbc(); -//! let mut seal = Seal::new(cipher, &[key]).unwrap(); +//! let cipher = Cipher::aes_256_cbc(); +//! let mut seal = Seal::new(cipher, &[key]).unwrap(); //! -//! let secret = b"My secret message"; -//! let mut encrypted = vec![0; secret.len() + cipher.block_size()]; +//! let secret = b"My secret message"; +//! let mut encrypted = vec![0; secret.len() + cipher.block_size()]; //! -//! let mut enc_len = seal.update(secret, &mut encrypted).unwrap(); -//! enc_len += seal.finalize(&mut encrypted[enc_len..]).unwrap(); -//! encrypted.truncate(enc_len); -//! } +//! let mut enc_len = seal.update(secret, &mut encrypted).unwrap(); +//! enc_len += seal.finalize(&mut encrypted[enc_len..]).unwrap(); +//! encrypted.truncate(enc_len); //! ``` use crate::error::ErrorStack; use crate::pkey::{HasPrivate, HasPublic, PKey, PKeyRef}; diff --git a/openssl/src/pkey.rs b/openssl/src/pkey.rs index 6688062c9..d7bcdf0ef 100644 --- a/openssl/src/pkey.rs +++ b/openssl/src/pkey.rs @@ -33,13 +33,11 @@ //! use openssl::pkey::PKey; //! use std::str; //! -//! fn main() { -//! let rsa = Rsa::generate(2048).unwrap(); -//! let pkey = PKey::from_rsa(rsa).unwrap(); +//! let rsa = Rsa::generate(2048).unwrap(); +//! let pkey = PKey::from_rsa(rsa).unwrap(); //! -//! let pub_key: Vec = pkey.public_key_to_pem().unwrap(); -//! println!("{:?}", str::from_utf8(pub_key.as_slice()).unwrap()); -//! } +//! let pub_key: Vec = pkey.public_key_to_pem().unwrap(); +//! println!("{:?}", str::from_utf8(pub_key.as_slice()).unwrap()); //! ``` use foreign_types::{ForeignType, ForeignTypeRef}; diff --git a/openssl/src/rsa.rs b/openssl/src/rsa.rs index 9cd0fb142..21e647cc2 100644 --- a/openssl/src/rsa.rs +++ b/openssl/src/rsa.rs @@ -18,12 +18,10 @@ //! ```rust //! use openssl::rsa::{Rsa, Padding}; //! -//! fn main() { -//! let rsa = Rsa::generate(2048).unwrap(); -//! let data = b"foobar"; -//! let mut buf = vec![0; rsa.size() as usize]; -//! let encrypted_len = rsa.public_encrypt(data, &mut buf, Padding::PKCS1).unwrap(); -//! } +//! let rsa = Rsa::generate(2048).unwrap(); +//! let data = b"foobar"; +//! let mut buf = vec![0; rsa.size() as usize]; +//! let encrypted_len = rsa.public_encrypt(data, &mut buf, Padding::PKCS1).unwrap(); //! ``` use foreign_types::{ForeignType, ForeignTypeRef}; use libc::c_int; diff --git a/openssl/src/sha.rs b/openssl/src/sha.rs index e74eb29fd..811a5321d 100644 --- a/openssl/src/sha.rs +++ b/openssl/src/sha.rs @@ -16,15 +16,13 @@ //! ```rust //! use openssl::sha; //! -//! fn main() { -//! let mut hasher = sha::Sha256::new(); +//! let mut hasher = sha::Sha256::new(); //! -//! hasher.update(b"Hello, "); -//! hasher.update(b"world"); +//! hasher.update(b"Hello, "); +//! hasher.update(b"world"); //! -//! let hash = hasher.finish(); -//! println!("Hashed \"Hello, world\" to {}", hex::encode(hash)); -//! } +//! let hash = hasher.finish(); +//! println!("Hashed \"Hello, world\" to {}", hex::encode(hash)); //! ``` //! //! On the other hand, if you already have access to all of the data you woud like to hash, you @@ -34,10 +32,8 @@ //! ```rust //! use openssl::sha::sha256; //! -//! fn main() { -//! let hash = sha256(b"your data or message"); -//! println!("Hash = {}", hex::encode(hash)); -//! } +//! let hash = sha256(b"your data or message"); +//! println!("Hash = {}", hex::encode(hash)); //! ``` use libc::c_void; use std::mem; diff --git a/openssl/src/x509/extension.rs b/openssl/src/x509/extension.rs index 138606674..fca3492a9 100644 --- a/openssl/src/x509/extension.rs +++ b/openssl/src/x509/extension.rs @@ -11,12 +11,10 @@ //! use openssl::x509::extension::BasicConstraints; //! use openssl::x509::X509Extension; //! -//! fn main() { -//! let mut bc = BasicConstraints::new(); -//! let bc = bc.critical().ca().pathlen(1); +//! let mut bc = BasicConstraints::new(); +//! let bc = bc.critical().ca().pathlen(1); //! -//! let extension: X509Extension = bc.build().unwrap(); -//! } +//! let extension: X509Extension = bc.build().unwrap(); //! ``` use std::fmt::Write; diff --git a/openssl/src/x509/store.rs b/openssl/src/x509/store.rs index 50d911be6..88ca35462 100644 --- a/openssl/src/x509/store.rs +++ b/openssl/src/x509/store.rs @@ -13,28 +13,26 @@ //! use openssl::rsa::Rsa; //! use openssl::nid::Nid; //! -//! fn main() { -//! let rsa = Rsa::generate(2048).unwrap(); -//! let pkey = PKey::from_rsa(rsa).unwrap(); +//! let rsa = Rsa::generate(2048).unwrap(); +//! let pkey = PKey::from_rsa(rsa).unwrap(); //! -//! let mut name = X509Name::builder().unwrap(); -//! name.append_entry_by_nid(Nid::COMMONNAME, "foobar.com").unwrap(); -//! let name = name.build(); +//! let mut name = X509Name::builder().unwrap(); +//! name.append_entry_by_nid(Nid::COMMONNAME, "foobar.com").unwrap(); +//! let name = name.build(); //! -//! let mut builder = X509::builder().unwrap(); -//! builder.set_version(2).unwrap(); -//! builder.set_subject_name(&name).unwrap(); -//! builder.set_issuer_name(&name).unwrap(); -//! builder.set_pubkey(&pkey).unwrap(); -//! builder.sign(&pkey, MessageDigest::sha256()).unwrap(); +//! let mut builder = X509::builder().unwrap(); +//! builder.set_version(2).unwrap(); +//! builder.set_subject_name(&name).unwrap(); +//! builder.set_issuer_name(&name).unwrap(); +//! builder.set_pubkey(&pkey).unwrap(); +//! builder.sign(&pkey, MessageDigest::sha256()).unwrap(); //! -//! let certificate: X509 = builder.build(); +//! let certificate: X509 = builder.build(); //! -//! let mut builder = X509StoreBuilder::new().unwrap(); -//! let _ = builder.add_cert(certificate); +//! let mut builder = X509StoreBuilder::new().unwrap(); +//! let _ = builder.add_cert(certificate); //! -//! let store: X509Store = builder.build(); -//! } +//! let store: X509Store = builder.build(); //! ``` use foreign_types::ForeignTypeRef; -- GitLab