diff --git a/.github/ISSUE_TEMPLATE/build-issue.md b/.github/ISSUE_TEMPLATE/build-issue.md index 8b759b59762..23f2ca51ed5 100644 --- a/.github/ISSUE_TEMPLATE/build-issue.md +++ b/.github/ISSUE_TEMPLATE/build-issue.md @@ -1,5 +1,5 @@ --- -name: AWS-LC-Rust Build Issue +name: AWS-LC for Rust Build Issue about: Template title: '' labels: '' @@ -12,7 +12,7 @@ assignees: '' A short description of the problem you are facing. Please include any build output, reproduction steps and environment(e.g. [Docker image](https://github.com/awslabs/aws-lc/blame/e7413d237bb60bf639e78aa43ff3c1b1783f0712/tests/ci/docker_images/linux-x86/ubuntu-20.04_base/Dockerfile)). #### Relevant details -AWS-LC-Rust version or commit: (6b1bce0...) +AWS-LC for Rust versions or commit: (6b1bce0...) System information: for linux, below info can be collected by running `uname -srvmp` * CPU architecture: (x86, x86-64, ARMv7...) diff --git a/.github/ISSUE_TEMPLATE/general-issue.md b/.github/ISSUE_TEMPLATE/general-issue.md index e9ea35c4b6a..b7fa7eb87cb 100644 --- a/.github/ISSUE_TEMPLATE/general-issue.md +++ b/.github/ISSUE_TEMPLATE/general-issue.md @@ -1,5 +1,5 @@ --- -name: AWS-LC-Rust General Issue +name: AWS-LC for Rust General Issue about: Template title: '' labels: '' @@ -9,7 +9,7 @@ assignees: '' ### Security issue notifications -If you discover a potential security issue in AWS-LC-Rust we ask that you notify AWS Security via our +If you discover a potential security issue in AWS-LC for Rust we ask that you notify AWS Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue, if in doubt contact AWS security first. @@ -19,7 +19,7 @@ A short description of what the problem is and why we need to fix it. Add reprod ### Solution: -A description of the possible solution in terms of AWS-LC-Rust architecture. Highlight and explain any potentially +A description of the possible solution in terms of AWS-LC for Rust architecture. Highlight and explain any potentially controversial design decisions taken. * **Does this change any public APIs?** If yes, explain. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index abba6277625..cd20bf8762d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: strategy: fail-fast: false matrix: - crate_dir: [ "aws-lc-sys", "aws-lc-fips-sys", "aws-lc-rust" ] + crate_dir: [ "aws-lc-sys", "aws-lc-fips-sys", "aws-lc-rs" ] features: - "" - "--features fips" @@ -72,7 +72,7 @@ jobs: strategy: fail-fast: false matrix: - crate_dir: [ "aws-lc-sys", "aws-lc-fips-sys", "aws-lc-rust" ] + crate_dir: [ "aws-lc-sys", "aws-lc-fips-sys", "aws-lc-rs" ] diff_target: [ "branch", "published" ] steps: - uses: actions/checkout@v3 @@ -195,8 +195,8 @@ jobs: env: RUSTC_WRAPPER: "" - aws-lc-rust-test: - name: aws-lc-rust tests + aws-lc-rs-test: + name: aws-lc-rs tests runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -237,17 +237,17 @@ jobs: args: cross - name: Run cargo test - working-directory: ./aws-lc-rust + working-directory: ./aws-lc-rs if: ${{ matrix.target == 'native' }} run: cargo test ${{ matrix.args }} ${{ matrix.target != 'native' && format('--target {0}', matrix.target) || '' }} - name: Run cargo cross test - working-directory: ./aws-lc-rust + working-directory: ./aws-lc-rs if: ${{ matrix.target != 'native' }} run: cross test ${{ matrix.args }} ${{ matrix.target != 'native' && format('--target {0}', matrix.target) || '' }} fips-test: - name: aws-lc-rust fips-tests + name: aws-lc-rs fips-tests runs-on: ${{ matrix.os }} env: CC: clang @@ -274,11 +274,11 @@ jobs: toolchain: ${{ matrix.rust }} override: true - name: Run cargo test - working-directory: ./aws-lc-rust + working-directory: ./aws-lc-rs run: cargo test ${{ matrix.args }} - aws-lc-rust-coverage: - name: aws-ls-rust coverage + aws-lc-rs-coverage: + name: aws-ls-rs coverage runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -303,7 +303,7 @@ jobs: # account. Using --html can give us more insight which regions are missing # coverage immediately. - name: Run coverage - working-directory: ./aws-lc-rust + working-directory: ./aws-lc-rs run: cargo llvm-cov --no-fail-fast --fail-under-lines 95 --ignore-filename-regex "aws-lc-sys/*" mirai-analysis: @@ -343,12 +343,12 @@ jobs: rm -rf ${MIRAI_TMP_SRC} - name: Run MIRAI - working-directory: ./aws-lc-rust + working-directory: ./aws-lc-rs run: | cargo mirai - aws-lc-rust-asan: - name: aws-lc-rust asan + aws-lc-rs-asan: + name: aws-lc-rs asan strategy: matrix: args: @@ -372,7 +372,7 @@ jobs: ASAN_OPTIONS: detect_leaks=1 RUSTFLAGS: -Zsanitizer=address RUSTDOCFLAGS: -Zsanitizer=address - working-directory: ./aws-lc-rust + working-directory: ./aws-lc-rs run: cargo test ${{ matrix.args }} --lib --bins --tests --examples --target x86_64-unknown-linux-gnu --features asan s2n-quic-integration: @@ -392,7 +392,7 @@ jobs: toolchain: stable override: true - name: Run s2n-quic integration - working-directory: ./aws-lc-rust + working-directory: ./aws-lc-rs run: | ./scripts/run-s2n-quic-integration.sh @@ -413,6 +413,6 @@ jobs: toolchain: stable override: true - name: Run rustls integration - working-directory: ./aws-lc-rust + working-directory: ./aws-lc-rs run: | ./scripts/run-rustls-integration.sh diff --git a/BUILDING.md b/BUILDING.md index 6556a5cf8ed..3ffb388def0 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -1,8 +1,8 @@ -# Building *aws-lc-rust* +# Building *aws-lc-rs* -Rust projects may add a dependency on *aws-lc-rust* using cargo. +Rust projects may add a dependency on *aws-lc-rs* using cargo. See the [Cargo Book](https://doc.rust-lang.org/cargo/) for how to [specify dependencies](https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html) in your project. -See to find the latest version of our crate. +See to find the latest version of our crate. # Requirements diff --git a/Cargo.toml b/Cargo.toml index 9937b81c3a3..5d0f69e8989 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] members = [ - "aws-lc-rust", + "aws-lc-rs", "aws-lc-sys", "aws-lc-fips-sys" ] diff --git a/README.md b/README.md index fc32ee27779..6639fdab9f6 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # AWS Libcrypto for Rust -[*aws-lc-rust*](aws-lc-rust/README.md) is a cryptographic library using [AWS-LC](https://github.com/aws/aws-lc) for its cryptographic operations. +[*aws-lc-rs*](aws-lc-rs/README.md) is a cryptographic library using [AWS-LC](https://github.com/aws/aws-lc) for its cryptographic operations. This library strives to be API-compatible with the popular Rust library named [ring](https://github.com/briansmith/ring). It uses either the auto-generated [*aws-lc-sys*](aws-lc-sys/README.md) or [*aws-lc-fips-sys*](aws-lc-fips-sys/README.md) Foreign Function Interface (FFI) crates found in this repository for invoking *AWS-LC*. ## Crates -### [aws-lc-rust](aws-lc-rust/README.md) +### [aws-lc-rs](aws-lc-rs/README.md) A *ring*-compatible crypto library using the cryptographic operations provided by [*AWS-LC*](https://github.com/awslabs/aws-lc) using either *aws-lc-sys* or *aws-lc-fips-sys*. @@ -19,24 +19,24 @@ We do not recommend directly relying on these bindings. We do not recommend directly relying on these bindings. This crate uses [AWS-LC](https://github.com/aws/aws-lc/tree/fips-2022-11-02), which been submitted to an accredited lab for FIPS validation testing, and upon completion will be submitted to NIST for certification. Once NIST grants a validation certificate to AWS-LC, we will make an announcement to Rust developers -on how to leverage the FIPS mode using [aws-lc-rust](https://crates.io/crates/aws-lc-rust). +on how to leverage the FIPS mode using [aws-lc-rs](https://crates.io/crates/aws-lc-rs). # Motivation As there exists no standard Rust cryptographic API, we chose the Rust cryptographic library ring (v0.16) as our target API to build higher-level Rust bindings on top of *AWS-LC*. *ring* is one of the most used cryptographic APIs in the Rust community, but lacked support for alternate cryptographic implementations. Our desire to build a Rust API on top of AWS-LC is to be able to offer a FIPS validated Rust option for our customers. AWS-LC has been validated by an accredited lab, -and was submitted to NIST on 2021-12-23. *aws-lc-rust* adds to the Rust cryptographic landscape with features such as an +and was submitted to NIST on 2021-12-23. *aws-lc-rs* adds to the Rust cryptographic landscape with features such as an experimental FIPS operation mode, a stable API, and a process for [vulnerability reporting and disclosure](#security-notification-process). ## Questions, Feedback and Contributing * [Submit an non-security Bug/Issue/Request](https://github.com/awslabs/aws-lc-rust/issues/new/choose) -* [API documentation](https://docs.rs/aws-lc-rust/) +* [API documentation](https://docs.rs/aws-lc-rs/) * [Fork our repo](https://github.com/awslabs/aws-lc-rust/fork) -If you have any questions about submitting PR's, opening issues, *aws-lc-rust* API usage or +If you have any questions about submitting PR's, opening issues, *aws-lc-rs* API usage or any similar topic, we have a public chatroom available here to answer your questions on [Gitter](https://gitter.im/aws/aws-lc). @@ -45,13 +45,13 @@ follow our *Security Notification Process* below. ## Security Notification Process -If you discover a potential security issue in *AWS-LC* or *aws-lc-rust*, we ask that you notify AWS +If you discover a potential security issue in *AWS-LC* or *aws-lc-rs*, we ask that you notify AWS Security via our [vulnerability reporting page](https://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public GitHub issue. -If you package or distribute *aws-lc-rust*, or use *aws-lc-rust* as part of a large multi-user service, -you may be eligible for pre-notification of future *aws-lc-rust* releases. +If you package or distribute *aws-lc-rs*, or use *aws-lc-rs* as part of a large multi-user service, +you may be eligible for pre-notification of future *aws-lc-rs* releases. Please contact aws-lc-pre-notifications@amazon.com. ## License diff --git a/STYLE.md b/STYLE.md index f770ec0e5a4..9dd21082353 100644 --- a/STYLE.md +++ b/STYLE.md @@ -1,3 +1,3 @@ -# Style Guide for *aws-lc-rust* +# Style Guide for *aws-lc-rs* -This project follows the standard Rust Style Guidelines [documented here](https://github.com/rust-lang/fmt-rfcs/blob/master/guide/guide.md). \ No newline at end of file +This project follows the standard Rust Style Guidelines [documented here](https://github.com/rust-lang/fmt-rfcs/blob/master/guide/guide.md). diff --git a/aws-lc-fips-sys/README.md b/aws-lc-fips-sys/README.md index 83977a8f625..a97fce39880 100644 --- a/aws-lc-fips-sys/README.md +++ b/aws-lc-fips-sys/README.md @@ -10,7 +10,7 @@ This crate uses [AWS-LC](https://github.com/aws/aws-lc/tree/fips-2022-11-02), which been submitted to an accredited lab for FIPS validation testing, and upon completion will be submitted to NIST for certification. Once NIST grants a validation certificate to AWS-LC, we will make an announcement to Rust developers on how to leverage the FIPS mode -using [aws-lc-rust](https://crates.io/crates/aws-lc-rust). +using [aws-lc-rs](https://crates.io/crates/aws-lc-rs). ## Release Support diff --git a/aws-lc-rust/Cargo.toml b/aws-lc-rs/Cargo.toml similarity index 98% rename from aws-lc-rust/Cargo.toml rename to aws-lc-rs/Cargo.toml index 77a4df93080..8e134660cd3 100644 --- a/aws-lc-rust/Cargo.toml +++ b/aws-lc-rs/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "aws-lc-rust" +name = "aws-lc-rs" authors = ["AWS-LibCrypto"] version = "1.0.0-rc1" edition = "2021" diff --git a/aws-lc-rust/LICENSE b/aws-lc-rs/LICENSE similarity index 100% rename from aws-lc-rust/LICENSE rename to aws-lc-rs/LICENSE diff --git a/aws-lc-rust/Makefile b/aws-lc-rs/Makefile similarity index 100% rename from aws-lc-rust/Makefile rename to aws-lc-rs/Makefile diff --git a/aws-lc-rust/README.md b/aws-lc-rs/README.md similarity index 86% rename from aws-lc-rust/README.md rename to aws-lc-rs/README.md index 11f8adbac2b..7c34b54a260 100644 --- a/aws-lc-rust/README.md +++ b/aws-lc-rs/README.md @@ -1,6 +1,6 @@ -# AWS Libcrypto for Rust (aws-lc-rust) +# AWS Libcrypto for Rust (aws-lc-rs) -[![Crates.io](https://img.shields.io/crates/v/aws-lc-rust.svg)](https://crates.io/crates/aws-lc-rust) +[![Crates.io](https://img.shields.io/crates/v/aws-lc-rs.svg)](https://crates.io/crates/aws-lc-rs) [![GitHub](https://img.shields.io/badge/GitHub-awslabs%2Faws--lc--rust-blue)](https://github.com/awslabs/aws-lc-rust) *ring*-compatible crypto library using the cryptographic operations provided by @@ -20,7 +20,7 @@ Enable feature to preserve compatibility with ring's `signature::VerificationAlg function. This adds a requirement on `untrusted = "0.7.1"`. ##### - fips #### -**EXPERIMENTAL** Enable this feature to have aws-lc-rust use the +**EXPERIMENTAL** Enable this feature to have aws-lc-rs use the [*aws-lc-fips-sys*](https://crates.io/crates/aws-lc-fips-sys) crate for the cryptographic implementations. The *aws-lc-fips-sys* crate provides bindings to the FIPS variant of [*AWS-LC*](https://github.com/aws/aws-lc). AWS-LC has been submitted to an accredited lab @@ -55,17 +55,17 @@ and performant Rust, built around our AWS-LC offering. We found the popular ring fulfilled much of the cryptographic needs in the Rust community, but it did not meet the needs of developers with FIPS requirements. Our intention is to contribute a drop-in replacement for ring that provides FIPS and is compatible with the ring API. Rust developers with prescribed -cryptographic requirements can seamlessly integrate aws-lc-rust into their applications and +cryptographic requirements can seamlessly integrate aws-lc-rs into their applications and deploy them into AWS Regions. ## Questions, Feedback and Contributing * [Submit an non-security Bug/Issue/Request](https://github.com/awslabs/aws-lc-rust/issues/new/choose) -* [API documentation](https://docs.rs/aws-lc-rust/) +* [API documentation](https://docs.rs/aws-lc-rs/) * [Fork our repo](https://github.com/awslabs/aws-lc-rust/fork) -If you have any questions about submitting PR's, opening issues, *aws-lc-rust* API usage or +If you have any questions about submitting PR's, opening issues, *aws-lc-rs* API usage or any similar topic, we have a public chatroom available here to answer your questions on [Gitter](https://gitter.im/aws/aws-lc). @@ -74,13 +74,13 @@ follow our *Security Notification Process* below. ## Security Notification Process -If you discover a potential security issue in *AWS-LC* or *aws-lc-rust*, we ask that you notify AWS +If you discover a potential security issue in *AWS-LC* or *aws-lc-rs*, we ask that you notify AWS Security via our [vulnerability reporting page](https://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public GitHub issue. -If you package or distribute *aws-lc-rust*, or use *aws-lc-rust* as part of a large multi-user service, -you may be eligible for pre-notification of future *aws-lc-rust* releases. +If you package or distribute *aws-lc-rs*, or use *aws-lc-rs* as part of a large multi-user service, +you may be eligible for pre-notification of future *aws-lc-rs* releases. Please contact aws-lc-pre-notifications@amazon.com. ## License diff --git a/aws-lc-rust/README.tpl b/aws-lc-rs/README.tpl similarity index 73% rename from aws-lc-rust/README.tpl rename to aws-lc-rs/README.tpl index a07eb278ffa..d93f5fd3a79 100644 --- a/aws-lc-rust/README.tpl +++ b/aws-lc-rs/README.tpl @@ -1,6 +1,6 @@ # AWS Libcrypto for Rust ({{crate}}) -[![Crates.io](https://img.shields.io/crates/v/aws-lc-rust.svg)](https://crates.io/crates/aws-lc-rust) +[![Crates.io](https://img.shields.io/crates/v/aws-lc-rs.svg)](https://crates.io/crates/aws-lc-rs) [![GitHub](https://img.shields.io/badge/GitHub-awslabs%2Faws--lc--rust-blue)](https://github.com/awslabs/aws-lc-rust) {{readme}} @@ -8,10 +8,10 @@ ## Questions, Feedback and Contributing * [Submit an non-security Bug/Issue/Request](https://github.com/awslabs/aws-lc-rust/issues/new/choose) -* [API documentation](https://docs.rs/aws-lc-rust/) +* [API documentation](https://docs.rs/aws-lc-rs/) * [Fork our repo](https://github.com/awslabs/aws-lc-rust/fork) -If you have any questions about submitting PR's, opening issues, *aws-lc-rust* API usage or +If you have any questions about submitting PR's, opening issues, *aws-lc-rs* API usage or any similar topic, we have a public chatroom available here to answer your questions on [Gitter](https://gitter.im/aws/aws-lc). @@ -20,13 +20,13 @@ follow our *Security Notification Process* below. ## Security Notification Process -If you discover a potential security issue in *AWS-LC* or *aws-lc-rust*, we ask that you notify AWS +If you discover a potential security issue in *AWS-LC* or *aws-lc-rs*, we ask that you notify AWS Security via our [vulnerability reporting page](https://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public GitHub issue. -If you package or distribute *aws-lc-rust*, or use *aws-lc-rust* as part of a large multi-user service, -you may be eligible for pre-notification of future *aws-lc-rust* releases. +If you package or distribute *aws-lc-rs*, or use *aws-lc-rs* as part of a large multi-user service, +you may be eligible for pre-notification of future *aws-lc-rs* releases. Please contact aws-lc-pre-notifications@amazon.com. ## License diff --git a/aws-lc-rust/benches/aead_benchmark.rs b/aws-lc-rs/benches/aead_benchmark.rs similarity index 88% rename from aws-lc-rust/benches/aead_benchmark.rs rename to aws-lc-rs/benches/aead_benchmark.rs index 0d1b97f2aa7..0cd3c3b858c 100644 --- a/aws-lc-rust/benches/aead_benchmark.rs +++ b/aws-lc-rs/benches/aead_benchmark.rs @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 OR ISC -use aws_lc_rust::{test, test_file}; +use aws_lc_rs::{test, test_file}; use criterion::{criterion_group, criterion_main, Criterion}; #[derive(Debug)] @@ -119,7 +119,7 @@ mod [<$pkg _benchmarks>] { } }}} -benchmark_aead!(aws_lc_rust); +benchmark_aead!(aws_lc_rs); #[cfg(feature = "ring-benchmarks")] benchmark_aead!(ring); @@ -190,12 +190,12 @@ fn test_aead_separate(c: &mut Criterion, config: &AeadConfig) { ); let mut group = c.benchmark_group(bench_group_name); - let mut aws_sealing_key = aws_lc_rust_benchmarks::create_sealing_key(config); + let mut aws_sealing_key = aws_lc_rs_benchmarks::create_sealing_key(config); group.bench_function("AWS-LC", |b| { b.iter(|| { - let aws_aad = aws_lc_rust_benchmarks::aad(config); + let aws_aad = aws_lc_rs_benchmarks::aad(config); let _tag = - aws_lc_rust_benchmarks::seal_separate(&mut aws_sealing_key, aws_aad, &mut in_out); + aws_lc_rs_benchmarks::seal_separate(&mut aws_sealing_key, aws_aad, &mut in_out); }); }); @@ -218,12 +218,12 @@ fn test_aead_append(c: &mut Criterion, config: &AeadConfig) { let bench_group_name = format!("AEAD-{:?}-append-{}-bytes", config.algorithm, in_out.len()); let mut group = c.benchmark_group(bench_group_name); - let mut aws_sealing_key = aws_lc_rust_benchmarks::create_sealing_key(config); + let mut aws_sealing_key = aws_lc_rs_benchmarks::create_sealing_key(config); group.bench_function("AWS-LC", |b| { b.iter(|| { let mut aws_in_out = in_out.clone(); - let aws_aad = aws_lc_rust_benchmarks::aad(config); - aws_lc_rust_benchmarks::seal_append(&mut aws_sealing_key, aws_aad, &mut aws_in_out); + let aws_aad = aws_lc_rs_benchmarks::aad(config); + aws_lc_rs_benchmarks::seal_append(&mut aws_sealing_key, aws_aad, &mut aws_in_out); }); }); @@ -243,19 +243,19 @@ fn test_aead_append(c: &mut Criterion, config: &AeadConfig) { fn test_aead_open(c: &mut Criterion, config: &AeadConfig) { let mut in_out = config.in_out.clone(); - let aws_aad = aws_lc_rust_benchmarks::aad(config); - let mut aws_sealing_key = aws_lc_rust_benchmarks::create_sealing_key(config); - aws_lc_rust_benchmarks::seal_append(&mut aws_sealing_key, aws_aad, &mut in_out); + let aws_aad = aws_lc_rs_benchmarks::aad(config); + let mut aws_sealing_key = aws_lc_rs_benchmarks::create_sealing_key(config); + aws_lc_rs_benchmarks::seal_append(&mut aws_sealing_key, aws_aad, &mut in_out); let bench_group_name = format!("AEAD-{:?}-open-{}-bytes", config.algorithm, in_out.len()); let mut group = c.benchmark_group(bench_group_name); - let mut aws_opening_key = aws_lc_rust_benchmarks::create_opening_key(config); + let mut aws_opening_key = aws_lc_rs_benchmarks::create_opening_key(config); group.bench_function("AWS-LC", |b| { b.iter(|| { let mut aws_in_out = in_out.clone(); - let aws_aad = aws_lc_rust_benchmarks::aad(config); - aws_lc_rust_benchmarks::open(&mut aws_opening_key, aws_aad, &mut aws_in_out); + let aws_aad = aws_lc_rs_benchmarks::aad(config); + aws_lc_rs_benchmarks::open(&mut aws_opening_key, aws_aad, &mut aws_in_out); }); }); diff --git a/aws-lc-rust/benches/agreement_benchmark.rs b/aws-lc-rs/benches/agreement_benchmark.rs similarity index 91% rename from aws-lc-rust/benches/agreement_benchmark.rs rename to aws-lc-rs/benches/agreement_benchmark.rs index e98dc18c881..048668235d3 100644 --- a/aws-lc-rust/benches/agreement_benchmark.rs +++ b/aws-lc-rs/benches/agreement_benchmark.rs @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 OR ISC -use aws_lc_rust::{test, test_file}; +use aws_lc_rs::{test, test_file}; use criterion::{criterion_group, criterion_main, Criterion}; #[derive(Copy, Clone, PartialEq, Eq, Debug)] @@ -81,7 +81,7 @@ macro_rules! benchmark_agreement { }; } -benchmark_agreement!(aws_lc_rust); +benchmark_agreement!(aws_lc_rs); #[cfg(feature = "ring-benchmarks")] benchmark_agreement!(ring); @@ -90,11 +90,11 @@ fn test_agree_ephemeral(c: &mut Criterion, config: &AgreementConfig) { let mut group = c.benchmark_group(bench_group_name); - let aws_peer_public_key = aws_lc_rust_benchmarks::peer_public_key(config); + let aws_peer_public_key = aws_lc_rs_benchmarks::peer_public_key(config); group.bench_function("AWS-LC", |b| { b.iter(|| { - let private_key = aws_lc_rust_benchmarks::private_key(config); - aws_lc_rust_benchmarks::agreement(private_key, &aws_peer_public_key); + let private_key = aws_lc_rs_benchmarks::private_key(config); + aws_lc_rs_benchmarks::agreement(private_key, &aws_peer_public_key); }); }); #[cfg(feature = "ring-benchmarks")] diff --git a/aws-lc-rust/benches/data/aead_aes_128_gcm_benchmarks.txt b/aws-lc-rs/benches/data/aead_aes_128_gcm_benchmarks.txt similarity index 100% rename from aws-lc-rust/benches/data/aead_aes_128_gcm_benchmarks.txt rename to aws-lc-rs/benches/data/aead_aes_128_gcm_benchmarks.txt diff --git a/aws-lc-rust/benches/data/aead_aes_256_gcm_benchmarks.txt b/aws-lc-rs/benches/data/aead_aes_256_gcm_benchmarks.txt similarity index 100% rename from aws-lc-rust/benches/data/aead_aes_256_gcm_benchmarks.txt rename to aws-lc-rs/benches/data/aead_aes_256_gcm_benchmarks.txt diff --git a/aws-lc-rust/benches/data/aead_chacha20_poly1305_benchmarks.txt b/aws-lc-rs/benches/data/aead_chacha20_poly1305_benchmarks.txt similarity index 100% rename from aws-lc-rust/benches/data/aead_chacha20_poly1305_benchmarks.txt rename to aws-lc-rs/benches/data/aead_chacha20_poly1305_benchmarks.txt diff --git a/aws-lc-rust/benches/data/agreement_benchmarks.txt b/aws-lc-rs/benches/data/agreement_benchmarks.txt similarity index 100% rename from aws-lc-rust/benches/data/agreement_benchmarks.txt rename to aws-lc-rs/benches/data/agreement_benchmarks.txt diff --git a/aws-lc-rust/benches/data/ecdsa_benchmarks.txt b/aws-lc-rs/benches/data/ecdsa_benchmarks.txt similarity index 100% rename from aws-lc-rust/benches/data/ecdsa_benchmarks.txt rename to aws-lc-rs/benches/data/ecdsa_benchmarks.txt diff --git a/aws-lc-rust/benches/data/ed25519_benchmarks.txt b/aws-lc-rs/benches/data/ed25519_benchmarks.txt similarity index 100% rename from aws-lc-rust/benches/data/ed25519_benchmarks.txt rename to aws-lc-rs/benches/data/ed25519_benchmarks.txt diff --git a/aws-lc-rust/benches/data/quic_aes_128_benchmarks.txt b/aws-lc-rs/benches/data/quic_aes_128_benchmarks.txt similarity index 100% rename from aws-lc-rust/benches/data/quic_aes_128_benchmarks.txt rename to aws-lc-rs/benches/data/quic_aes_128_benchmarks.txt diff --git a/aws-lc-rust/benches/data/quic_aes_256_benchmarks.txt b/aws-lc-rs/benches/data/quic_aes_256_benchmarks.txt similarity index 100% rename from aws-lc-rust/benches/data/quic_aes_256_benchmarks.txt rename to aws-lc-rs/benches/data/quic_aes_256_benchmarks.txt diff --git a/aws-lc-rust/benches/data/quic_chacha20_benchmarks.txt b/aws-lc-rs/benches/data/quic_chacha20_benchmarks.txt similarity index 100% rename from aws-lc-rust/benches/data/quic_chacha20_benchmarks.txt rename to aws-lc-rs/benches/data/quic_chacha20_benchmarks.txt diff --git a/aws-lc-rust/benches/data/rsa_benchmarks.txt b/aws-lc-rs/benches/data/rsa_benchmarks.txt similarity index 100% rename from aws-lc-rust/benches/data/rsa_benchmarks.txt rename to aws-lc-rs/benches/data/rsa_benchmarks.txt diff --git a/aws-lc-rust/benches/digest_benchmark.rs b/aws-lc-rs/benches/digest_benchmark.rs similarity index 96% rename from aws-lc-rust/benches/digest_benchmark.rs rename to aws-lc-rs/benches/digest_benchmark.rs index 70d1e04d028..64b20cec4db 100644 --- a/aws-lc-rust/benches/digest_benchmark.rs +++ b/aws-lc-rs/benches/digest_benchmark.rs @@ -59,7 +59,7 @@ macro_rules! benchmark_digest { }; } -benchmark_digest!(aws_lc_rust); +benchmark_digest!(aws_lc_rs); #[cfg(feature = "ring-benchmarks")] benchmark_digest!(ring); @@ -108,7 +108,7 @@ fn bench_digest_one_shot(c: &mut Criterion, config: &DigestConfig) { let mut group = c.benchmark_group(bench_group_name); group.bench_function("AWS-LC", |b| { b.iter(|| { - aws_lc_rust_benchmarks::run_digest_one_shot(config, &chunk); + aws_lc_rs_benchmarks::run_digest_one_shot(config, &chunk); }); }); #[cfg(feature = "ring-benchmarks")] @@ -144,7 +144,7 @@ fn bench_digest_incremental(c: &mut Criterion, config: &DigestConfig) { group.bench_function("AWS-LC", |b| { b.iter(|| { - aws_lc_rust_benchmarks::run_digest_incremental(config, &chunk); + aws_lc_rs_benchmarks::run_digest_incremental(config, &chunk); }); }); #[cfg(feature = "ring-benchmarks")] diff --git a/aws-lc-rust/benches/ecdsa_benchmark.rs b/aws-lc-rs/benches/ecdsa_benchmark.rs similarity index 95% rename from aws-lc-rust/benches/ecdsa_benchmark.rs rename to aws-lc-rs/benches/ecdsa_benchmark.rs index b9b378841e5..24f9a2aa0c0 100644 --- a/aws-lc-rust/benches/ecdsa_benchmark.rs +++ b/aws-lc-rs/benches/ecdsa_benchmark.rs @@ -4,7 +4,7 @@ #![allow(deprecated, dead_code)] #[cfg(feature = "ring-sig-verify")] -use aws_lc_rust::{test, test_file}; +use aws_lc_rs::{test, test_file}; #[cfg(feature = "ring-sig-verify")] use criterion::{criterion_group, criterion_main, Criterion}; @@ -194,7 +194,7 @@ macro_rules! benchmark_ecdsa { } #[cfg(feature = "ring-sig-verify")] -benchmark_ecdsa!(aws_lc_rust); +benchmark_ecdsa!(aws_lc_rs); #[cfg(all(feature = "ring-sig-verify", feature = "ring-benchmarks"))] benchmark_ecdsa!(ring); @@ -211,11 +211,11 @@ fn test_ecdsa_sign(c: &mut Criterion, config: &EcdsaConfig) { ); let mut group = c.benchmark_group(bench_group_name); - let aws_rng = aws_lc_rust_benchmarks::get_rng(); - let aws_key_pair = aws_lc_rust_benchmarks::create_key_pair(config); + let aws_rng = aws_lc_rs_benchmarks::get_rng(); + let aws_key_pair = aws_lc_rs_benchmarks::create_key_pair(config); group.bench_function("AWS-LC", |b| { b.iter(|| { - aws_lc_rust_benchmarks::sign(&aws_key_pair, &aws_rng, &config.msg); + aws_lc_rs_benchmarks::sign(&aws_key_pair, &aws_rng, &config.msg); }); }); #[cfg(feature = "ring-benchmarks")] @@ -246,11 +246,11 @@ fn test_ecdsa_verify(c: &mut Criterion, config: &EcdsaConfig) { let sig = config.signature.as_slice(); let aws_verification_alg = - aws_lc_rust_benchmarks::verification(config.curve, config.digest, config.format); + aws_lc_rs_benchmarks::verification(config.curve, config.digest, config.format); group.bench_function("AWS-LC", |b| { b.iter(|| { - aws_lc_rust_benchmarks::verify(aws_verification_alg, pub_key, &config.msg, sig); + aws_lc_rs_benchmarks::verify(aws_verification_alg, pub_key, &config.msg, sig); }); }); #[cfg(feature = "ring-benchmarks")] diff --git a/aws-lc-rust/benches/ed25519_benchmark.rs b/aws-lc-rs/benches/ed25519_benchmark.rs similarity index 92% rename from aws-lc-rust/benches/ed25519_benchmark.rs rename to aws-lc-rs/benches/ed25519_benchmark.rs index f7ba258a76f..d4dea797cb3 100644 --- a/aws-lc-rust/benches/ed25519_benchmark.rs +++ b/aws-lc-rs/benches/ed25519_benchmark.rs @@ -4,7 +4,7 @@ #![allow(deprecated, dead_code)] #[cfg(feature = "ring-sig-verify")] -use aws_lc_rust::{test, test_file}; +use aws_lc_rs::{test, test_file}; #[cfg(feature = "ring-sig-verify")] use criterion::{criterion_group, criterion_main, Criterion}; @@ -72,7 +72,7 @@ macro_rules! benchmark_ed25519 { } #[cfg(feature = "ring-sig-verify")] -benchmark_ed25519!(aws_lc_rust); +benchmark_ed25519!(aws_lc_rs); #[cfg(all(feature = "ring-sig-verify", feature = "ring-benchmarks"))] benchmark_ed25519!(ring); @@ -82,10 +82,10 @@ fn test_ed25519_sign(c: &mut Criterion, config: &Ed25519Config) { let bench_group_name = format!("ED25519-sign-{}-bytes", config.msg.len()); let mut group = c.benchmark_group(bench_group_name); - let aws_key_pair = aws_lc_rust_benchmarks::create_key_pair(config); + let aws_key_pair = aws_lc_rs_benchmarks::create_key_pair(config); group.bench_function("AWS-LC", |b| { b.iter(|| { - aws_lc_rust_benchmarks::sign(&aws_key_pair, &config.msg); + aws_lc_rs_benchmarks::sign(&aws_key_pair, &config.msg); }); }); #[cfg(feature = "ring-benchmarks")] @@ -107,10 +107,10 @@ fn test_ed25519_verify(c: &mut Criterion, config: &Ed25519Config) { let pub_key = config.public_key.as_slice(); let sig = config.signature.as_slice(); - let aws_verification_alg = aws_lc_rust_benchmarks::verification(); + let aws_verification_alg = aws_lc_rs_benchmarks::verification(); group.bench_function("AWS-LC", |b| { b.iter(|| { - aws_lc_rust_benchmarks::verify(aws_verification_alg, pub_key, &config.msg, sig); + aws_lc_rs_benchmarks::verify(aws_verification_alg, pub_key, &config.msg, sig); }); }); #[cfg(feature = "ring-benchmarks")] diff --git a/aws-lc-rust/benches/hkdf_benchmark.rs b/aws-lc-rs/benches/hkdf_benchmark.rs similarity index 95% rename from aws-lc-rust/benches/hkdf_benchmark.rs rename to aws-lc-rs/benches/hkdf_benchmark.rs index 6e0e398d18e..4b848741dac 100644 --- a/aws-lc-rust/benches/hkdf_benchmark.rs +++ b/aws-lc-rs/benches/hkdf_benchmark.rs @@ -80,7 +80,7 @@ macro_rules! benchmark_hkdf { }; } -benchmark_hkdf!(aws_lc_rust); +benchmark_hkdf!(aws_lc_rs); #[cfg(feature = "ring-benchmarks")] benchmark_hkdf!(ring); @@ -113,10 +113,10 @@ fn bench_hkdf(c: &mut Criterion, config: &HKDFConfig) { let bench_group_name = format!("HKDF-{:?}-{}-bytes", config.algorithm, chunk_len); let mut group = c.benchmark_group(bench_group_name); - let aws_prk = aws_lc_rust_benchmarks::run_hkdf_extract(config); + let aws_prk = aws_lc_rs_benchmarks::run_hkdf_extract(config); group.bench_function("AWS-LC", |b| { b.iter(|| { - aws_lc_rust_benchmarks::run_hkdf_expand(&aws_prk, info_chunk); + aws_lc_rs_benchmarks::run_hkdf_expand(&aws_prk, info_chunk); }); }); #[cfg(feature = "ring-benchmarks")] diff --git a/aws-lc-rust/benches/hmac_benchmark.rs b/aws-lc-rs/benches/hmac_benchmark.rs similarity index 92% rename from aws-lc-rust/benches/hmac_benchmark.rs rename to aws-lc-rs/benches/hmac_benchmark.rs index da1035cede0..b8fd77a8749 100644 --- a/aws-lc-rust/benches/hmac_benchmark.rs +++ b/aws-lc-rs/benches/hmac_benchmark.rs @@ -79,7 +79,7 @@ macro_rules! benchmark_hmac { }; } -benchmark_hmac!(aws_lc_rust); +benchmark_hmac!(aws_lc_rs); #[cfg(feature = "ring-benchmarks")] benchmark_hmac!(ring); @@ -123,8 +123,8 @@ fn bench_hmac_one_shot(c: &mut Criterion, config: &HMACConfig) { group.bench_function("AWS-LC", |b| { b.iter(|| { - let aws_key = aws_lc_rust_benchmarks::create_hmac_key(config); - aws_lc_rust_benchmarks::run_hmac_one_shot(&aws_key, &chunk); + let aws_key = aws_lc_rs_benchmarks::create_hmac_key(config); + aws_lc_rs_benchmarks::run_hmac_one_shot(&aws_key, &chunk); }); }); @@ -154,8 +154,8 @@ fn bench_hmac_longer_key(c: &mut Criterion, config: &HMACConfig) { group.bench_function("AWS-LC", |b| { b.iter(|| { - let aws_key = aws_lc_rust_benchmarks::create_longer_hmac_key(config); - aws_lc_rust_benchmarks::run_hmac_one_shot(&aws_key, &chunk); + let aws_key = aws_lc_rs_benchmarks::create_longer_hmac_key(config); + aws_lc_rs_benchmarks::run_hmac_one_shot(&aws_key, &chunk); }); }); @@ -184,8 +184,8 @@ fn bench_hmac_incremental(c: &mut Criterion, config: &HMACConfig) { group.bench_function("AWS-LC", |b| { b.iter(|| { - let aws_key = aws_lc_rust_benchmarks::create_hmac_key(config); - aws_lc_rust_benchmarks::run_hmac_incremental(&aws_key, &chunk); + let aws_key = aws_lc_rs_benchmarks::create_hmac_key(config); + aws_lc_rs_benchmarks::run_hmac_incremental(&aws_key, &chunk); }); }); #[cfg(feature = "ring-benchmarks")] diff --git a/aws-lc-rust/benches/pbkdf2_benchmark.rs b/aws-lc-rs/benches/pbkdf2_benchmark.rs similarity index 97% rename from aws-lc-rust/benches/pbkdf2_benchmark.rs rename to aws-lc-rs/benches/pbkdf2_benchmark.rs index 07bcf8dff78..dc1f3877d8c 100644 --- a/aws-lc-rust/benches/pbkdf2_benchmark.rs +++ b/aws-lc-rs/benches/pbkdf2_benchmark.rs @@ -62,7 +62,7 @@ macro_rules! benchmark_pbkdf2 { }; } -benchmark_pbkdf2!(aws_lc_rust); +benchmark_pbkdf2!(aws_lc_rs); #[cfg(feature = "ring-benchmarks")] benchmark_pbkdf2!(ring); @@ -100,7 +100,7 @@ fn bench_pbkdf2(c: &mut Criterion, config: &PBKDF2Config) { let mut aws_out = vec![0u8; 64]; group.bench_function("AWS-LC", |b| { b.iter(|| { - aws_lc_rust_benchmarks::run_pbkdf2_derive(config, iter, &mut aws_out); + aws_lc_rs_benchmarks::run_pbkdf2_derive(config, iter, &mut aws_out); }); }); #[cfg(feature = "ring-benchmarks")] diff --git a/aws-lc-rust/benches/quic_benchmark.rs b/aws-lc-rs/benches/quic_benchmark.rs similarity index 95% rename from aws-lc-rust/benches/quic_benchmark.rs rename to aws-lc-rs/benches/quic_benchmark.rs index ebaaa820608..f3124c0f49b 100644 --- a/aws-lc-rust/benches/quic_benchmark.rs +++ b/aws-lc-rs/benches/quic_benchmark.rs @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 OR ISC -use aws_lc_rust::{test, test_file}; +use aws_lc_rs::{test, test_file}; use criterion::{criterion_group, criterion_main, Criterion}; #[derive(Debug)] @@ -63,7 +63,7 @@ macro_rules! benchmark_quic } }}} -benchmark_quic!(aws_lc_rust); +benchmark_quic!(aws_lc_rs); #[cfg(feature = "ring-benchmarks")] benchmark_quic!(ring); @@ -78,10 +78,10 @@ fn test_new_mask(c: &mut Criterion, config: &QuicConfig) { ); let mut group = c.benchmark_group(bench_group_name); - let aws_key = aws_lc_rust_benchmarks::header_protection_key(config); + let aws_key = aws_lc_rs_benchmarks::header_protection_key(config); group.bench_function("AWS-LC", |b| { b.iter(|| { - aws_lc_rust_benchmarks::new_mask(&aws_key, sample); + aws_lc_rs_benchmarks::new_mask(&aws_key, sample); }); }); diff --git a/aws-lc-rust/benches/rsa_benchmark.rs b/aws-lc-rs/benches/rsa_benchmark.rs similarity index 90% rename from aws-lc-rust/benches/rsa_benchmark.rs rename to aws-lc-rs/benches/rsa_benchmark.rs index cabb560d987..4faead9a0a4 100644 --- a/aws-lc-rust/benches/rsa_benchmark.rs +++ b/aws-lc-rs/benches/rsa_benchmark.rs @@ -4,7 +4,7 @@ #![allow(deprecated, dead_code)] #[cfg(feature = "ring-sig-verify")] -use aws_lc_rust::{test, test_file}; +use aws_lc_rs::{test, test_file}; #[cfg(feature = "ring-sig-verify")] use criterion::{criterion_group, criterion_main, Criterion}; @@ -145,7 +145,7 @@ macro_rules! benchmark_rsa { } #[cfg(feature = "ring-sig-verify")] -benchmark_rsa!(aws_lc_rust); +benchmark_rsa!(aws_lc_rs); #[cfg(all(feature = "ring-sig-verify", feature = "ring-benchmarks"))] benchmark_rsa!(ring); @@ -161,19 +161,13 @@ fn test_rsa_sign(c: &mut Criterion, config: &RsaConfig) { config.msg.len() ); let mut group = c.benchmark_group(bench_group_name); - let aws_rng = aws_lc_rust_benchmarks::get_rng(); - let aws_encoding = aws_lc_rust_benchmarks::encoding(config.padding, config.digest); - let aws_key_pair = aws_lc_rust_benchmarks::create_key_pair(&config.key); + let aws_rng = aws_lc_rs_benchmarks::get_rng(); + let aws_encoding = aws_lc_rs_benchmarks::encoding(config.padding, config.digest); + let aws_key_pair = aws_lc_rs_benchmarks::create_key_pair(&config.key); let aws_sig = &mut buffer[0..aws_key_pair.public_modulus_len()]; group.bench_function("AWS-LC", |b| { b.iter(|| { - aws_lc_rust_benchmarks::sign( - &aws_key_pair, - &aws_rng, - &config.msg, - aws_encoding, - aws_sig, - ); + aws_lc_rs_benchmarks::sign(&aws_key_pair, &aws_rng, &config.msg, aws_encoding, aws_sig); }); }); #[cfg(feature = "ring-benchmarks")] @@ -208,15 +202,15 @@ fn test_rsa_verify(c: &mut Criterion, config: &RsaConfig) { ); let mut group = c.benchmark_group(bench_group_name); { - use aws_lc_rust::signature::KeyPair; - let aws_params = aws_lc_rust_benchmarks::parameters(config.padding, config.digest); - let aws_key_pair = aws_lc_rust_benchmarks::create_key_pair(&config.key); + use aws_lc_rs::signature::KeyPair; + let aws_params = aws_lc_rs_benchmarks::parameters(config.padding, config.digest); + let aws_key_pair = aws_lc_rs_benchmarks::create_key_pair(&config.key); let aws_pub_key = aws_key_pair.public_key().as_ref(); let aws_sig = config.signature.as_slice(); group.bench_function("AWS-LC", |b| { b.iter(|| { - aws_lc_rust_benchmarks::verify(aws_params, aws_pub_key, &config.msg, aws_sig); + aws_lc_rs_benchmarks::verify(aws_params, aws_pub_key, &config.msg, aws_sig); }); }); } diff --git a/aws-lc-rust/build.rs b/aws-lc-rs/build.rs similarity index 100% rename from aws-lc-rust/build.rs rename to aws-lc-rs/build.rs diff --git a/aws-lc-rust/examples/digest.rs b/aws-lc-rs/examples/digest.rs similarity index 95% rename from aws-lc-rust/examples/digest.rs rename to aws-lc-rs/examples/digest.rs index b8727e91be0..f3fed1cb839 100644 --- a/aws-lc-rust/examples/digest.rs +++ b/aws-lc-rs/examples/digest.rs @@ -3,14 +3,14 @@ //! digest - display the checksum for files. //! -//! *digest* is an example program using *aws-lc-rust*. It can compute the digest (i.e., "checksum") -//! of files using any of the digest algorithms supported by *aws-lc-rust*. +//! *digest* is an example program using *aws-lc-rs*. It can compute the digest (i.e., "checksum") +//! of files using any of the digest algorithms supported by *aws-lc-rs*. //! //! The program can be run from the command line using cargo: //! ``` //! > cargo run --example digest -- -d sha256 LICENSE //! ``` -use aws_lc_rust::{digest, test}; +use aws_lc_rs::{digest, test}; use clap::{Parser, ValueEnum}; use std::fs::File; use std::io::{Read, Result}; diff --git a/aws-lc-rust/scripts/run-rustls-integration.sh b/aws-lc-rs/scripts/run-rustls-integration.sh similarity index 98% rename from aws-lc-rust/scripts/run-rustls-integration.sh rename to aws-lc-rs/scripts/run-rustls-integration.sh index cd313c34787..9fec6bfe82c 100755 --- a/aws-lc-rust/scripts/run-rustls-integration.sh +++ b/aws-lc-rs/scripts/run-rustls-integration.sh @@ -4,7 +4,7 @@ ROOT=$PWD RUSTLS_RING_STRING="^ring = \".*\"" -RUSTLS_OUR_STRING="ring = { path = \"${PWD}\", package = \"aws-lc-rust\"}" +RUSTLS_OUR_STRING="ring = { path = \"${PWD}\", package = \"aws-lc-rs\"}" git clone https://github.com/rustls/rustls.git cd rustls diff --git a/aws-lc-rust/scripts/run-s2n-quic-integration.sh b/aws-lc-rs/scripts/run-s2n-quic-integration.sh similarity index 95% rename from aws-lc-rust/scripts/run-s2n-quic-integration.sh rename to aws-lc-rs/scripts/run-s2n-quic-integration.sh index 2f34c30a61f..6affdbf5e78 100755 --- a/aws-lc-rust/scripts/run-s2n-quic-integration.sh +++ b/aws-lc-rs/scripts/run-s2n-quic-integration.sh @@ -4,9 +4,9 @@ ROOT=$PWD QUIC_RING_STRING="^ring = { .* optional .* }" -QUIC_OUR_STRING="ring = { path = \"${PWD}\", optional = true, package = \"aws-lc-rust\"}" +QUIC_OUR_STRING="ring = { path = \"${PWD}\", optional = true, package = \"aws-lc-rs\"}" QUIC_CRYPTO_RING_STRING="^ring = { .* }" -QUIC_CRYPTO_OUR_STRING="ring = { path = \"${PWD}\", package = \"aws-lc-rust\"}" +QUIC_CRYPTO_OUR_STRING="ring = { path = \"${PWD}\", package = \"aws-lc-rs\"}" git clone https://github.com/aws/s2n-quic.git cd s2n-quic diff --git a/aws-lc-rust/src/aead.rs b/aws-lc-rs/src/aead.rs similarity index 99% rename from aws-lc-rust/src/aead.rs rename to aws-lc-rs/src/aead.rs index bb75115fe5a..ace9d7150fc 100644 --- a/aws-lc-rust/src/aead.rs +++ b/aws-lc-rs/src/aead.rs @@ -14,10 +14,10 @@ //! //! # Examples //! ``` -//! use aws_lc_rust::rand; -//! use aws_lc_rust::aead::{UnboundKey, AES_128_KEY_LEN, AES_128_GCM, nonce_sequence, SealingKey, +//! use aws_lc_rs::rand; +//! use aws_lc_rs::aead::{UnboundKey, AES_128_KEY_LEN, AES_128_GCM, nonce_sequence, SealingKey, //! OpeningKey, Aad, BoundKey}; -//! use aws_lc_rust::test::from_hex; +//! use aws_lc_rs::test::from_hex; //! //! let plaintext = "plaintext value"; //! @@ -26,7 +26,7 @@ //! rand::fill(&mut key_bytes).expect("Unable to generate key"); //! //! // Contextual information must match between encryption and decryption -//! let aad_content = "aws-lc-rust documentation"; +//! let aad_content = "aws-lc-rs documentation"; //! let sequence_id = 0xabcdef01u32.to_be_bytes(); //! //! // Buffer containing plaintext. This will be modified to contain the ciphertext. diff --git a/aws-lc-rust/src/aead/aes.rs b/aws-lc-rs/src/aead/aes.rs similarity index 100% rename from aws-lc-rust/src/aead/aes.rs rename to aws-lc-rs/src/aead/aes.rs diff --git a/aws-lc-rust/src/aead/aes_gcm.rs b/aws-lc-rs/src/aead/aes_gcm.rs similarity index 100% rename from aws-lc-rust/src/aead/aes_gcm.rs rename to aws-lc-rs/src/aead/aes_gcm.rs diff --git a/aws-lc-rust/src/aead/block.rs b/aws-lc-rs/src/aead/block.rs similarity index 100% rename from aws-lc-rust/src/aead/block.rs rename to aws-lc-rs/src/aead/block.rs diff --git a/aws-lc-rust/src/aead/chacha.rs b/aws-lc-rs/src/aead/chacha.rs similarity index 100% rename from aws-lc-rust/src/aead/chacha.rs rename to aws-lc-rs/src/aead/chacha.rs diff --git a/aws-lc-rust/src/aead/chacha20_poly1305_openssh.rs b/aws-lc-rs/src/aead/chacha20_poly1305_openssh.rs similarity index 98% rename from aws-lc-rust/src/aead/chacha20_poly1305_openssh.rs rename to aws-lc-rs/src/aead/chacha20_poly1305_openssh.rs index dc754c7a44a..6804c103fc7 100644 --- a/aws-lc-rust/src/aead/chacha20_poly1305_openssh.rs +++ b/aws-lc-rs/src/aead/chacha20_poly1305_openssh.rs @@ -6,8 +6,8 @@ //! The [chacha20-poly1305@openssh.com] AEAD-ish construct. //! //! This should only be used by SSH implementations. It has a similar, but -//! different API from `aws_lc_rust::aead` because the construct cannot use the same -//! API as `aws_lc_rust::aead` due to the way the construct handles the encrypted +//! different API from `aws_lc_rs::aead` because the construct cannot use the same +//! API as `aws_lc_rs::aead` due to the way the construct handles the encrypted //! packet length. //! //! The concatenation of a and b is denoted `a||b`. `K_1` and `K_2` are defined diff --git a/aws-lc-rust/src/aead/cipher.rs b/aws-lc-rs/src/aead/cipher.rs similarity index 100% rename from aws-lc-rust/src/aead/cipher.rs rename to aws-lc-rs/src/aead/cipher.rs diff --git a/aws-lc-rust/src/aead/data/chacha_tests.txt b/aws-lc-rs/src/aead/data/chacha_tests.txt similarity index 100% rename from aws-lc-rust/src/aead/data/chacha_tests.txt rename to aws-lc-rs/src/aead/data/chacha_tests.txt diff --git a/aws-lc-rust/src/aead/data/poly1305_test.txt b/aws-lc-rs/src/aead/data/poly1305_test.txt similarity index 100% rename from aws-lc-rust/src/aead/data/poly1305_test.txt rename to aws-lc-rs/src/aead/data/poly1305_test.txt diff --git a/aws-lc-rust/src/aead/key_inner.rs b/aws-lc-rs/src/aead/key_inner.rs similarity index 100% rename from aws-lc-rust/src/aead/key_inner.rs rename to aws-lc-rs/src/aead/key_inner.rs diff --git a/aws-lc-rust/src/aead/nonce.rs b/aws-lc-rs/src/aead/nonce.rs similarity index 100% rename from aws-lc-rust/src/aead/nonce.rs rename to aws-lc-rs/src/aead/nonce.rs diff --git a/aws-lc-rust/src/aead/nonce_sequence.rs b/aws-lc-rs/src/aead/nonce_sequence.rs similarity index 100% rename from aws-lc-rust/src/aead/nonce_sequence.rs rename to aws-lc-rs/src/aead/nonce_sequence.rs diff --git a/aws-lc-rust/src/aead/nonce_sequence/counter32.rs b/aws-lc-rs/src/aead/nonce_sequence/counter32.rs similarity index 100% rename from aws-lc-rust/src/aead/nonce_sequence/counter32.rs rename to aws-lc-rs/src/aead/nonce_sequence/counter32.rs diff --git a/aws-lc-rust/src/aead/nonce_sequence/counter64.rs b/aws-lc-rs/src/aead/nonce_sequence/counter64.rs similarity index 100% rename from aws-lc-rust/src/aead/nonce_sequence/counter64.rs rename to aws-lc-rs/src/aead/nonce_sequence/counter64.rs diff --git a/aws-lc-rust/src/aead/poly1305.rs b/aws-lc-rs/src/aead/poly1305.rs similarity index 100% rename from aws-lc-rust/src/aead/poly1305.rs rename to aws-lc-rs/src/aead/poly1305.rs diff --git a/aws-lc-rust/src/aead/quic.rs b/aws-lc-rs/src/aead/quic.rs similarity index 100% rename from aws-lc-rust/src/aead/quic.rs rename to aws-lc-rs/src/aead/quic.rs diff --git a/aws-lc-rust/src/agreement.rs b/aws-lc-rs/src/agreement.rs similarity index 99% rename from aws-lc-rust/src/agreement.rs rename to aws-lc-rs/src/agreement.rs index d476f6074c2..10b932ecfc2 100644 --- a/aws-lc-rust/src/agreement.rs +++ b/aws-lc-rs/src/agreement.rs @@ -12,7 +12,7 @@ //! `agreement::ECDH_P256`/`agreement::ECDH_P384` for `agreement::X25519`. //! //! ``` -//! use aws_lc_rust::{agreement, rand}; +//! use aws_lc_rs::{agreement, rand}; //! //! let rng = rand::SystemRandom::new(); //! @@ -38,7 +38,7 @@ //! agreement::agree_ephemeral( //! my_private_key, //! &peer_public_key, -//! aws_lc_rust::error::Unspecified, +//! aws_lc_rs::error::Unspecified, //! |_key_material| { //! // In a real application, we'd apply a KDF to the key material and the //! // public keys (as recommended in RFC 7748) and then derive session @@ -47,7 +47,7 @@ //! }, //! )?; //! -//! # Ok::<(), aws_lc_rust::error::Unspecified>(()) +//! # Ok::<(), aws_lc_rs::error::Unspecified>(()) //! ``` use crate::ec::{ec_group_from_nid, ec_key_from_public_point, ec_point_from_bytes}; use crate::error::Unspecified; diff --git a/aws-lc-rust/src/bn.rs b/aws-lc-rs/src/bn.rs similarity index 100% rename from aws-lc-rust/src/bn.rs rename to aws-lc-rs/src/bn.rs diff --git a/aws-lc-rust/src/cbb.rs b/aws-lc-rs/src/cbb.rs similarity index 100% rename from aws-lc-rust/src/cbb.rs rename to aws-lc-rs/src/cbb.rs diff --git a/aws-lc-rust/src/cbs.rs b/aws-lc-rs/src/cbs.rs similarity index 100% rename from aws-lc-rust/src/cbs.rs rename to aws-lc-rs/src/cbs.rs diff --git a/aws-lc-rust/src/constant_time.rs b/aws-lc-rs/src/constant_time.rs similarity index 100% rename from aws-lc-rust/src/constant_time.rs rename to aws-lc-rs/src/constant_time.rs diff --git a/aws-lc-rust/src/data/hmac_generate_serializable_tests.txt b/aws-lc-rs/src/data/hmac_generate_serializable_tests.txt similarity index 100% rename from aws-lc-rust/src/data/hmac_generate_serializable_tests.txt rename to aws-lc-rs/src/data/hmac_generate_serializable_tests.txt diff --git a/aws-lc-rust/src/debug.rs b/aws-lc-rs/src/debug.rs similarity index 100% rename from aws-lc-rust/src/debug.rs rename to aws-lc-rs/src/debug.rs diff --git a/aws-lc-rust/src/digest.rs b/aws-lc-rs/src/digest.rs similarity index 98% rename from aws-lc-rust/src/digest.rs rename to aws-lc-rs/src/digest.rs index 41c75957757..b786ee0ce74 100644 --- a/aws-lc-rust/src/digest.rs +++ b/aws-lc-rs/src/digest.rs @@ -12,7 +12,7 @@ //! # Example //! //! ``` -//! use aws_lc_rust::digest; +//! use aws_lc_rs::digest; //! //! // Using `digest::digest` //! let one_shot = digest::digest(&digest::SHA384, b"hello, world"); @@ -158,7 +158,7 @@ impl Context { /// /// ``` /// # { -/// use aws_lc_rust::{digest, test}; +/// use aws_lc_rs::{digest, test}; /// let expected_hex = "09ca7e4eaa6e8ae9c7d261167129184883644d07dfba7cbfbc4c8a2e08360d5b"; /// let expected: Vec = test::from_hex(expected_hex).unwrap(); /// let actual = digest::digest(&digest::SHA256, b"hello, world"); @@ -227,7 +227,7 @@ pub struct Algorithm { /// for determining the size of an HMAC key that is appropriate for the /// digest algorithm. /// - /// This function isn't actually used in *aws-lc-rust*, and is only + /// This function isn't actually used in *aws-lc-rs*, and is only /// kept for compatibility with the original *ring* implementation. pub chaining_len: usize, diff --git a/aws-lc-rust/src/digest/digest_ctx.rs b/aws-lc-rs/src/digest/digest_ctx.rs similarity index 100% rename from aws-lc-rust/src/digest/digest_ctx.rs rename to aws-lc-rs/src/digest/digest_ctx.rs diff --git a/aws-lc-rust/src/digest/sha.rs b/aws-lc-rs/src/digest/sha.rs similarity index 100% rename from aws-lc-rust/src/digest/sha.rs rename to aws-lc-rs/src/digest/sha.rs diff --git a/aws-lc-rust/src/ec.rs b/aws-lc-rs/src/ec.rs similarity index 99% rename from aws-lc-rust/src/ec.rs rename to aws-lc-rs/src/ec.rs index 2c8cf31c3c0..696ac03d71f 100644 --- a/aws-lc-rust/src/ec.rs +++ b/aws-lc-rs/src/ec.rs @@ -43,7 +43,7 @@ pub const SCALAR_MAX_BYTES: usize = ELEM_MAX_BYTES; /// The maximum length, in bytes, of an encoded public key. pub(crate) const PUBLIC_KEY_MAX_LEN: usize = 1 + (2 * ELEM_MAX_BYTES); -/// The maximum length of a PKCS#8 documents generated by *aws-lc-rust* for ECC keys. +/// The maximum length of a PKCS#8 documents generated by *aws-lc-rs* for ECC keys. /// /// This is NOT the maximum length of a PKCS#8 document that can be consumed by /// `pkcs8::unwrap_key()`. diff --git a/aws-lc-rust/src/ec/key_pair.rs b/aws-lc-rs/src/ec/key_pair.rs similarity index 100% rename from aws-lc-rust/src/ec/key_pair.rs rename to aws-lc-rs/src/ec/key_pair.rs diff --git a/aws-lc-rust/src/ed25519.rs b/aws-lc-rs/src/ed25519.rs similarity index 100% rename from aws-lc-rust/src/ed25519.rs rename to aws-lc-rs/src/ed25519.rs diff --git a/aws-lc-rust/src/endian.rs b/aws-lc-rs/src/endian.rs similarity index 100% rename from aws-lc-rust/src/endian.rs rename to aws-lc-rs/src/endian.rs diff --git a/aws-lc-rust/src/error.rs b/aws-lc-rs/src/error.rs similarity index 93% rename from aws-lc-rust/src/error.rs rename to aws-lc-rs/src/error.rs index 96994749a09..0a772d9fae5 100644 --- a/aws-lc-rust/src/error.rs +++ b/aws-lc-rs/src/error.rs @@ -11,20 +11,20 @@ use std::num::TryFromIntError; /// An error with absolutely no details. /// -/// *aws-lc-rust* uses this unit type as the error type in most of its results +/// *aws-lc-rs* uses this unit type as the error type in most of its results /// because (a) usually the specific reasons for a failure are obvious or are /// not useful to know, and/or (b) providing more details about a failure might /// provide a dangerous side channel, and/or (c) it greatly simplifies the /// error handling logic. /// -/// `Result` is mostly equivalent to -/// `Result`. However, `aws_lc_rust::error::Unspecified` implements +/// `Result` is mostly equivalent to +/// `Result`. However, `aws_lc_rs::error::Unspecified` implements /// [`std::error::Error`] and users can implement /// `From` to map this to their own error types, as /// described in [“Error Handling” in the Rust Book](https://doc.rust-lang.org/book/ch09-00-error-handling.html): /// /// ``` -/// use aws_lc_rust::rand::{self, SecureRandom}; +/// use aws_lc_rs::rand::{self, SecureRandom}; /// /// enum Error { /// CryptoError, @@ -33,15 +33,15 @@ use std::num::TryFromIntError; /// // [...] /// } /// -/// impl From for Error { -/// fn from(_: aws_lc_rust::error::Unspecified) -> Self { Error::CryptoError } +/// impl From for Error { +/// fn from(_: aws_lc_rs::error::Unspecified) -> Self { Error::CryptoError } /// } /// /// fn eight_random_bytes() -> Result<[u8; 8], Error> { /// let rng = rand::SystemRandom::new(); /// let mut bytes = [0; 8]; /// -/// // The `From` implementation above makes this +/// // The `From` implementation above makes this /// // equivalent to /// // `rng.fill(&mut bytes).map_err(|_| Error::CryptoError)?`. /// rng.fill(&mut bytes)?; @@ -58,7 +58,7 @@ use std::num::TryFromIntError; /// crypto library. This approach attempts to minimize complexity in the hopes /// of avoiding such problems. In some cases, this approach may be too extreme, /// and it may be important for an operation to provide some details about the -/// cause of a failure. Users of *aws-lc-rust* are encouraged to report such cases so +/// cause of a failure. Users of *aws-lc-rs* are encouraged to report such cases so /// that they can be addressed individually. /// /// [`std::error::Error`]: https://doc.rust-lang.org/std/error/trait.Error.html diff --git a/aws-lc-rust/src/evp_pkey.rs b/aws-lc-rs/src/evp_pkey.rs similarity index 100% rename from aws-lc-rust/src/evp_pkey.rs rename to aws-lc-rs/src/evp_pkey.rs diff --git a/aws-lc-rust/src/hkdf.rs b/aws-lc-rs/src/hkdf.rs similarity index 99% rename from aws-lc-rust/src/hkdf.rs rename to aws-lc-rs/src/hkdf.rs index 2247562954e..f2875ad374a 100644 --- a/aws-lc-rust/src/hkdf.rs +++ b/aws-lc-rs/src/hkdf.rs @@ -11,7 +11,7 @@ //! //! # Example //! ``` -//! use aws_lc_rust::{aead, hkdf, hmac, rand}; +//! use aws_lc_rs::{aead, hkdf, hmac, rand}; //! //! // Generate a (non-secret) salt value //! let mut salt_bytes = [0u8; 32]; diff --git a/aws-lc-rust/src/hmac.rs b/aws-lc-rs/src/hmac.rs similarity index 97% rename from aws-lc-rust/src/hmac.rs rename to aws-lc-rs/src/hmac.rs index 32b99737db6..039605ecc2c 100644 --- a/aws-lc-rust/src/hmac.rs +++ b/aws-lc-rs/src/hmac.rs @@ -20,7 +20,7 @@ //! ## Signing a value and verifying it wasn't tampered with //! //! ``` -//! use aws_lc_rust::{hmac, rand}; +//! use aws_lc_rs::{hmac, rand}; //! //! let rng = rand::SystemRandom::new(); //! let key = hmac::Key::generate(hmac::HMAC_SHA256, &rng)?; @@ -34,14 +34,14 @@ //! //! hmac::verify(&key, msg.as_bytes(), tag.as_ref())?; //! -//! # Ok::<(), aws_lc_rust::error::Unspecified>(()) +//! # Ok::<(), aws_lc_rs::error::Unspecified>(()) //! ``` //! //! ## Using the one-shot API: //! //! ``` -//! use aws_lc_rust::{digest, hmac, rand}; -//! use aws_lc_rust::rand::SecureRandom; +//! use aws_lc_rs::{digest, hmac, rand}; +//! use aws_lc_rs::rand::SecureRandom; //! //! let msg = "hello, world"; //! @@ -59,13 +59,13 @@ //! let v_key = hmac::Key::new(hmac::HMAC_SHA256, key_value.as_ref()); //! hmac::verify(&v_key, msg.as_bytes(), tag.as_ref())?; //! -//! # Ok::<(), aws_lc_rust::error::Unspecified>(()) +//! # Ok::<(), aws_lc_rs::error::Unspecified>(()) //! ``` //! //! ## Using the multi-part API: //! ``` -//! use aws_lc_rust::{digest, hmac, rand}; -//! use aws_lc_rust::rand::SecureRandom; +//! use aws_lc_rs::{digest, hmac, rand}; +//! use aws_lc_rs::rand::SecureRandom; //! //! let parts = ["hello", ", ", "world"]; //! @@ -91,7 +91,7 @@ //! } //! hmac::verify(&v_key, &msg.as_ref(), tag.as_ref())?; //! -//! # Ok::<(), aws_lc_rust::error::Unspecified>(()) +//! # Ok::<(), aws_lc_rs::error::Unspecified>(()) //! ``` //! [RFC 2104]: https://tools.ietf.org/html/rfc2104 @@ -249,7 +249,7 @@ impl Key { /// `key_value` should be a value generated using a secure random number /// generator (e.g. the `key_value` output by /// `SealingKey::generate_serializable()`) or derived from a random key by - /// a key derivation function (e.g. `aws_lc_rust::hkdf`). In particular, + /// a key derivation function (e.g. `aws_lc_rs::hkdf`). In particular, /// `key_value` shouldn't be a password. /// /// As specified in RFC 2104, if `key_value` is shorter than the digest diff --git a/aws-lc-rust/src/io.rs b/aws-lc-rs/src/io.rs similarity index 100% rename from aws-lc-rust/src/io.rs rename to aws-lc-rs/src/io.rs diff --git a/aws-lc-rust/src/io/der.rs b/aws-lc-rs/src/io/der.rs similarity index 100% rename from aws-lc-rust/src/io/der.rs rename to aws-lc-rs/src/io/der.rs diff --git a/aws-lc-rust/src/io/der_writer.rs b/aws-lc-rs/src/io/der_writer.rs similarity index 100% rename from aws-lc-rust/src/io/der_writer.rs rename to aws-lc-rs/src/io/der_writer.rs diff --git a/aws-lc-rust/src/io/positive.rs b/aws-lc-rs/src/io/positive.rs similarity index 100% rename from aws-lc-rust/src/io/positive.rs rename to aws-lc-rs/src/io/positive.rs diff --git a/aws-lc-rust/src/io/writer.rs b/aws-lc-rs/src/io/writer.rs similarity index 100% rename from aws-lc-rust/src/io/writer.rs rename to aws-lc-rs/src/io/writer.rs diff --git a/aws-lc-rust/src/lib.rs b/aws-lc-rs/src/lib.rs similarity index 98% rename from aws-lc-rust/src/lib.rs rename to aws-lc-rs/src/lib.rs index c89d3ab9204..ccf805f6665 100644 --- a/aws-lc-rust/src/lib.rs +++ b/aws-lc-rs/src/lib.rs @@ -20,7 +20,7 @@ //! function. This adds a requirement on `untrusted = "0.7.1"`. //! //! #### - fips #### -//! **EXPERIMENTAL** Enable this feature to have aws-lc-rust use the +//! **EXPERIMENTAL** Enable this feature to have aws-lc-rs use the //! [*aws-lc-fips-sys*](https://crates.io/crates/aws-lc-fips-sys) crate for the cryptographic //! implementations. The *aws-lc-fips-sys* crate provides bindings to the FIPS variant of //! [*AWS-LC*](https://github.com/aws/aws-lc). AWS-LC has been submitted to an accredited lab @@ -55,7 +55,7 @@ //! fulfilled much of the cryptographic needs in the Rust community, but it did not meet the needs //! of developers with FIPS requirements. Our intention is to contribute a drop-in replacement for //! ring that provides FIPS and is compatible with the ring API. Rust developers with prescribed -//! cryptographic requirements can seamlessly integrate aws-lc-rust into their applications and +//! cryptographic requirements can seamlessly integrate aws-lc-rs into their applications and //! deploy them into AWS Regions. //! @@ -150,7 +150,7 @@ unsafe fn dump_error() { } mod sealed { - /// Traits that are designed to only be implemented internally in *aws-lc-rust*. + /// Traits that are designed to only be implemented internally in *aws-lc-rs*. // // Usage: // ``` diff --git a/aws-lc-rust/src/pbkdf2.rs b/aws-lc-rs/src/pbkdf2.rs similarity index 99% rename from aws-lc-rust/src/pbkdf2.rs rename to aws-lc-rs/src/pbkdf2.rs index 614acf833a9..083f581a429 100644 --- a/aws-lc-rust/src/pbkdf2.rs +++ b/aws-lc-rs/src/pbkdf2.rs @@ -21,7 +21,7 @@ //! ## Password Database Example //! //! ``` -//! use aws_lc_rust::{digest, pbkdf2}; +//! use aws_lc_rs::{digest, pbkdf2}; //! use std::{collections::HashMap, num::NonZeroU32}; //! //! static PBKDF2_ALG: pbkdf2::Algorithm = pbkdf2::PBKDF2_HMAC_SHA256; diff --git a/aws-lc-rust/src/pkcs8.rs b/aws-lc-rs/src/pkcs8.rs similarity index 100% rename from aws-lc-rust/src/pkcs8.rs rename to aws-lc-rs/src/pkcs8.rs diff --git a/aws-lc-rust/src/ptr.rs b/aws-lc-rs/src/ptr.rs similarity index 100% rename from aws-lc-rust/src/ptr.rs rename to aws-lc-rs/src/ptr.rs diff --git a/aws-lc-rust/src/rand.rs b/aws-lc-rs/src/rand.rs similarity index 98% rename from aws-lc-rust/src/rand.rs rename to aws-lc-rs/src/rand.rs index 9e3821a008d..1f059f69615 100644 --- a/aws-lc-rust/src/rand.rs +++ b/aws-lc-rs/src/rand.rs @@ -18,7 +18,7 @@ //! # Example //! ``` -//! use aws_lc_rust::{rand, rand::SecureRandom}; +//! use aws_lc_rs::{rand, rand::SecureRandom}; //! //! // Using `rand::fill` //! let mut rand_bytes = [0u8; 32]; @@ -113,7 +113,7 @@ pub(crate) mod sealed { } } -/// A type that can be returned by `aws_lc_rust::rand::generate()`. +/// A type that can be returned by `aws_lc_rs::rand::generate()`. pub trait RandomlyConstructable: sealed::RandomlyConstructable {} impl RandomlyConstructable for T where T: sealed::RandomlyConstructable {} diff --git a/aws-lc-rust/src/rsa.rs b/aws-lc-rs/src/rsa.rs similarity index 99% rename from aws-lc-rust/src/rsa.rs rename to aws-lc-rs/src/rsa.rs index f56ddd50bb6..13e59ecefeb 100644 --- a/aws-lc-rust/src/rsa.rs +++ b/aws-lc-rs/src/rsa.rs @@ -575,8 +575,8 @@ fn verify_RSA( /// Low-level API for the verification of RSA signatures. /// /// When the public key is in DER-encoded PKCS#1 ASN.1 format, it is -/// recommended to use `aws_lc_rust::signature::verify()` with -/// `aws_lc_rust::signature::RSA_PKCS1_*`, because `aws_lc_rust::signature::verify()` +/// recommended to use `aws_lc_rs::signature::verify()` with +/// `aws_lc_rs::signature::RSA_PKCS1_*`, because `aws_lc_rs::signature::verify()` /// will handle the parsing in that case. Otherwise, this function can be used /// to pass in the raw bytes for the public key components as /// `untrusted::Input` arguments. diff --git a/aws-lc-rust/src/signature.rs b/aws-lc-rs/src/signature.rs similarity index 99% rename from aws-lc-rust/src/signature.rs rename to aws-lc-rs/src/signature.rs index 33ea5f4a717..8af78d8a18e 100644 --- a/aws-lc-rust/src/signature.rs +++ b/aws-lc-rs/src/signature.rs @@ -118,12 +118,12 @@ //! ## Signing and verifying with Ed25519 //! //! ``` -//! use aws_lc_rust::{ +//! use aws_lc_rs::{ //! rand, //! signature::{self, KeyPair}, //! }; //! -//! fn main() -> Result<(), aws_lc_rust::error::Unspecified> { +//! fn main() -> Result<(), aws_lc_rs::error::Unspecified> { //! // Generate a key pair in PKCS#8 (v1) format. //! let rng = rand::SystemRandom::new(); //! let pkcs8_bytes = signature::Ed25519KeyPair::generate_pkcs8v1(&rng)?; @@ -182,7 +182,7 @@ //! ``` //! //! ``` -//! use aws_lc_rust::{rand, signature}; +//! use aws_lc_rs::{rand, signature}; //! //! fn sign_and_verify_rsa(private_key_path: &std::path::Path, //! public_key_path: &std::path::Path) diff --git a/aws-lc-rust/src/test.rs b/aws-lc-rs/src/test.rs similarity index 99% rename from aws-lc-rust/src/test.rs rename to aws-lc-rs/src/test.rs index 98ddb19e508..0d7f0cf1810 100644 --- a/aws-lc-rust/src/test.rs +++ b/aws-lc-rs/src/test.rs @@ -5,9 +5,9 @@ //! Testing framework. //! -//! Unlike the rest of *aws-lc-rust*, this testing framework uses panics pretty +//! Unlike the rest of *aws-lc-rs*, this testing framework uses panics pretty //! liberally. It was originally designed for internal use--it drives most of -//! *aws-lc-rust*'s internal tests, and so it is optimized for getting *aws-lc-rust*'s tests +//! *aws-lc-rs*'s internal tests, and so it is optimized for getting *aws-lc-rs*'s tests //! written quickly at the expense of some usability. The documentation is //! lacking. The best way to learn it is to look at some examples. The digest //! tests are the most complicated because they use named sections. Other tests @@ -42,7 +42,7 @@ //! Here's how you would consume the test data: //! //! ```ignore -//! use aws_lc_rust::test; +//! use aws_lc_rs::test; //! //! test::run(test::test_file!("hmac_tests.txt"), |section, test_case| { //! assert_eq!(section, ""); // This test doesn't use named sections. diff --git a/aws-lc-rust/src/test/test_1_syntax_error_tests.txt b/aws-lc-rs/src/test/test_1_syntax_error_tests.txt similarity index 100% rename from aws-lc-rust/src/test/test_1_syntax_error_tests.txt rename to aws-lc-rs/src/test/test_1_syntax_error_tests.txt diff --git a/aws-lc-rust/src/test/test_1_tests.txt b/aws-lc-rs/src/test/test_1_tests.txt similarity index 100% rename from aws-lc-rust/src/test/test_1_tests.txt rename to aws-lc-rs/src/test/test_1_tests.txt diff --git a/aws-lc-rust/src/test/test_3_tests.txt b/aws-lc-rs/src/test/test_3_tests.txt similarity index 100% rename from aws-lc-rust/src/test/test_3_tests.txt rename to aws-lc-rs/src/test/test_3_tests.txt diff --git a/aws-lc-rust/tests/aead_test.rs b/aws-lc-rs/tests/aead_test.rs similarity index 99% rename from aws-lc-rust/tests/aead_test.rs rename to aws-lc-rs/tests/aead_test.rs index bcbf956bd87..e0c3901f444 100644 --- a/aws-lc-rust/tests/aead_test.rs +++ b/aws-lc-rs/tests/aead_test.rs @@ -3,9 +3,9 @@ // Modifications copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 OR ISC -use aws_lc_rust::{aead, error, test, test_file}; +use aws_lc_rs::{aead, error, test, test_file}; -use aws_lc_rust::aead::{Nonce, NONCE_LEN}; +use aws_lc_rs::aead::{Nonce, NONCE_LEN}; use core::ops::RangeFrom; use mirai_annotations::unrecoverable; diff --git a/aws-lc-rust/tests/agreement_tests.rs b/aws-lc-rs/tests/agreement_tests.rs similarity index 99% rename from aws-lc-rust/tests/agreement_tests.rs rename to aws-lc-rs/tests/agreement_tests.rs index 1f71b28067d..8e5a7606279 100644 --- a/aws-lc-rust/tests/agreement_tests.rs +++ b/aws-lc-rs/tests/agreement_tests.rs @@ -5,7 +5,7 @@ extern crate alloc; -use aws_lc_rust::{agreement, error, rand, test, test_file}; +use aws_lc_rs::{agreement, error, rand, test, test_file}; #[test] fn agreement_traits() { diff --git a/aws-lc-rust/tests/basic_aead_test.rs b/aws-lc-rs/tests/basic_aead_test.rs similarity index 98% rename from aws-lc-rust/tests/basic_aead_test.rs rename to aws-lc-rs/tests/basic_aead_test.rs index b4a3670a54c..98d057b03fa 100644 --- a/aws-lc-rust/tests/basic_aead_test.rs +++ b/aws-lc-rs/tests/basic_aead_test.rs @@ -3,13 +3,13 @@ extern crate core; -use aws_lc_rust::{aead, error, test}; +use aws_lc_rs::{aead, error, test}; use aead::{ Aad, Algorithm, BoundKey, Nonce, NonceSequence, OpeningKey, SealingKey, UnboundKey, AES_128_GCM, AES_256_GCM, CHACHA20_POLY1305, }; -use aws_lc_rust::test::from_hex; +use aws_lc_rs::test::from_hex; use error::Unspecified; struct NotANonce(Vec); @@ -185,6 +185,6 @@ fn test_types() { mod test_aead { test_aead!(ring); - test_aead!(aws_lc_rust); + test_aead!(aws_lc_rs); } */ diff --git a/aws-lc-rust/tests/basic_openssh_test.rs b/aws-lc-rs/tests/basic_openssh_test.rs similarity index 95% rename from aws-lc-rust/tests/basic_openssh_test.rs rename to aws-lc-rs/tests/basic_openssh_test.rs index 6970ca614c9..38bf3a7b825 100644 --- a/aws-lc-rust/tests/basic_openssh_test.rs +++ b/aws-lc-rs/tests/basic_openssh_test.rs @@ -1,9 +1,9 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 OR ISC -use aws_lc_rust::test::from_hex; +use aws_lc_rs::test::from_hex; -use aws_lc_rust::aead; +use aws_lc_rs::aead; #[test] fn test_openssh() { diff --git a/aws-lc-rust/tests/basic_quic_test.rs b/aws-lc-rs/tests/basic_quic_test.rs similarity index 95% rename from aws-lc-rust/tests/basic_quic_test.rs rename to aws-lc-rs/tests/basic_quic_test.rs index cee16495613..3513b0fffa7 100644 --- a/aws-lc-rust/tests/basic_quic_test.rs +++ b/aws-lc-rs/tests/basic_quic_test.rs @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 OR ISC //use ring::{aead, error}; -use aws_lc_rust::aead; +use aws_lc_rs::aead; use aead::quic; -use aws_lc_rust::test::from_dirty_hex; +use aws_lc_rs::test::from_dirty_hex; #[test] fn test_quic_aes_128_gcm() { diff --git a/aws-lc-rust/tests/basic_rsa_test.rs b/aws-lc-rs/tests/basic_rsa_test.rs similarity index 98% rename from aws-lc-rust/tests/basic_rsa_test.rs rename to aws-lc-rs/tests/basic_rsa_test.rs index b8b008e12af..6628ba8d17d 100644 --- a/aws-lc-rust/tests/basic_rsa_test.rs +++ b/aws-lc-rs/tests/basic_rsa_test.rs @@ -1,10 +1,10 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 OR ISC -use aws_lc_rust::rand::SystemRandom; -use aws_lc_rust::signature; -use aws_lc_rust::signature::RsaKeyPair; -use aws_lc_rust::test::from_dirty_hex; +use aws_lc_rs::rand::SystemRandom; +use aws_lc_rs::signature; +use aws_lc_rs::signature::RsaKeyPair; +use aws_lc_rs::test::from_dirty_hex; #[test] fn test_rsa_pkcs8() { diff --git a/aws-lc-rust/tests/data/aead_aes_128_gcm_tests.txt b/aws-lc-rs/tests/data/aead_aes_128_gcm_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/aead_aes_128_gcm_tests.txt rename to aws-lc-rs/tests/data/aead_aes_128_gcm_tests.txt diff --git a/aws-lc-rust/tests/data/aead_aes_256_gcm_tests.txt b/aws-lc-rs/tests/data/aead_aes_256_gcm_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/aead_aes_256_gcm_tests.txt rename to aws-lc-rs/tests/data/aead_aes_256_gcm_tests.txt diff --git a/aws-lc-rust/tests/data/aead_chacha20_poly1305_openssh_tests.txt b/aws-lc-rs/tests/data/aead_chacha20_poly1305_openssh_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/aead_chacha20_poly1305_openssh_tests.txt rename to aws-lc-rs/tests/data/aead_chacha20_poly1305_openssh_tests.txt diff --git a/aws-lc-rust/tests/data/aead_chacha20_poly1305_tests.txt b/aws-lc-rs/tests/data/aead_chacha20_poly1305_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/aead_chacha20_poly1305_tests.txt rename to aws-lc-rs/tests/data/aead_chacha20_poly1305_tests.txt diff --git a/aws-lc-rust/tests/data/agreement_tests.txt b/aws-lc-rs/tests/data/agreement_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/agreement_tests.txt rename to aws-lc-rs/tests/data/agreement_tests.txt diff --git a/aws-lc-rust/tests/data/digest_tests.txt b/aws-lc-rs/tests/data/digest_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/digest_tests.txt rename to aws-lc-rs/tests/data/digest_tests.txt diff --git a/aws-lc-rust/tests/data/ecdsa_from_pkcs8_tests.txt b/aws-lc-rs/tests/data/ecdsa_from_pkcs8_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/ecdsa_from_pkcs8_tests.txt rename to aws-lc-rs/tests/data/ecdsa_from_pkcs8_tests.txt diff --git a/aws-lc-rust/tests/data/ecdsa_sign_asn1_tests.txt b/aws-lc-rs/tests/data/ecdsa_sign_asn1_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/ecdsa_sign_asn1_tests.txt rename to aws-lc-rs/tests/data/ecdsa_sign_asn1_tests.txt diff --git a/aws-lc-rust/tests/data/ecdsa_sign_fixed_tests.txt b/aws-lc-rs/tests/data/ecdsa_sign_fixed_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/ecdsa_sign_fixed_tests.txt rename to aws-lc-rs/tests/data/ecdsa_sign_fixed_tests.txt diff --git a/aws-lc-rust/tests/data/ecdsa_test_private_key_p256.p8 b/aws-lc-rs/tests/data/ecdsa_test_private_key_p256.p8 similarity index 100% rename from aws-lc-rust/tests/data/ecdsa_test_private_key_p256.p8 rename to aws-lc-rs/tests/data/ecdsa_test_private_key_p256.p8 diff --git a/aws-lc-rust/tests/data/ecdsa_test_public_key_p256.der b/aws-lc-rs/tests/data/ecdsa_test_public_key_p256.der similarity index 100% rename from aws-lc-rust/tests/data/ecdsa_test_public_key_p256.der rename to aws-lc-rs/tests/data/ecdsa_test_public_key_p256.der diff --git a/aws-lc-rust/tests/data/ecdsa_test_public_key_p256_debug.txt b/aws-lc-rs/tests/data/ecdsa_test_public_key_p256_debug.txt similarity index 100% rename from aws-lc-rust/tests/data/ecdsa_test_public_key_p256_debug.txt rename to aws-lc-rs/tests/data/ecdsa_test_public_key_p256_debug.txt diff --git a/aws-lc-rust/tests/data/ecdsa_verify_asn1_tests.txt b/aws-lc-rs/tests/data/ecdsa_verify_asn1_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/ecdsa_verify_asn1_tests.txt rename to aws-lc-rs/tests/data/ecdsa_verify_asn1_tests.txt diff --git a/aws-lc-rust/tests/data/ecdsa_verify_fixed_tests.txt b/aws-lc-rs/tests/data/ecdsa_verify_fixed_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/ecdsa_verify_fixed_tests.txt rename to aws-lc-rs/tests/data/ecdsa_verify_fixed_tests.txt diff --git a/aws-lc-rust/tests/data/ed25519_from_pkcs8_tests.txt b/aws-lc-rs/tests/data/ed25519_from_pkcs8_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/ed25519_from_pkcs8_tests.txt rename to aws-lc-rs/tests/data/ed25519_from_pkcs8_tests.txt diff --git a/aws-lc-rust/tests/data/ed25519_test_private_key.bin b/aws-lc-rs/tests/data/ed25519_test_private_key.bin similarity index 100% rename from aws-lc-rust/tests/data/ed25519_test_private_key.bin rename to aws-lc-rs/tests/data/ed25519_test_private_key.bin diff --git a/aws-lc-rust/tests/data/ed25519_test_private_key.p8 b/aws-lc-rs/tests/data/ed25519_test_private_key.p8 similarity index 100% rename from aws-lc-rust/tests/data/ed25519_test_private_key.p8 rename to aws-lc-rs/tests/data/ed25519_test_private_key.p8 diff --git a/aws-lc-rust/tests/data/ed25519_test_public_key.bin b/aws-lc-rs/tests/data/ed25519_test_public_key.bin similarity index 100% rename from aws-lc-rust/tests/data/ed25519_test_public_key.bin rename to aws-lc-rs/tests/data/ed25519_test_public_key.bin diff --git a/aws-lc-rust/tests/data/ed25519_test_public_key.der b/aws-lc-rs/tests/data/ed25519_test_public_key.der similarity index 100% rename from aws-lc-rust/tests/data/ed25519_test_public_key.der rename to aws-lc-rs/tests/data/ed25519_test_public_key.der diff --git a/aws-lc-rust/tests/data/ed25519_tests.txt b/aws-lc-rs/tests/data/ed25519_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/ed25519_tests.txt rename to aws-lc-rs/tests/data/ed25519_tests.txt diff --git a/aws-lc-rust/tests/data/ed25519_verify_tests.txt b/aws-lc-rs/tests/data/ed25519_verify_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/ed25519_verify_tests.txt rename to aws-lc-rs/tests/data/ed25519_verify_tests.txt diff --git a/aws-lc-rust/tests/data/hkdf_tests.txt b/aws-lc-rs/tests/data/hkdf_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/hkdf_tests.txt rename to aws-lc-rs/tests/data/hkdf_tests.txt diff --git a/aws-lc-rust/tests/data/hmac_tests.txt b/aws-lc-rs/tests/data/hmac_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/hmac_tests.txt rename to aws-lc-rs/tests/data/hmac_tests.txt diff --git a/aws-lc-rust/tests/data/pbkdf2_tests.txt b/aws-lc-rs/tests/data/pbkdf2_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/pbkdf2_tests.txt rename to aws-lc-rs/tests/data/pbkdf2_tests.txt diff --git a/aws-lc-rust/tests/data/quic_aes_128_tests.txt b/aws-lc-rs/tests/data/quic_aes_128_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/quic_aes_128_tests.txt rename to aws-lc-rs/tests/data/quic_aes_128_tests.txt diff --git a/aws-lc-rust/tests/data/quic_aes_256_tests.txt b/aws-lc-rs/tests/data/quic_aes_256_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/quic_aes_256_tests.txt rename to aws-lc-rs/tests/data/quic_aes_256_tests.txt diff --git a/aws-lc-rust/tests/data/quic_chacha20_tests.txt b/aws-lc-rs/tests/data/quic_chacha20_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/quic_chacha20_tests.txt rename to aws-lc-rs/tests/data/quic_chacha20_tests.txt diff --git a/aws-lc-rust/tests/data/rsa_from_pkcs8_tests.txt b/aws-lc-rs/tests/data/rsa_from_pkcs8_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/rsa_from_pkcs8_tests.txt rename to aws-lc-rs/tests/data/rsa_from_pkcs8_tests.txt diff --git a/aws-lc-rust/tests/data/rsa_pkcs1_sign_tests.txt b/aws-lc-rs/tests/data/rsa_pkcs1_sign_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/rsa_pkcs1_sign_tests.txt rename to aws-lc-rs/tests/data/rsa_pkcs1_sign_tests.txt diff --git a/aws-lc-rust/tests/data/rsa_pkcs1_verify_tests.txt b/aws-lc-rs/tests/data/rsa_pkcs1_verify_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/rsa_pkcs1_verify_tests.txt rename to aws-lc-rs/tests/data/rsa_pkcs1_verify_tests.txt diff --git a/aws-lc-rust/tests/data/rsa_primitive_verify_tests.txt b/aws-lc-rs/tests/data/rsa_primitive_verify_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/rsa_primitive_verify_tests.txt rename to aws-lc-rs/tests/data/rsa_primitive_verify_tests.txt diff --git a/aws-lc-rust/tests/data/rsa_pss_sign_tests.txt b/aws-lc-rs/tests/data/rsa_pss_sign_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/rsa_pss_sign_tests.txt rename to aws-lc-rs/tests/data/rsa_pss_sign_tests.txt diff --git a/aws-lc-rust/tests/data/rsa_pss_verify_tests.txt b/aws-lc-rs/tests/data/rsa_pss_verify_tests.txt similarity index 100% rename from aws-lc-rust/tests/data/rsa_pss_verify_tests.txt rename to aws-lc-rs/tests/data/rsa_pss_verify_tests.txt diff --git a/aws-lc-rust/tests/data/rsa_test_private_key_2048.p8 b/aws-lc-rs/tests/data/rsa_test_private_key_2048.p8 similarity index 100% rename from aws-lc-rust/tests/data/rsa_test_private_key_2048.p8 rename to aws-lc-rs/tests/data/rsa_test_private_key_2048.p8 diff --git a/aws-lc-rust/tests/data/rsa_test_public_key_2048.der b/aws-lc-rs/tests/data/rsa_test_public_key_2048.der similarity index 100% rename from aws-lc-rust/tests/data/rsa_test_public_key_2048.der rename to aws-lc-rs/tests/data/rsa_test_public_key_2048.der diff --git a/aws-lc-rust/tests/data/rsa_test_public_key_2048_debug.txt b/aws-lc-rs/tests/data/rsa_test_public_key_2048_debug.txt similarity index 100% rename from aws-lc-rust/tests/data/rsa_test_public_key_2048_debug.txt rename to aws-lc-rs/tests/data/rsa_test_public_key_2048_debug.txt diff --git a/aws-lc-rust/tests/data/signature_rsa_example_private_key.der b/aws-lc-rs/tests/data/signature_rsa_example_private_key.der similarity index 100% rename from aws-lc-rust/tests/data/signature_rsa_example_private_key.der rename to aws-lc-rs/tests/data/signature_rsa_example_private_key.der diff --git a/aws-lc-rust/tests/data/signature_rsa_example_public_key.der b/aws-lc-rs/tests/data/signature_rsa_example_public_key.der similarity index 100% rename from aws-lc-rust/tests/data/signature_rsa_example_public_key.der rename to aws-lc-rs/tests/data/signature_rsa_example_public_key.der diff --git a/aws-lc-rust/tests/digest_test.rs b/aws-lc-rs/tests/digest_test.rs similarity index 98% rename from aws-lc-rust/tests/digest_test.rs rename to aws-lc-rs/tests/digest_test.rs index 188ba8de144..c895aa87ad7 100644 --- a/aws-lc-rust/tests/digest_test.rs +++ b/aws-lc-rs/tests/digest_test.rs @@ -3,7 +3,7 @@ // Modifications copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 OR ISC -use aws_lc_rust::{digest, test, test_file}; +use aws_lc_rs::{digest, test, test_file}; /// Test vectors from `BoringSSL`, `Go`, and other sources. #[test] @@ -32,7 +32,7 @@ fn digest_misc() { } mod digest_shavs { - use aws_lc_rust::{digest, test}; + use aws_lc_rs::{digest, test}; fn run_known_answer_test(digest_alg: &'static digest::Algorithm, test_file: test::File) { let section_name = &format!("L = {}", digest_alg.output_len); @@ -61,7 +61,7 @@ mod digest_shavs { #[allow(non_snake_case)] mod $algorithm_name { use super::{run_known_answer_test, run_monte_carlo_test}; - use aws_lc_rust::{digest, test_file}; + use aws_lc_rs::{digest, test_file}; #[cfg(target_arch = "wasm32")] use wasm_bindgen_test::wasm_bindgen_test as test; diff --git a/aws-lc-rust/tests/ecdsa_tests.rs b/aws-lc-rs/tests/ecdsa_tests.rs similarity index 99% rename from aws-lc-rust/tests/ecdsa_tests.rs rename to aws-lc-rs/tests/ecdsa_tests.rs index 1b2a91a8efd..5daf1153e30 100644 --- a/aws-lc-rust/tests/ecdsa_tests.rs +++ b/aws-lc-rs/tests/ecdsa_tests.rs @@ -3,7 +3,7 @@ // Modifications copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 OR ISC -use aws_lc_rust::{ +use aws_lc_rs::{ rand, signature::{self, KeyPair}, test, test_file, diff --git a/aws-lc-rust/tests/ed25519_tests.rs b/aws-lc-rs/tests/ed25519_tests.rs similarity index 99% rename from aws-lc-rust/tests/ed25519_tests.rs rename to aws-lc-rs/tests/ed25519_tests.rs index 48f31ff154d..3773c45e3eb 100644 --- a/aws-lc-rust/tests/ed25519_tests.rs +++ b/aws-lc-rs/tests/ed25519_tests.rs @@ -3,7 +3,7 @@ // Modifications copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 OR ISC -use aws_lc_rust::{ +use aws_lc_rs::{ error, signature::{self, Ed25519KeyPair, KeyPair}, test, test_file, diff --git a/aws-lc-rust/tests/hkdf_test.rs b/aws-lc-rs/tests/hkdf_test.rs similarity index 98% rename from aws-lc-rust/tests/hkdf_test.rs rename to aws-lc-rs/tests/hkdf_test.rs index 7e5e6c63dcf..c85dd7294dc 100644 --- a/aws-lc-rust/tests/hkdf_test.rs +++ b/aws-lc-rs/tests/hkdf_test.rs @@ -3,7 +3,7 @@ // Modifications copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 OR ISC -use aws_lc_rust::{aead, digest, error, hkdf, hmac, test, test_file}; +use aws_lc_rs::{aead, digest, error, hkdf, hmac, test, test_file}; #[test] fn hkdf_tests() { diff --git a/aws-lc-rust/tests/hmac_test.rs b/aws-lc-rs/tests/hmac_test.rs similarity index 98% rename from aws-lc-rust/tests/hmac_test.rs rename to aws-lc-rs/tests/hmac_test.rs index 3a1a6193f63..867650ef69b 100644 --- a/aws-lc-rust/tests/hmac_test.rs +++ b/aws-lc-rs/tests/hmac_test.rs @@ -3,8 +3,8 @@ // Modifications copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 OR ISC -use aws_lc_rust::hmac::sign; -use aws_lc_rust::{digest, hmac, test, test_file}; +use aws_lc_rs::hmac::sign; +use aws_lc_rs::{digest, hmac, test, test_file}; #[test] fn hmac_tests() { diff --git a/aws-lc-rust/tests/pbkdf2_test.rs b/aws-lc-rs/tests/pbkdf2_test.rs similarity index 97% rename from aws-lc-rust/tests/pbkdf2_test.rs rename to aws-lc-rs/tests/pbkdf2_test.rs index 7d0cd7dce94..b67c0139bdf 100644 --- a/aws-lc-rust/tests/pbkdf2_test.rs +++ b/aws-lc-rs/tests/pbkdf2_test.rs @@ -3,7 +3,7 @@ // Modifications copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 OR ISC -use aws_lc_rust::{digest, error, pbkdf2, test, test_file}; +use aws_lc_rs::{digest, error, pbkdf2, test, test_file}; use core::num::NonZeroU32; /// Test vectors from `BoringSSL`, Go, and other sources. @@ -60,7 +60,7 @@ fn pbkdf2_tests() { #[cfg(all(target_arch = "x86_64", target_vendor = "apple"))] #[cfg(test)] mod tests { - use aws_lc_rust::{digest, pbkdf2}; + use aws_lc_rs::{digest, pbkdf2}; use core::num::NonZeroU32; use mirai_annotations::assume; diff --git a/aws-lc-rust/tests/quic_test.rs b/aws-lc-rs/tests/quic_test.rs similarity index 96% rename from aws-lc-rust/tests/quic_test.rs rename to aws-lc-rs/tests/quic_test.rs index 53f223c16dc..1fd31ef5114 100644 --- a/aws-lc-rust/tests/quic_test.rs +++ b/aws-lc-rs/tests/quic_test.rs @@ -3,8 +3,8 @@ // Modifications copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 OR ISC -use aws_lc_rust::aead::quic; -use aws_lc_rust::{test, test_file}; +use aws_lc_rs::aead::quic; +use aws_lc_rs::{test, test_file}; #[test] fn quic_aes_128() { diff --git a/aws-lc-rust/tests/rand_test.rs b/aws-lc-rs/tests/rand_test.rs similarity index 98% rename from aws-lc-rust/tests/rand_test.rs rename to aws-lc-rs/tests/rand_test.rs index 3dca60757c6..d9b0903e8f1 100644 --- a/aws-lc-rust/tests/rand_test.rs +++ b/aws-lc-rs/tests/rand_test.rs @@ -3,7 +3,7 @@ // Modifications copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 OR ISC -use aws_lc_rust::{ +use aws_lc_rs::{ rand::{self, SecureRandom as _}, test, }; diff --git a/aws-lc-rust/tests/rsa_test.rs b/aws-lc-rs/tests/rsa_test.rs similarity index 98% rename from aws-lc-rust/tests/rsa_test.rs rename to aws-lc-rs/tests/rsa_test.rs index ffbbc8a8a77..d3590577801 100644 --- a/aws-lc-rust/tests/rsa_test.rs +++ b/aws-lc-rs/tests/rsa_test.rs @@ -3,9 +3,9 @@ // Modifications copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 OR ISC -use aws_lc_rust::signature::{KeyPair, RsaParameters, RsaSubjectPublicKey}; -use aws_lc_rust::test::to_hex_upper; -use aws_lc_rust::{rand, signature, signature::RsaKeyPair, test, test_file}; +use aws_lc_rs::signature::{KeyPair, RsaParameters, RsaSubjectPublicKey}; +use aws_lc_rs::test::to_hex_upper; +use aws_lc_rs::{rand, signature, signature::RsaKeyPair, test, test_file}; #[test] fn rsa_traits() { diff --git a/aws-lc-rust/third_party/NIST/.gitattributes b/aws-lc-rs/third_party/NIST/.gitattributes similarity index 100% rename from aws-lc-rust/third_party/NIST/.gitattributes rename to aws-lc-rs/third_party/NIST/.gitattributes diff --git a/aws-lc-rust/third_party/NIST/README.md b/aws-lc-rs/third_party/NIST/README.md similarity index 100% rename from aws-lc-rust/third_party/NIST/README.md rename to aws-lc-rs/third_party/NIST/README.md diff --git a/aws-lc-rust/third_party/NIST/SHAVS/SHA1LongMsg.rsp b/aws-lc-rs/third_party/NIST/SHAVS/SHA1LongMsg.rsp similarity index 100% rename from aws-lc-rust/third_party/NIST/SHAVS/SHA1LongMsg.rsp rename to aws-lc-rs/third_party/NIST/SHAVS/SHA1LongMsg.rsp diff --git a/aws-lc-rust/third_party/NIST/SHAVS/SHA1Monte.rsp b/aws-lc-rs/third_party/NIST/SHAVS/SHA1Monte.rsp similarity index 100% rename from aws-lc-rust/third_party/NIST/SHAVS/SHA1Monte.rsp rename to aws-lc-rs/third_party/NIST/SHAVS/SHA1Monte.rsp diff --git a/aws-lc-rust/third_party/NIST/SHAVS/SHA1ShortMsg.rsp b/aws-lc-rs/third_party/NIST/SHAVS/SHA1ShortMsg.rsp similarity index 100% rename from aws-lc-rust/third_party/NIST/SHAVS/SHA1ShortMsg.rsp rename to aws-lc-rs/third_party/NIST/SHAVS/SHA1ShortMsg.rsp diff --git a/aws-lc-rust/third_party/NIST/SHAVS/SHA224LongMsg.rsp b/aws-lc-rs/third_party/NIST/SHAVS/SHA224LongMsg.rsp similarity index 100% rename from aws-lc-rust/third_party/NIST/SHAVS/SHA224LongMsg.rsp rename to aws-lc-rs/third_party/NIST/SHAVS/SHA224LongMsg.rsp diff --git a/aws-lc-rust/third_party/NIST/SHAVS/SHA224Monte.rsp b/aws-lc-rs/third_party/NIST/SHAVS/SHA224Monte.rsp similarity index 100% rename from aws-lc-rust/third_party/NIST/SHAVS/SHA224Monte.rsp rename to aws-lc-rs/third_party/NIST/SHAVS/SHA224Monte.rsp diff --git a/aws-lc-rust/third_party/NIST/SHAVS/SHA224ShortMsg.rsp b/aws-lc-rs/third_party/NIST/SHAVS/SHA224ShortMsg.rsp similarity index 100% rename from aws-lc-rust/third_party/NIST/SHAVS/SHA224ShortMsg.rsp rename to aws-lc-rs/third_party/NIST/SHAVS/SHA224ShortMsg.rsp diff --git a/aws-lc-rust/third_party/NIST/SHAVS/SHA256LongMsg.rsp b/aws-lc-rs/third_party/NIST/SHAVS/SHA256LongMsg.rsp similarity index 100% rename from aws-lc-rust/third_party/NIST/SHAVS/SHA256LongMsg.rsp rename to aws-lc-rs/third_party/NIST/SHAVS/SHA256LongMsg.rsp diff --git a/aws-lc-rust/third_party/NIST/SHAVS/SHA256Monte.rsp b/aws-lc-rs/third_party/NIST/SHAVS/SHA256Monte.rsp similarity index 100% rename from aws-lc-rust/third_party/NIST/SHAVS/SHA256Monte.rsp rename to aws-lc-rs/third_party/NIST/SHAVS/SHA256Monte.rsp diff --git a/aws-lc-rust/third_party/NIST/SHAVS/SHA256ShortMsg.rsp b/aws-lc-rs/third_party/NIST/SHAVS/SHA256ShortMsg.rsp similarity index 100% rename from aws-lc-rust/third_party/NIST/SHAVS/SHA256ShortMsg.rsp rename to aws-lc-rs/third_party/NIST/SHAVS/SHA256ShortMsg.rsp diff --git a/aws-lc-rust/third_party/NIST/SHAVS/SHA384LongMsg.rsp b/aws-lc-rs/third_party/NIST/SHAVS/SHA384LongMsg.rsp similarity index 100% rename from aws-lc-rust/third_party/NIST/SHAVS/SHA384LongMsg.rsp rename to aws-lc-rs/third_party/NIST/SHAVS/SHA384LongMsg.rsp diff --git a/aws-lc-rust/third_party/NIST/SHAVS/SHA384Monte.rsp b/aws-lc-rs/third_party/NIST/SHAVS/SHA384Monte.rsp similarity index 100% rename from aws-lc-rust/third_party/NIST/SHAVS/SHA384Monte.rsp rename to aws-lc-rs/third_party/NIST/SHAVS/SHA384Monte.rsp diff --git a/aws-lc-rust/third_party/NIST/SHAVS/SHA384ShortMsg.rsp b/aws-lc-rs/third_party/NIST/SHAVS/SHA384ShortMsg.rsp similarity index 100% rename from aws-lc-rust/third_party/NIST/SHAVS/SHA384ShortMsg.rsp rename to aws-lc-rs/third_party/NIST/SHAVS/SHA384ShortMsg.rsp diff --git a/aws-lc-rust/third_party/NIST/SHAVS/SHA512LongMsg.rsp b/aws-lc-rs/third_party/NIST/SHAVS/SHA512LongMsg.rsp similarity index 100% rename from aws-lc-rust/third_party/NIST/SHAVS/SHA512LongMsg.rsp rename to aws-lc-rs/third_party/NIST/SHAVS/SHA512LongMsg.rsp diff --git a/aws-lc-rust/third_party/NIST/SHAVS/SHA512Monte.rsp b/aws-lc-rs/third_party/NIST/SHAVS/SHA512Monte.rsp similarity index 100% rename from aws-lc-rust/third_party/NIST/SHAVS/SHA512Monte.rsp rename to aws-lc-rs/third_party/NIST/SHAVS/SHA512Monte.rsp diff --git a/aws-lc-rust/third_party/NIST/SHAVS/SHA512ShortMsg.rsp b/aws-lc-rs/third_party/NIST/SHAVS/SHA512ShortMsg.rsp similarity index 100% rename from aws-lc-rust/third_party/NIST/SHAVS/SHA512ShortMsg.rsp rename to aws-lc-rs/third_party/NIST/SHAVS/SHA512ShortMsg.rsp diff --git a/aws-lc-rust/third_party/NIST/sha256sums.txt b/aws-lc-rs/third_party/NIST/sha256sums.txt similarity index 100% rename from aws-lc-rust/third_party/NIST/sha256sums.txt rename to aws-lc-rs/third_party/NIST/sha256sums.txt diff --git a/aws-lc-rust/util/process-criterion-csv.rs b/aws-lc-rs/util/process-criterion-csv.rs similarity index 100% rename from aws-lc-rust/util/process-criterion-csv.rs rename to aws-lc-rs/util/process-criterion-csv.rs diff --git a/scripts/publish/publish-aws-lc-rust.sh b/scripts/publish/publish-aws-lc-rust.sh index 73a7cda9d32..095166ce639 100755 --- a/scripts/publish/publish-aws-lc-rust.sh +++ b/scripts/publish/publish-aws-lc-rust.sh @@ -6,7 +6,7 @@ set -e SCRIPT_DIR=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd) PUBLISH=0 -RELATIVE_CRATE_PATH=aws-lc-rust +RELATIVE_CRATE_PATH=aws-lc-rs source "${SCRIPT_DIR}"/_publish_tools.sh