From 1d70e45af6c7f0d6940f4c7b641daacc70ac9ce8 Mon Sep 17 00:00:00 2001 From: Joseph Birr-Pixton Date: Sat, 24 Aug 2019 18:20:14 +0100 Subject: [PATCH] Move to using cargo workspaces - rustls (the library) now lives in rustls/ - the mio examples/tests continue to live in rustls-mio, but are built by (eg) `cargo test` in the root of the repo. --- .travis.yml | 1 - Cargo.toml | 56 +++--------------- admin/coverage | 12 ++-- admin/pipelines/cargo-steps.yml | 3 - admin/pipelines/min-versions.yml | 3 - rustls-mio/Cargo.toml | 2 +- rustls-mio/tests/common/mod.rs | 4 +- rustls-mio/tests/features.rs | 8 +-- rustls/Cargo.toml | 50 ++++++++++++++++ {examples => rustls/examples}/README.md | 0 .../examples}/internal/bench.rs | 0 .../examples}/internal/bogo_shim.rs | 0 .../examples}/internal/trytls_shim.rs | 0 {src => rustls/src}/anchors.rs | 0 {src => rustls/src}/bs_debug.rs | 0 {src => rustls/src}/cipher.rs | 0 {src => rustls/src}/client/common.rs | 0 {src => rustls/src}/client/handy.rs | 0 {src => rustls/src}/client/hs.rs | 0 {src => rustls/src}/client/mod.rs | 0 {src => rustls/src}/client/tls12.rs | 0 {src => rustls/src}/client/tls13.rs | 0 {src => rustls/src}/error.rs | 0 {src => rustls/src}/handshake.rs | 0 {src => rustls/src}/hash_hs.rs | 0 {src => rustls/src}/key.rs | 0 {src => rustls/src}/key_schedule.rs | 0 {src => rustls/src}/keylog.rs | 0 {src => rustls/src}/lib.rs | 0 {src => rustls/src}/msgs/alert.rs | 0 {src => rustls/src}/msgs/base.rs | 0 {src => rustls/src}/msgs/ccs.rs | 0 {src => rustls/src}/msgs/codec.rs | 0 {src => rustls/src}/msgs/deframer.rs | 0 {src => rustls/src}/msgs/enums.rs | 0 {src => rustls/src}/msgs/enums_test.rs | 0 {src => rustls/src}/msgs/fragmenter.rs | 0 {src => rustls/src}/msgs/handshake-test.1.bin | Bin {src => rustls/src}/msgs/handshake.rs | 0 {src => rustls/src}/msgs/handshake_test.rs | 0 {src => rustls/src}/msgs/hsjoiner.rs | 0 {src => rustls/src}/msgs/macros.rs | 0 {src => rustls/src}/msgs/message.rs | 0 {src => rustls/src}/msgs/message_test.rs | 15 ++++- {src => rustls/src}/msgs/mod.rs | 0 {src => rustls/src}/msgs/persist.rs | 0 {src => rustls/src}/msgs/persist_test.rs | 0 {src => rustls/src}/pemfile.rs | 0 {src => rustls/src}/prf.rs | 0 {src => rustls/src}/quic.rs | 0 {src => rustls/src}/rand.rs | 0 {src => rustls/src}/server/common.rs | 0 {src => rustls/src}/server/handy.rs | 0 {src => rustls/src}/server/hs.rs | 0 {src => rustls/src}/server/mod.rs | 0 {src => rustls/src}/server/tls12.rs | 0 {src => rustls/src}/server/tls13.rs | 0 {src => rustls/src}/session.rs | 0 {src => rustls/src}/sign.rs | 0 {src => rustls/src}/stream.rs | 0 {src => rustls/src}/suites.rs | 0 .../src}/testdata/cert-arstechnica.0.der | Bin .../src}/testdata/cert-arstechnica.1.der | Bin .../src}/testdata/cert-arstechnica.2.der | Bin .../src}/testdata/cert-duckduckgo.0.der | Bin .../src}/testdata/cert-duckduckgo.1.der | Bin .../src}/testdata/cert-github.0.der | Bin .../src}/testdata/cert-github.1.der | Bin .../src}/testdata/cert-google.0.der | Bin .../src}/testdata/cert-google.1.der | Bin .../src}/testdata/cert-google.2.der | Bin {src => rustls/src}/testdata/cert-hn.0.der | Bin {src => rustls/src}/testdata/cert-hn.1.der | Bin {src => rustls/src}/testdata/cert-hn.2.der | Bin .../src}/testdata/cert-reddit.0.der | Bin .../src}/testdata/cert-reddit.1.der | Bin .../src}/testdata/cert-rustlang.0.der | Bin .../src}/testdata/cert-rustlang.1.der | Bin .../src}/testdata/cert-rustlang.2.der | Bin {src => rustls/src}/testdata/cert-servo.0.der | Bin {src => rustls/src}/testdata/cert-servo.1.der | Bin {src => rustls/src}/testdata/cert-servo.2.der | Bin .../src}/testdata/cert-stackoverflow.0.der | Bin .../src}/testdata/cert-stackoverflow.1.der | Bin .../src}/testdata/cert-twitter.0.der | Bin .../src}/testdata/cert-twitter.1.der | Bin {src => rustls/src}/testdata/cert-wapo.0.der | Bin {src => rustls/src}/testdata/cert-wapo.1.der | Bin {src => rustls/src}/testdata/cert-wapo.2.der | Bin .../src}/testdata/cert-wikipedia.0.der | Bin .../src}/testdata/cert-wikipedia.1.der | Bin .../src}/testdata/deframer-test.1.bin | Bin .../src}/testdata/deframer-test.2.bin | Bin {src => rustls/src}/testdata/prf-result.1.bin | 0 {src => rustls/src}/testdata/prf-result.2.bin | 0 {src => rustls/src}/ticketer.rs | 0 {src => rustls/src}/util.rs | 0 {src => rustls/src}/vecbuf.rs | 0 {src => rustls/src}/verify.rs | 0 {src => rustls/src}/verifybench.rs | 0 {src => rustls/src}/x509.rs | 0 {tests => rustls/tests}/api.rs | 0 {tests => rustls/tests}/benchmarks.rs | 0 {tests => rustls/tests}/common/mod.rs | 2 +- 104 files changed, 84 insertions(+), 72 deletions(-) create mode 100644 rustls/Cargo.toml rename {examples => rustls/examples}/README.md (100%) rename {examples => rustls/examples}/internal/bench.rs (100%) rename {examples => rustls/examples}/internal/bogo_shim.rs (100%) rename {examples => rustls/examples}/internal/trytls_shim.rs (100%) rename {src => rustls/src}/anchors.rs (100%) rename {src => rustls/src}/bs_debug.rs (100%) rename {src => rustls/src}/cipher.rs (100%) rename {src => rustls/src}/client/common.rs (100%) rename {src => rustls/src}/client/handy.rs (100%) rename {src => rustls/src}/client/hs.rs (100%) rename {src => rustls/src}/client/mod.rs (100%) rename {src => rustls/src}/client/tls12.rs (100%) rename {src => rustls/src}/client/tls13.rs (100%) rename {src => rustls/src}/error.rs (100%) rename {src => rustls/src}/handshake.rs (100%) rename {src => rustls/src}/hash_hs.rs (100%) rename {src => rustls/src}/key.rs (100%) rename {src => rustls/src}/key_schedule.rs (100%) rename {src => rustls/src}/keylog.rs (100%) rename {src => rustls/src}/lib.rs (100%) rename {src => rustls/src}/msgs/alert.rs (100%) rename {src => rustls/src}/msgs/base.rs (100%) rename {src => rustls/src}/msgs/ccs.rs (100%) rename {src => rustls/src}/msgs/codec.rs (100%) rename {src => rustls/src}/msgs/deframer.rs (100%) rename {src => rustls/src}/msgs/enums.rs (100%) rename {src => rustls/src}/msgs/enums_test.rs (100%) rename {src => rustls/src}/msgs/fragmenter.rs (100%) rename {src => rustls/src}/msgs/handshake-test.1.bin (100%) rename {src => rustls/src}/msgs/handshake.rs (100%) rename {src => rustls/src}/msgs/handshake_test.rs (100%) rename {src => rustls/src}/msgs/hsjoiner.rs (100%) rename {src => rustls/src}/msgs/macros.rs (100%) rename {src => rustls/src}/msgs/message.rs (100%) rename {src => rustls/src}/msgs/message_test.rs (83%) rename {src => rustls/src}/msgs/mod.rs (100%) rename {src => rustls/src}/msgs/persist.rs (100%) rename {src => rustls/src}/msgs/persist_test.rs (100%) rename {src => rustls/src}/pemfile.rs (100%) rename {src => rustls/src}/prf.rs (100%) rename {src => rustls/src}/quic.rs (100%) rename {src => rustls/src}/rand.rs (100%) rename {src => rustls/src}/server/common.rs (100%) rename {src => rustls/src}/server/handy.rs (100%) rename {src => rustls/src}/server/hs.rs (100%) rename {src => rustls/src}/server/mod.rs (100%) rename {src => rustls/src}/server/tls12.rs (100%) rename {src => rustls/src}/server/tls13.rs (100%) rename {src => rustls/src}/session.rs (100%) rename {src => rustls/src}/sign.rs (100%) rename {src => rustls/src}/stream.rs (100%) rename {src => rustls/src}/suites.rs (100%) rename {src => rustls/src}/testdata/cert-arstechnica.0.der (100%) rename {src => rustls/src}/testdata/cert-arstechnica.1.der (100%) rename {src => rustls/src}/testdata/cert-arstechnica.2.der (100%) rename {src => rustls/src}/testdata/cert-duckduckgo.0.der (100%) rename {src => rustls/src}/testdata/cert-duckduckgo.1.der (100%) rename {src => rustls/src}/testdata/cert-github.0.der (100%) rename {src => rustls/src}/testdata/cert-github.1.der (100%) rename {src => rustls/src}/testdata/cert-google.0.der (100%) rename {src => rustls/src}/testdata/cert-google.1.der (100%) rename {src => rustls/src}/testdata/cert-google.2.der (100%) rename {src => rustls/src}/testdata/cert-hn.0.der (100%) rename {src => rustls/src}/testdata/cert-hn.1.der (100%) rename {src => rustls/src}/testdata/cert-hn.2.der (100%) rename {src => rustls/src}/testdata/cert-reddit.0.der (100%) rename {src => rustls/src}/testdata/cert-reddit.1.der (100%) rename {src => rustls/src}/testdata/cert-rustlang.0.der (100%) rename {src => rustls/src}/testdata/cert-rustlang.1.der (100%) rename {src => rustls/src}/testdata/cert-rustlang.2.der (100%) rename {src => rustls/src}/testdata/cert-servo.0.der (100%) rename {src => rustls/src}/testdata/cert-servo.1.der (100%) rename {src => rustls/src}/testdata/cert-servo.2.der (100%) rename {src => rustls/src}/testdata/cert-stackoverflow.0.der (100%) rename {src => rustls/src}/testdata/cert-stackoverflow.1.der (100%) rename {src => rustls/src}/testdata/cert-twitter.0.der (100%) rename {src => rustls/src}/testdata/cert-twitter.1.der (100%) rename {src => rustls/src}/testdata/cert-wapo.0.der (100%) rename {src => rustls/src}/testdata/cert-wapo.1.der (100%) rename {src => rustls/src}/testdata/cert-wapo.2.der (100%) rename {src => rustls/src}/testdata/cert-wikipedia.0.der (100%) rename {src => rustls/src}/testdata/cert-wikipedia.1.der (100%) rename {src => rustls/src}/testdata/deframer-test.1.bin (100%) rename {src => rustls/src}/testdata/deframer-test.2.bin (100%) rename {src => rustls/src}/testdata/prf-result.1.bin (100%) rename {src => rustls/src}/testdata/prf-result.2.bin (100%) rename {src => rustls/src}/ticketer.rs (100%) rename {src => rustls/src}/util.rs (100%) rename {src => rustls/src}/vecbuf.rs (100%) rename {src => rustls/src}/verify.rs (100%) rename {src => rustls/src}/verifybench.rs (100%) rename {src => rustls/src}/x509.rs (100%) rename {tests => rustls/tests}/api.rs (100%) rename {tests => rustls/tests}/benchmarks.rs (100%) rename {tests => rustls/tests}/common/mod.rs (99%) diff --git a/.travis.yml b/.travis.yml index 70cf590b..8299a932 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,5 @@ script: - ( cd bogo && ./runme ) - cargo build --no-default-features - cargo test --no-default-features --no-run - - ( cd rustls-mio && cargo test --all-features ) - if [[ "$COVERAGE" == "1" ]]; then ./admin/coverage ; fi - if [[ "$COVERAGE" == "1" ]]; then coveralls-lcov final.info ; fi diff --git a/Cargo.toml b/Cargo.toml index c0ca5440..26f7901d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,49 +1,7 @@ -[package] -name = "rustls" -version = "0.16.0" -edition = "2018" -authors = ["Joseph Birr-Pixton "] -license = "Apache-2.0/ISC/MIT" -readme = "README.md" -description = "Rustls is a modern TLS library written in Rust." -homepage = "https://github.com/ctz/rustls" -repository = "https://github.com/ctz/rustls" -categories = ["network-programming", "cryptography"] - -[dependencies] -base64 = "0.10" -log = { version = "0.4.4", optional = true } -ring = "0.16.5" -sct = "0.6.0" -webpki = "0.21.0" - -[features] -default = ["logging"] -logging = ["log"] -dangerous_configuration = [] -quic = [] - -[dev-dependencies] -env_logger = "0.6.1" -log = "0.4.4" -tempfile = "3.0" -webpki-roots = "0.17.0" -criterion = "0.2.11" - -[[example]] -name = "bogo_shim" -path = "examples/internal/bogo_shim.rs" -required-features = ["dangerous_configuration", "quic"] - -[[example]] -name = "trytls_shim" -path = "examples/internal/trytls_shim.rs" - -[[example]] -name = "bench" -path = "examples/internal/bench.rs" - -[[bench]] -name = "benchmarks" -path = "tests/benchmarks.rs" -harness = false +[workspace] +members = [ + # the main library and tests + "rustls", + # tests and example code that depend on mio + "rustls-mio", +] diff --git a/admin/coverage b/admin/coverage index 4092cd36..f7eb8e00 100755 --- a/admin/coverage +++ b/admin/coverage @@ -53,7 +53,7 @@ def remove(outfile, infile, pattern): subprocess.check_call(lcov_exe('--remove', infile, os.getcwd() + pattern, '-o', outfile)) def extract(outfile, infile): - subprocess.check_call(lcov_exe('--extract', infile, os.getcwd() + '/src/*', '-o', outfile)) + subprocess.check_call(lcov_exe('--extract', infile, os.getcwd() + '/rustls/src/*', '-o', outfile)) def genhtml(outdir, infile): subprocess.check_call(['genhtml', '--branch-coverage', '--demangle-cpp', '--legend', @@ -63,17 +63,17 @@ all_infos = [] # unit tests cleanup() -rustc('--profile', 'test', '--lib') +rustc('--package', 'rustls', '--profile', 'test', '--lib') run('rustls') all_infos.append(lcov('rustls.info')) cleanup() for example in 'bench bogo_shim trytls_shim'.split(): - rustc('--profile', 'dev', '--example', example) + rustc('--package', 'rustls', '--profile', 'dev', '--example', example) -# tests +# crate-level tests for test in 'api'.split(): - rustc('--profile', 'dev', '--test', test) + rustc('--package', 'rustls', '--profile', 'dev', '--test', test) run(test) # trytls/bogo @@ -82,6 +82,6 @@ sh('cd bogo && ./runme') all_infos.append(lcov('tests.info')) merge('merged.info', all_infos) -remove('coverage.info', 'merged.info', '/src/msgs/macros.rs') +remove('coverage.info', 'merged.info', '/rustls/src/msgs/macros.rs') extract('final.info', 'coverage.info') genhtml('target/coverage/', 'final.info') diff --git a/admin/pipelines/cargo-steps.yml b/admin/pipelines/cargo-steps.yml index b679c082..84894b4e 100644 --- a/admin/pipelines/cargo-steps.yml +++ b/admin/pipelines/cargo-steps.yml @@ -13,6 +13,3 @@ steps: displayName: "cargo test (debug; no default features; no run)" - script: cargo test --release --no-run displayName: "cargo test (release; no run)" - - script: cargo test --all-features - displayName: "rustls-mio cargo test (debug; all features)" - workingDirectory: rustls-mio diff --git a/admin/pipelines/min-versions.yml b/admin/pipelines/min-versions.yml index f2d74580..04456091 100644 --- a/admin/pipelines/min-versions.yml +++ b/admin/pipelines/min-versions.yml @@ -1,6 +1,3 @@ steps: - script: cargo -Z minimal-versions test --all-features displayName: "rustls cargo test (debug; all features)" - - script: cargo -Z minimal-versions test --all-features - displayName: "rustls-mio cargo test (debug; all features)" - workingDirectory: rustls-mio diff --git a/rustls-mio/Cargo.toml b/rustls-mio/Cargo.toml index 5bcd5706..8a8dd422 100644 --- a/rustls-mio/Cargo.toml +++ b/rustls-mio/Cargo.toml @@ -19,7 +19,7 @@ quic = ["rustls/quic"] [dependencies] base64 = "0.10" log = { version = "0.4.4", optional = true } -rustls = { path = ".." } +rustls = { path = "../rustls" } sct = "0.6" webpki = "0.21.0" diff --git a/rustls-mio/tests/common/mod.rs b/rustls-mio/tests/common/mod.rs index 0c7fb8ce..5f588b77 100644 --- a/rustls-mio/tests/common/mod.rs +++ b/rustls-mio/tests/common/mod.rs @@ -131,11 +131,11 @@ pub fn skipped(why: &str) { } pub fn tlsserver_find() -> &'static str { - "target/debug/examples/tlsserver" + "../target/debug/examples/tlsserver" } pub fn tlsclient_find() -> &'static str { - "target/debug/examples/tlsclient" + "../target/debug/examples/tlsclient" } pub fn openssl_find() -> String { diff --git a/rustls-mio/tests/features.rs b/rustls-mio/tests/features.rs index 1daac6e3..b4d36030 100644 --- a/rustls-mio/tests/features.rs +++ b/rustls-mio/tests/features.rs @@ -235,7 +235,7 @@ fn client_resumes() { .go(); } - let cache_filename = "target/debug/session.cache"; + let cache_filename = "../target/debug/session.cache"; let _ = fs::remove_file(cache_filename); server.client() @@ -265,8 +265,8 @@ fn server_resumes() { .http_mode() .run(); - let sess1 = "target/debug/session1.ssl"; - let sess2 = "target/debug/session2.ssl"; + let sess1 = "../target/debug/session1.ssl"; + let sess2 = "../target/debug/session2.ssl"; server.client() .arg("-sess_out") @@ -310,7 +310,7 @@ fn server_resumes_with_tickets() { .http_mode() .run(); - let sess = "target/debug/ticket.ssl"; + let sess = "../target/debug/ticket.ssl"; server.client() .arg("-sess_out") diff --git a/rustls/Cargo.toml b/rustls/Cargo.toml new file mode 100644 index 00000000..c92d6d78 --- /dev/null +++ b/rustls/Cargo.toml @@ -0,0 +1,50 @@ +[package] +name = "rustls" +version = "0.16.0" +edition = "2018" +authors = ["Joseph Birr-Pixton "] +license = "Apache-2.0/ISC/MIT" +readme = "README.md" +description = "Rustls is a modern TLS library written in Rust." +homepage = "https://github.com/ctz/rustls" +repository = "https://github.com/ctz/rustls" +categories = ["network-programming", "cryptography"] +autobenches = false + +[dependencies] +base64 = "0.10" +log = { version = "0.4.4", optional = true } +ring = "0.16.5" +sct = "0.6.0" +webpki = "0.21.0" + +[features] +default = ["logging"] +logging = ["log"] +dangerous_configuration = [] +quic = [] + +[dev-dependencies] +env_logger = "0.6.1" +log = "0.4.4" +tempfile = "3.0" +webpki-roots = "0.17.0" +criterion = "0.2.11" + +[[example]] +name = "bogo_shim" +path = "examples/internal/bogo_shim.rs" +required-features = ["dangerous_configuration", "quic"] + +[[example]] +name = "trytls_shim" +path = "examples/internal/trytls_shim.rs" + +[[example]] +name = "bench" +path = "examples/internal/bench.rs" + +[[bench]] +name = "benchmarks" +path = "tests/benchmarks.rs" +harness = false diff --git a/examples/README.md b/rustls/examples/README.md similarity index 100% rename from examples/README.md rename to rustls/examples/README.md diff --git a/examples/internal/bench.rs b/rustls/examples/internal/bench.rs similarity index 100% rename from examples/internal/bench.rs rename to rustls/examples/internal/bench.rs diff --git a/examples/internal/bogo_shim.rs b/rustls/examples/internal/bogo_shim.rs similarity index 100% rename from examples/internal/bogo_shim.rs rename to rustls/examples/internal/bogo_shim.rs diff --git a/examples/internal/trytls_shim.rs b/rustls/examples/internal/trytls_shim.rs similarity index 100% rename from examples/internal/trytls_shim.rs rename to rustls/examples/internal/trytls_shim.rs diff --git a/src/anchors.rs b/rustls/src/anchors.rs similarity index 100% rename from src/anchors.rs rename to rustls/src/anchors.rs diff --git a/src/bs_debug.rs b/rustls/src/bs_debug.rs similarity index 100% rename from src/bs_debug.rs rename to rustls/src/bs_debug.rs diff --git a/src/cipher.rs b/rustls/src/cipher.rs similarity index 100% rename from src/cipher.rs rename to rustls/src/cipher.rs diff --git a/src/client/common.rs b/rustls/src/client/common.rs similarity index 100% rename from src/client/common.rs rename to rustls/src/client/common.rs diff --git a/src/client/handy.rs b/rustls/src/client/handy.rs similarity index 100% rename from src/client/handy.rs rename to rustls/src/client/handy.rs diff --git a/src/client/hs.rs b/rustls/src/client/hs.rs similarity index 100% rename from src/client/hs.rs rename to rustls/src/client/hs.rs diff --git a/src/client/mod.rs b/rustls/src/client/mod.rs similarity index 100% rename from src/client/mod.rs rename to rustls/src/client/mod.rs diff --git a/src/client/tls12.rs b/rustls/src/client/tls12.rs similarity index 100% rename from src/client/tls12.rs rename to rustls/src/client/tls12.rs diff --git a/src/client/tls13.rs b/rustls/src/client/tls13.rs similarity index 100% rename from src/client/tls13.rs rename to rustls/src/client/tls13.rs diff --git a/src/error.rs b/rustls/src/error.rs similarity index 100% rename from src/error.rs rename to rustls/src/error.rs diff --git a/src/handshake.rs b/rustls/src/handshake.rs similarity index 100% rename from src/handshake.rs rename to rustls/src/handshake.rs diff --git a/src/hash_hs.rs b/rustls/src/hash_hs.rs similarity index 100% rename from src/hash_hs.rs rename to rustls/src/hash_hs.rs diff --git a/src/key.rs b/rustls/src/key.rs similarity index 100% rename from src/key.rs rename to rustls/src/key.rs diff --git a/src/key_schedule.rs b/rustls/src/key_schedule.rs similarity index 100% rename from src/key_schedule.rs rename to rustls/src/key_schedule.rs diff --git a/src/keylog.rs b/rustls/src/keylog.rs similarity index 100% rename from src/keylog.rs rename to rustls/src/keylog.rs diff --git a/src/lib.rs b/rustls/src/lib.rs similarity index 100% rename from src/lib.rs rename to rustls/src/lib.rs diff --git a/src/msgs/alert.rs b/rustls/src/msgs/alert.rs similarity index 100% rename from src/msgs/alert.rs rename to rustls/src/msgs/alert.rs diff --git a/src/msgs/base.rs b/rustls/src/msgs/base.rs similarity index 100% rename from src/msgs/base.rs rename to rustls/src/msgs/base.rs diff --git a/src/msgs/ccs.rs b/rustls/src/msgs/ccs.rs similarity index 100% rename from src/msgs/ccs.rs rename to rustls/src/msgs/ccs.rs diff --git a/src/msgs/codec.rs b/rustls/src/msgs/codec.rs similarity index 100% rename from src/msgs/codec.rs rename to rustls/src/msgs/codec.rs diff --git a/src/msgs/deframer.rs b/rustls/src/msgs/deframer.rs similarity index 100% rename from src/msgs/deframer.rs rename to rustls/src/msgs/deframer.rs diff --git a/src/msgs/enums.rs b/rustls/src/msgs/enums.rs similarity index 100% rename from src/msgs/enums.rs rename to rustls/src/msgs/enums.rs diff --git a/src/msgs/enums_test.rs b/rustls/src/msgs/enums_test.rs similarity index 100% rename from src/msgs/enums_test.rs rename to rustls/src/msgs/enums_test.rs diff --git a/src/msgs/fragmenter.rs b/rustls/src/msgs/fragmenter.rs similarity index 100% rename from src/msgs/fragmenter.rs rename to rustls/src/msgs/fragmenter.rs diff --git a/src/msgs/handshake-test.1.bin b/rustls/src/msgs/handshake-test.1.bin similarity index 100% rename from src/msgs/handshake-test.1.bin rename to rustls/src/msgs/handshake-test.1.bin diff --git a/src/msgs/handshake.rs b/rustls/src/msgs/handshake.rs similarity index 100% rename from src/msgs/handshake.rs rename to rustls/src/msgs/handshake.rs diff --git a/src/msgs/handshake_test.rs b/rustls/src/msgs/handshake_test.rs similarity index 100% rename from src/msgs/handshake_test.rs rename to rustls/src/msgs/handshake_test.rs diff --git a/src/msgs/hsjoiner.rs b/rustls/src/msgs/hsjoiner.rs similarity index 100% rename from src/msgs/hsjoiner.rs rename to rustls/src/msgs/hsjoiner.rs diff --git a/src/msgs/macros.rs b/rustls/src/msgs/macros.rs similarity index 100% rename from src/msgs/macros.rs rename to rustls/src/msgs/macros.rs diff --git a/src/msgs/message.rs b/rustls/src/msgs/message.rs similarity index 100% rename from src/msgs/message.rs rename to rustls/src/msgs/message.rs diff --git a/src/msgs/message_test.rs b/rustls/src/msgs/message_test.rs similarity index 83% rename from src/msgs/message_test.rs rename to rustls/src/msgs/message_test.rs index 63315cc7..7a6c4024 100644 --- a/src/msgs/message_test.rs +++ b/rustls/src/msgs/message_test.rs @@ -4,11 +4,22 @@ use super::message::Message; use std::fs; use std::io::Read; +use std::path::{Path, PathBuf}; #[test] fn test_read_fuzz_corpus() { - let prefix = "fuzz/corpus/message/"; - for file in fs::read_dir(prefix).unwrap() { + fn corpus_dir() -> PathBuf { + let from_subcrate = Path::new("../fuzz/corpus/message"); + let from_root = Path::new("fuzz/corpus/message"); + + if from_root.is_dir() { + from_root.to_path_buf() + } else { + from_subcrate.to_path_buf() + } + } + + for file in fs::read_dir(corpus_dir()).unwrap() { let mut f = fs::File::open(file.unwrap().path()).unwrap(); let mut bytes = Vec::new(); f.read_to_end(&mut bytes).unwrap(); diff --git a/src/msgs/mod.rs b/rustls/src/msgs/mod.rs similarity index 100% rename from src/msgs/mod.rs rename to rustls/src/msgs/mod.rs diff --git a/src/msgs/persist.rs b/rustls/src/msgs/persist.rs similarity index 100% rename from src/msgs/persist.rs rename to rustls/src/msgs/persist.rs diff --git a/src/msgs/persist_test.rs b/rustls/src/msgs/persist_test.rs similarity index 100% rename from src/msgs/persist_test.rs rename to rustls/src/msgs/persist_test.rs diff --git a/src/pemfile.rs b/rustls/src/pemfile.rs similarity index 100% rename from src/pemfile.rs rename to rustls/src/pemfile.rs diff --git a/src/prf.rs b/rustls/src/prf.rs similarity index 100% rename from src/prf.rs rename to rustls/src/prf.rs diff --git a/src/quic.rs b/rustls/src/quic.rs similarity index 100% rename from src/quic.rs rename to rustls/src/quic.rs diff --git a/src/rand.rs b/rustls/src/rand.rs similarity index 100% rename from src/rand.rs rename to rustls/src/rand.rs diff --git a/src/server/common.rs b/rustls/src/server/common.rs similarity index 100% rename from src/server/common.rs rename to rustls/src/server/common.rs diff --git a/src/server/handy.rs b/rustls/src/server/handy.rs similarity index 100% rename from src/server/handy.rs rename to rustls/src/server/handy.rs diff --git a/src/server/hs.rs b/rustls/src/server/hs.rs similarity index 100% rename from src/server/hs.rs rename to rustls/src/server/hs.rs diff --git a/src/server/mod.rs b/rustls/src/server/mod.rs similarity index 100% rename from src/server/mod.rs rename to rustls/src/server/mod.rs diff --git a/src/server/tls12.rs b/rustls/src/server/tls12.rs similarity index 100% rename from src/server/tls12.rs rename to rustls/src/server/tls12.rs diff --git a/src/server/tls13.rs b/rustls/src/server/tls13.rs similarity index 100% rename from src/server/tls13.rs rename to rustls/src/server/tls13.rs diff --git a/src/session.rs b/rustls/src/session.rs similarity index 100% rename from src/session.rs rename to rustls/src/session.rs diff --git a/src/sign.rs b/rustls/src/sign.rs similarity index 100% rename from src/sign.rs rename to rustls/src/sign.rs diff --git a/src/stream.rs b/rustls/src/stream.rs similarity index 100% rename from src/stream.rs rename to rustls/src/stream.rs diff --git a/src/suites.rs b/rustls/src/suites.rs similarity index 100% rename from src/suites.rs rename to rustls/src/suites.rs diff --git a/src/testdata/cert-arstechnica.0.der b/rustls/src/testdata/cert-arstechnica.0.der similarity index 100% rename from src/testdata/cert-arstechnica.0.der rename to rustls/src/testdata/cert-arstechnica.0.der diff --git a/src/testdata/cert-arstechnica.1.der b/rustls/src/testdata/cert-arstechnica.1.der similarity index 100% rename from src/testdata/cert-arstechnica.1.der rename to rustls/src/testdata/cert-arstechnica.1.der diff --git a/src/testdata/cert-arstechnica.2.der b/rustls/src/testdata/cert-arstechnica.2.der similarity index 100% rename from src/testdata/cert-arstechnica.2.der rename to rustls/src/testdata/cert-arstechnica.2.der diff --git a/src/testdata/cert-duckduckgo.0.der b/rustls/src/testdata/cert-duckduckgo.0.der similarity index 100% rename from src/testdata/cert-duckduckgo.0.der rename to rustls/src/testdata/cert-duckduckgo.0.der diff --git a/src/testdata/cert-duckduckgo.1.der b/rustls/src/testdata/cert-duckduckgo.1.der similarity index 100% rename from src/testdata/cert-duckduckgo.1.der rename to rustls/src/testdata/cert-duckduckgo.1.der diff --git a/src/testdata/cert-github.0.der b/rustls/src/testdata/cert-github.0.der similarity index 100% rename from src/testdata/cert-github.0.der rename to rustls/src/testdata/cert-github.0.der diff --git a/src/testdata/cert-github.1.der b/rustls/src/testdata/cert-github.1.der similarity index 100% rename from src/testdata/cert-github.1.der rename to rustls/src/testdata/cert-github.1.der diff --git a/src/testdata/cert-google.0.der b/rustls/src/testdata/cert-google.0.der similarity index 100% rename from src/testdata/cert-google.0.der rename to rustls/src/testdata/cert-google.0.der diff --git a/src/testdata/cert-google.1.der b/rustls/src/testdata/cert-google.1.der similarity index 100% rename from src/testdata/cert-google.1.der rename to rustls/src/testdata/cert-google.1.der diff --git a/src/testdata/cert-google.2.der b/rustls/src/testdata/cert-google.2.der similarity index 100% rename from src/testdata/cert-google.2.der rename to rustls/src/testdata/cert-google.2.der diff --git a/src/testdata/cert-hn.0.der b/rustls/src/testdata/cert-hn.0.der similarity index 100% rename from src/testdata/cert-hn.0.der rename to rustls/src/testdata/cert-hn.0.der diff --git a/src/testdata/cert-hn.1.der b/rustls/src/testdata/cert-hn.1.der similarity index 100% rename from src/testdata/cert-hn.1.der rename to rustls/src/testdata/cert-hn.1.der diff --git a/src/testdata/cert-hn.2.der b/rustls/src/testdata/cert-hn.2.der similarity index 100% rename from src/testdata/cert-hn.2.der rename to rustls/src/testdata/cert-hn.2.der diff --git a/src/testdata/cert-reddit.0.der b/rustls/src/testdata/cert-reddit.0.der similarity index 100% rename from src/testdata/cert-reddit.0.der rename to rustls/src/testdata/cert-reddit.0.der diff --git a/src/testdata/cert-reddit.1.der b/rustls/src/testdata/cert-reddit.1.der similarity index 100% rename from src/testdata/cert-reddit.1.der rename to rustls/src/testdata/cert-reddit.1.der diff --git a/src/testdata/cert-rustlang.0.der b/rustls/src/testdata/cert-rustlang.0.der similarity index 100% rename from src/testdata/cert-rustlang.0.der rename to rustls/src/testdata/cert-rustlang.0.der diff --git a/src/testdata/cert-rustlang.1.der b/rustls/src/testdata/cert-rustlang.1.der similarity index 100% rename from src/testdata/cert-rustlang.1.der rename to rustls/src/testdata/cert-rustlang.1.der diff --git a/src/testdata/cert-rustlang.2.der b/rustls/src/testdata/cert-rustlang.2.der similarity index 100% rename from src/testdata/cert-rustlang.2.der rename to rustls/src/testdata/cert-rustlang.2.der diff --git a/src/testdata/cert-servo.0.der b/rustls/src/testdata/cert-servo.0.der similarity index 100% rename from src/testdata/cert-servo.0.der rename to rustls/src/testdata/cert-servo.0.der diff --git a/src/testdata/cert-servo.1.der b/rustls/src/testdata/cert-servo.1.der similarity index 100% rename from src/testdata/cert-servo.1.der rename to rustls/src/testdata/cert-servo.1.der diff --git a/src/testdata/cert-servo.2.der b/rustls/src/testdata/cert-servo.2.der similarity index 100% rename from src/testdata/cert-servo.2.der rename to rustls/src/testdata/cert-servo.2.der diff --git a/src/testdata/cert-stackoverflow.0.der b/rustls/src/testdata/cert-stackoverflow.0.der similarity index 100% rename from src/testdata/cert-stackoverflow.0.der rename to rustls/src/testdata/cert-stackoverflow.0.der diff --git a/src/testdata/cert-stackoverflow.1.der b/rustls/src/testdata/cert-stackoverflow.1.der similarity index 100% rename from src/testdata/cert-stackoverflow.1.der rename to rustls/src/testdata/cert-stackoverflow.1.der diff --git a/src/testdata/cert-twitter.0.der b/rustls/src/testdata/cert-twitter.0.der similarity index 100% rename from src/testdata/cert-twitter.0.der rename to rustls/src/testdata/cert-twitter.0.der diff --git a/src/testdata/cert-twitter.1.der b/rustls/src/testdata/cert-twitter.1.der similarity index 100% rename from src/testdata/cert-twitter.1.der rename to rustls/src/testdata/cert-twitter.1.der diff --git a/src/testdata/cert-wapo.0.der b/rustls/src/testdata/cert-wapo.0.der similarity index 100% rename from src/testdata/cert-wapo.0.der rename to rustls/src/testdata/cert-wapo.0.der diff --git a/src/testdata/cert-wapo.1.der b/rustls/src/testdata/cert-wapo.1.der similarity index 100% rename from src/testdata/cert-wapo.1.der rename to rustls/src/testdata/cert-wapo.1.der diff --git a/src/testdata/cert-wapo.2.der b/rustls/src/testdata/cert-wapo.2.der similarity index 100% rename from src/testdata/cert-wapo.2.der rename to rustls/src/testdata/cert-wapo.2.der diff --git a/src/testdata/cert-wikipedia.0.der b/rustls/src/testdata/cert-wikipedia.0.der similarity index 100% rename from src/testdata/cert-wikipedia.0.der rename to rustls/src/testdata/cert-wikipedia.0.der diff --git a/src/testdata/cert-wikipedia.1.der b/rustls/src/testdata/cert-wikipedia.1.der similarity index 100% rename from src/testdata/cert-wikipedia.1.der rename to rustls/src/testdata/cert-wikipedia.1.der diff --git a/src/testdata/deframer-test.1.bin b/rustls/src/testdata/deframer-test.1.bin similarity index 100% rename from src/testdata/deframer-test.1.bin rename to rustls/src/testdata/deframer-test.1.bin diff --git a/src/testdata/deframer-test.2.bin b/rustls/src/testdata/deframer-test.2.bin similarity index 100% rename from src/testdata/deframer-test.2.bin rename to rustls/src/testdata/deframer-test.2.bin diff --git a/src/testdata/prf-result.1.bin b/rustls/src/testdata/prf-result.1.bin similarity index 100% rename from src/testdata/prf-result.1.bin rename to rustls/src/testdata/prf-result.1.bin diff --git a/src/testdata/prf-result.2.bin b/rustls/src/testdata/prf-result.2.bin similarity index 100% rename from src/testdata/prf-result.2.bin rename to rustls/src/testdata/prf-result.2.bin diff --git a/src/ticketer.rs b/rustls/src/ticketer.rs similarity index 100% rename from src/ticketer.rs rename to rustls/src/ticketer.rs diff --git a/src/util.rs b/rustls/src/util.rs similarity index 100% rename from src/util.rs rename to rustls/src/util.rs diff --git a/src/vecbuf.rs b/rustls/src/vecbuf.rs similarity index 100% rename from src/vecbuf.rs rename to rustls/src/vecbuf.rs diff --git a/src/verify.rs b/rustls/src/verify.rs similarity index 100% rename from src/verify.rs rename to rustls/src/verify.rs diff --git a/src/verifybench.rs b/rustls/src/verifybench.rs similarity index 100% rename from src/verifybench.rs rename to rustls/src/verifybench.rs diff --git a/src/x509.rs b/rustls/src/x509.rs similarity index 100% rename from src/x509.rs rename to rustls/src/x509.rs diff --git a/tests/api.rs b/rustls/tests/api.rs similarity index 100% rename from tests/api.rs rename to rustls/tests/api.rs diff --git a/tests/benchmarks.rs b/rustls/tests/benchmarks.rs similarity index 100% rename from tests/benchmarks.rs rename to rustls/tests/benchmarks.rs diff --git a/tests/common/mod.rs b/rustls/tests/common/mod.rs similarity index 99% rename from tests/common/mod.rs rename to rustls/tests/common/mod.rs index 18fc3d23..a1df081d 100644 --- a/tests/common/mod.rs +++ b/rustls/tests/common/mod.rs @@ -26,7 +26,7 @@ macro_rules! embed_files { ) => { $( const $name: &'static [u8] = include_bytes!( - concat!("../../test-ca/", $keytype, "/", $path)); + concat!("../../../test-ca/", $keytype, "/", $path)); )+ pub fn bytes_for(keytype: &str, path: &str) -> &'static [u8] {