Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test(bindings): Consolidate test pems #4858

Merged
merged 3 commits into from
Oct 24, 2024
Merged

test(bindings): Consolidate test pems #4858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3288e3
test(bindings): Consolidate test pems
goatgoose Oct 22, 2024
f096fa6
Merge branch 'main' into consolidate-pems
goatgoose Oct 23, 2024
0307f85
Merge branch 'main' into consolidate-pems
goatgoose Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...ust/s2n-tls-tokio/examples/certs/cert.pem → bindings/rust/certs/cert.pem
View file
Open in desktop
File renamed without changes.
0 ...s2n-tls-tokio/examples/certs/cert_rsa.pem → bindings/rust/certs/cert_rsa.pem
View file
Open in desktop
File renamed without changes.
0 .../s2n-tls-tokio/examples/certs/generate.sh → bindings/rust/certs/generate.sh
View file
Open in desktop
File renamed without changes.
0 ...rust/s2n-tls-tokio/examples/certs/key.pem → bindings/rust/certs/key.pem
View file
Open in desktop
File renamed without changes.
0 .../s2n-tls-tokio/examples/certs/key_rsa.pem → bindings/rust/certs/key_rsa.pem
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion bindings/rust/s2n-tls-tokio/examples/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::{error::Error, fs};
use tokio::{io::AsyncWriteExt, net::TcpStream};

/// NOTE: this certificate is to be used for demonstration purposes only!
const DEFAULT_CERT: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/examples/certs/cert.pem");
const DEFAULT_CERT: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../certs/cert.pem");

#[derive(Parser, Debug)]
struct Args {
Expand Down
4 changes: 2 additions & 2 deletions bindings/rust/s2n-tls-tokio/examples/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use std::{error::Error, fs};
use tokio::{io::AsyncWriteExt, net::TcpListener};

/// NOTE: this certificate and key are to be used for demonstration purposes only!
const DEFAULT_CERT: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/examples/certs/cert.pem");
const DEFAULT_KEY: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/examples/certs/key.pem");
const DEFAULT_CERT: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../certs/cert.pem");
const DEFAULT_KEY: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../certs/key.pem");

#[derive(Parser, Debug)]
struct Args {
Expand Down
20 changes: 7 additions & 13 deletions bindings/rust/s2n-tls-tokio/tests/common/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,16 @@ mod time;
pub use time::*;

/// NOTE: this certificate and key are used for testing purposes only!
pub static CERT_PEM: &[u8] = include_bytes!(concat!(
env!("CARGO_MANIFEST_DIR"),
"/examples/certs/cert.pem"
));
pub static KEY_PEM: &[u8] = include_bytes!(concat!(
env!("CARGO_MANIFEST_DIR"),
"/examples/certs/key.pem"
));
pub static CERT_PEM: &[u8] =
include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../certs/cert.pem"));
pub static KEY_PEM: &[u8] =
include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../certs/key.pem"));
pub static RSA_CERT_PEM: &[u8] = include_bytes!(concat!(
env!("CARGO_MANIFEST_DIR"),
"/examples/certs/cert_rsa.pem"
));
pub static RSA_KEY_PEM: &[u8] = include_bytes!(concat!(
env!("CARGO_MANIFEST_DIR"),
"/examples/certs/key_rsa.pem"
"/../certs/cert_rsa.pem"
));
pub static RSA_KEY_PEM: &[u8] =
include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../certs/key_rsa.pem"));

pub const MIN_BLINDING_SECS: Duration = Duration::from_secs(10);
pub const MAX_BLINDING_SECS: Duration = Duration::from_secs(30);
Expand Down
10 changes: 2 additions & 8 deletions bindings/rust/s2n-tls/src/callbacks/pkey.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,8 @@ mod tests {

type Error = Box<dyn std::error::Error>;

const KEY: &[u8] = include_bytes!(concat!(
env!("CARGO_MANIFEST_DIR"),
"/../../../tests/pems/ecdsa_p384_pkcs1_key.pem"
));
const CERT: &[u8] = include_bytes!(concat!(
env!("CARGO_MANIFEST_DIR"),
"/../../../tests/pems/ecdsa_p384_pkcs1_cert.pem"
));
const KEY: &[u8] = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../certs/key.pem"));
const CERT: &[u8] = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../certs/cert.pem"));

fn new_pair<T>(callback: T, waker: Waker) -> Result<TestPair, Error>
where
Expand Down
12 changes: 6 additions & 6 deletions bindings/rust/s2n-tls/src/testing/s2n_tls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,11 +247,11 @@ mod tests {

#[test]
fn trust_location() -> Result<(), Error> {
let pem_dir = Path::new(concat!(env!("CARGO_MANIFEST_DIR"), "/../../../tests/pems"));
let pem_dir = Path::new(concat!(env!("CARGO_MANIFEST_DIR"), "/../certs"));
let mut cert = pem_dir.to_path_buf();
cert.push("rsa_4096_sha512_client_cert.pem");
cert.push("cert.pem");
let mut key = pem_dir.to_path_buf();
key.push("rsa_4096_sha512_client_key.pem");
key.push("key.pem");

let mut builder = crate::config::Builder::new();
builder.set_security_policy(&security::DEFAULT_TLS13)?;
Expand All @@ -269,11 +269,11 @@ mod tests {
/// on OCSP explicitly still works when `trust_location()` is called.
#[test]
fn trust_location_does_not_change_ocsp_status() -> Result<(), Error> {
let pem_dir = Path::new(concat!(env!("CARGO_MANIFEST_DIR"), "/../../../tests/pems"));
let pem_dir = Path::new(concat!(env!("CARGO_MANIFEST_DIR"), "/../certs"));
let mut cert = pem_dir.to_path_buf();
cert.push("rsa_4096_sha512_client_cert.pem");
cert.push("cert.pem");
let mut key = pem_dir.to_path_buf();
key.push("rsa_4096_sha512_client_key.pem");
key.push("key.pem");

const OCSP_IANA_EXTENSION_ID: u16 = 5;

Expand Down
Loading