Skip to content

Commit

Permalink
migrate over to aws organization (aws#809)
Browse files Browse the repository at this point in the history
  • Loading branch information
samuel40791765 authored Feb 15, 2023
1 parent fb42ac6 commit c2d1886
Show file tree
Hide file tree
Showing 24 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/build-issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ assignees: ''

### Problem:

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)).
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/aws/aws-lc/blame/e7413d237bb60bf639e78aa43ff3c1b1783f0712/tests/ci/docker_images/linux-x86/ubuntu-20.04_base/Dockerfile)).

#### Relevant details
AWS-LC commit: (6b1bce0...)
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ ninja-build run_tests && ninja-build install
cd ../aws-lc-install/
ls *
```
See [Building.md](https://github.com/awslabs/aws-lc/blob/main/BUILDING.md) for more
See [Building.md](https://github.com/aws/aws-lc/blob/main/BUILDING.md) for more
information about required dependencies and build options. If you’re interested in
getting involved open an Issue to discuss your plan or talk to us on Gitter.
[Contributing.md](https://github.com/awslabs/aws-lc/blob/main/CONTRIBUTING.md) has
[Contributing.md](https://github.com/aws/aws-lc/blob/main/CONTRIBUTING.md) has
info for how to specifically make the change and get it reviewed by AWS-LC maintainers.
If you just want to use AWS-LC see our existing documentation in the public header
files, if you’re moving your application from OpenSSL see
[Porting_to_AWS-LC.md](https://github.com/awslabs/aws-lc/blob/main/PORTING_TO_AWSLC.md)
[Porting_to_AWS-LC.md](https://github.com/aws/aws-lc/blob/main/PORTING_TO_AWSLC.md)
for more information.

## Why AWS-LC?
Expand All @@ -58,7 +58,7 @@ understanding your use case in an Issue or on Gitter.

AWS-LC correctness is tested on a variety of C/C++ compiler, OS, and CPU
combinations. For a complete list of tested combinations see
[tests/ci/Readme.md](https://github.com/awslabs/aws-lc/blob/main/tests/ci/README.md).
[tests/ci/Readme.md](https://github.com/aws/aws-lc/blob/main/tests/ci/README.md).
If you use a different combination and would like to make sure we test it,
please open an issue to discuss adding it to our CI.

Expand All @@ -81,7 +81,7 @@ adding it to our CI.
### Automated testing

Every change is tested with our
[CI](https://github.com/awslabs/aws-lc/blob/main/tests/ci/README.md) that includes
[CI](https://github.com/aws/aws-lc/blob/main/tests/ci/README.md) that includes
positive and negative unit tests, fuzz tests, Sanitizers
([Address](https://clang.llvm.org/docs/AddressSanitizer.html),
[Memory](https://clang.llvm.org/docs/MemorySanitizer.html),
Expand Down
4 changes: 2 additions & 2 deletions bindings/rust/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ In order to generate the `aws-lc-sys` crate, you need to have the following inst
* Rust - installable with [rustup](https://rustup.rs/)
* libclang
* docker
* C compilation tools to build AWS-LC. We pull in [generated-src](https://github.com/awslabs/aws-lc/tree/main/generated-src) into `aws-lc-sys`, so Go and Perl aren't needed (for non-FIPS).
* C compilation tools to build AWS-LC. We pull in [generated-src](https://github.com/aws/aws-lc/tree/main/generated-src) into `aws-lc-sys`, so Go and Perl aren't needed (for non-FIPS).
* CMake3 or above. [`cmake-rs`](https://docs.rs/cmake/latest/cmake/) appends build options after the path, which isn't supported in older versions of cmake.

### To Use
Expand All @@ -25,7 +25,7 @@ be [built](../../tests/ci/docker_images/rust/build_images.sh) and available loca
./bindings/rust/generate/generate.sh
```

See AWS-LC build documentation for more details: https://github.com/awslabs/aws-lc/blob/main/BUILDING.md
See AWS-LC build documentation for more details: https://github.com/aws/aws-lc/blob/main/BUILDING.md

### Publishing
The `aws-lc-sys` crate should be fully generated and tested by running the [generate.sh](./generate/generate.sh) script, prior to publishing.
Expand Down
2 changes: 1 addition & 1 deletion bindings/rust/aws-lc-fips-sys-template/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description = "AWS-LC is a general-purpose cryptographic library maintained by t
version = "__AWS_LC_FIPS_SYS_VERSION__"
authors = ["AWS-LC"]
edition = "2021"
repository = "https://github.com/awslabs/aws-lc"
repository = "https://github.com/aws/aws-lc"
license = "Apache-2.0 OR ISC"
rust-version = "1.57.0"
include = [
Expand Down
12 changes: 6 additions & 6 deletions bindings/rust/aws-lc-fips-sys-template/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

**Autogenerated** low-level AWS-LC FIPS bindings for the Rust programming language. We do not recommend directly relying on these bindings.

[Documentation](https://github.com/awslabs/aws-lc).
[Documentation](https://github.com/aws/aws-lc).

## Release Support

Expand All @@ -20,20 +20,20 @@ arm-64|Linux

### Tested AWS-LC FIPS Build Environments

`aws-lc-fips-sys` currently relies on the AWS-LC FIPS static build, please see our CI documentation at [AWS-LC](https://github.com/awslabs/aws-lc/tree/main/tests/ci#unit-tests).
`aws-lc-fips-sys` currently relies on the AWS-LC FIPS static build, please see our CI documentation at [AWS-LC](https://github.com/aws/aws-lc/tree/main/tests/ci#unit-tests).

## Build Prerequisites

Since this crate builds AWS-LC as a native library, all build tools needed to build AWS-LC are applicable to `aws-lc-fips-sys` as well. This includes Go and Perl, which are hard dependencies for the AWS-LC FIPS build.

[Building AWS-LC](https://github.com/awslabs/aws-lc/blob/main/BUILDING.md)
[Building AWS-LC](https://github.com/aws/aws-lc/blob/main/BUILDING.md)

If you use a different build combination for FIPS and would like us to support it, please open an issue to us at [AWS-LC](https://github.com/awslabs/aws-lc/issues/new?assignees=&labels=&template=build-issue.md&title=).
If you use a different build combination for FIPS and would like us to support it, please open an issue to us at [AWS-LC](https://github.com/aws/aws-lc/issues/new?assignees=&labels=&template=build-issue.md&title=).

## Contribution

See contributing file at [AWS-LC](https://github.com/awslabs/aws-lc/blob/main/CONTRIBUTING.md)
See contributing file at [AWS-LC](https://github.com/aws/aws-lc/blob/main/CONTRIBUTING.md)

## Licensing

See license at [AWS-LC](https://github.com/awslabs/aws-lc/blob/main/LICENSE)
See license at [AWS-LC](https://github.com/aws/aws-lc/blob/main/LICENSE)
2 changes: 1 addition & 1 deletion bindings/rust/aws-lc-sys-template/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description = "AWS-LC is a general-purpose cryptographic library maintained by t
version = "__AWS_LC_SYS_VERSION__"
authors = ["AWS-LC"]
edition = "2021"
repository = "https://github.com/awslabs/aws-lc"
repository = "https://github.com/aws/aws-lc"
license = "Apache-2.0 OR ISC"
rust-version = "1.57.0"
include = [
Expand Down
10 changes: 5 additions & 5 deletions bindings/rust/aws-lc-sys-template/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

**Autogenerated** Low-level AWS-LC bindings for the Rust programming language. We do not recommend directly relying on these bindings.

[Documentation](https://github.com/awslabs/aws-lc).
[Documentation](https://github.com/aws/aws-lc).

## Release Support

Expand All @@ -23,18 +23,18 @@ x86-64|MacOS

Since this crate builds AWS-LC as a native library, most build tools needed to build AWS-LC are applicable to `aws-lc-sys` as well. Go and Perl aren't absolutely necessary for `aws-lc-sys`, as AWS-LC provides generated build files.

[Building AWS-LC](https://github.com/awslabs/aws-lc/blob/main/BUILDING.md)
[Building AWS-LC](https://github.com/aws/aws-lc/blob/main/BUILDING.md)

AWS-LC is tested on a variety of C/C++ compiler, OS, and CPU combinations. For a complete list of tested combinations see [tests/ci/Readme.md](https://github.com/awslabs/aws-lc/tree/main/tests/ci#unit-tests). If you use a different build combination and would like us to support it, please open an issue to us at [AWS-LC](https://github.com/awslabs/aws-lc/issues/new?assignees=&labels=&template=build-issue.md&title=).
AWS-LC is tested on a variety of C/C++ compiler, OS, and CPU combinations. For a complete list of tested combinations see [tests/ci/Readme.md](https://github.com/aws/aws-lc/tree/main/tests/ci#unit-tests). If you use a different build combination and would like us to support it, please open an issue to us at [AWS-LC](https://github.com/aws/aws-lc/issues/new?assignees=&labels=&template=build-issue.md&title=).

## Building with a FIPS-validated module

This crate does not offer the AWS-LC FIPS build. To use AWS-LC FIPS, please use the FIPS version of this crate, available at [aws-lc-fips-sys](https://crates.io/crates/aws-lc-fips-sys).

## Contribution

See contributing file at [AWS-LC](https://github.com/awslabs/aws-lc/blob/main/CONTRIBUTING.md)
See contributing file at [AWS-LC](https://github.com/aws/aws-lc/blob/main/CONTRIBUTING.md)

## Licensing

See license at [AWS-LC](https://github.com/awslabs/aws-lc/blob/main/LICENSE)
See license at [AWS-LC](https://github.com/aws/aws-lc/blob/main/LICENSE)
2 changes: 1 addition & 1 deletion bindings/rust/generate/generate-fips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ source "${SCRIPT_DIR}"/_generation_tools.sh
# Clone the FIPS branch in local.
function clone_fips_branch {
pushd "${TMP_DIR}"
git clone -b ${AWS_LC_FIPS_BRANCH} --depth 1 --single-branch https://github.com/awslabs/aws-lc.git
git clone -b ${AWS_LC_FIPS_BRANCH} --depth 1 --single-branch https://github.com/aws/aws-lc.git
popd
}

Expand Down
2 changes: 1 addition & 1 deletion bindings/rust/generate/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ source "${SCRIPT_DIR}"/_generation_tools.sh
# Clone the main branch in local.
function clone_main_branch {
pushd "${TMP_DIR}"
git clone -b main --depth 1 --single-branch https://github.com/awslabs/aws-lc.git
git clone -b main --depth 1 --single-branch https://github.com/aws/aws-lc.git
popd
}

Expand Down
2 changes: 1 addition & 1 deletion crypto/kyber/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ The following changes were made to the source code in `pqcrystals_kyber_ref_comm
* `kem.c`: calls to `randombytes` function is replaced with calls to `pq_custom_randombytes` and the appropriate header file is included (`crypto/rand_extra/pq_custom_randombytes.h`).
* `verify.c`: change to fix MSVC compiler warning (see the file for details).
* `symmetric-shake.c`: unnecessary include of `fips202.h` is removed.
* `api.h`, `fips202.h`, `params.h`: modified [in this PR](https://github.com/awslabs/aws-lc/pull/655) to support our [prefixed symbols build](https://github.com/awslabs/aws-lc/blob/main/BUILDING.md#building-with-prefixed-symbols).
* `api.h`, `fips202.h`, `params.h`: modified [in this PR](https://github.com/aws/aws-lc/pull/655) to support our [prefixed symbols build](https://github.com/aws/aws-lc/blob/main/BUILDING.md#building-with-prefixed-symbols).

**Usage.** The KEM API is defined and documented in `include/openssl/evp.h`. To see examples of how to use any KEM, including Kyber, see `crypto/kem/README.md`.
2 changes: 1 addition & 1 deletion crypto/x509v3/v3_utl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1265,7 +1265,7 @@ static int ipv6_from_asc(unsigned char v6[16], const char *in) {

// Zero middle
// This condition is to suppress gcc-12 warning.
// https://github.com/awslabs/aws-lc/issues/487
// https://github.com/aws/aws-lc/issues/487
if (v6stat.zero_pos >= v6stat.total) {
// This should not happen.
return 0;
Expand Down
2 changes: 1 addition & 1 deletion docs/Coverage.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Coverage Report
```shell script
git clone [email protected]:awslabs/aws-lc.git
git clone [email protected]:aws/aws-lc.git
mkdir build
cd build
cmake -GNinja -DGCOV=1 ../aws-lc
Expand Down
2 changes: 1 addition & 1 deletion include/openssl/base.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ extern "C" {
#define AWSLC_API_VERSION 20

// This string tracks the most current production release version on Github
// https://github.com/awslabs/aws-lc/releases.
// https://github.com/aws/aws-lc/releases.
// When bumping the encoded version number, also update the test fixture:
// ServiceIndicatorTest.AWSLCVersionString
// Note: there are two versions of this test. Only one test is compiled
Expand Down
2 changes: 1 addition & 1 deletion include/openssl/mem.h
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ OPENSSL_EXPORT void OPENSSL_clear_free(void *ptr, size_t len);
// |OPENSSL_malloc/free/realloc| can be customized by implementing |OPENSSL_memory_alloc/free/realloc| or calling
// CRYPTO_set_mem_functions. If |OPENSSL_memory_alloc/free/realloc| is defined CRYPTO_set_mem_functions will fail.
// All of the warnings for |OPENSSL_malloc/free/realloc| apply to CRYPTO_set_mem_functions:
// -- https://github.com/awslabs/aws-lc/blame/d164f5762b1ad5d4f2d1561fb85daa556fdff5ef/crypto/mem.c#L111-L127
// -- https://github.com/aws/aws-lc/blame/d164f5762b1ad5d4f2d1561fb85daa556fdff5ef/crypto/mem.c#L111-L127
// This function is only recommended for debug purpose(e.g. track mem usage).
// AWS-LC differs from OpenSSL's CRYPTO_set_mem_functions in that __FILE__ and __LINE__ are not supplied.
//
Expand Down
2 changes: 1 addition & 1 deletion tests/ci/build_run_benchmarks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ AWSLC_PROD_ROOT=$(pwd)/aws-lc-prod
source ${AWSLC_PR_ROOT}/tests/ci/common_posix_setup.sh

# clone the various repositories we need (we already have aws-lc-pr since we need it to run this script)
git clone https://github.com/awslabs/aws-lc.git aws-lc-prod
git clone https://github.com/aws/aws-lc.git aws-lc-prod

# build AWSLC pr
mkdir -p "${PR_FOLDER_NAME}"/build
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ batch:
image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-aarch:amazonlinux-2_clang-7x_latest
variables:
# AL2 Clang-7 does not support AddressSanitizer. Related ticket is linked in CryptoAlg-694.
# https://github.com/awslabs/aws-lc/pull/120#issuecomment-808439279
# https://github.com/aws/aws-lc/pull/120#issuecomment-808439279
AWSLC_NO_ASM_FIPS: 0

- identifier: amazonlinux2_gcc7x_aarch_fips
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ batch:
image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:amazonlinux-2_clang-7x_latest
variables:
# AL2 Clang-7 does not support AddressSanitizer. Related ticket is linked in CryptoAlg-694.
# https://github.com/awslabs/aws-lc/pull/120#issuecomment-808439279
# https://github.com/aws/aws-lc/pull/120#issuecomment-808439279
AWSLC_NO_ASM_FIPS: 0

- identifier: amazonlinux2_gcc7x_intel_sde_x86_64
Expand Down
8 changes: 4 additions & 4 deletions tests/ci/cdk/run-cdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ Options:
--help Displays this help
--aws-account AWS account for CDK deploy/destroy. Default to '620771051181'.
--aws-region AWS region for AWS resources creation. Default to 'us-west-2'.
--github-repo-owner GitHub repository owner. Default to 'awslabs'.
--github-repo-owner GitHub repository owner. Default to 'aws'.
--github-source-version GitHub source version. Default to 'main'.
--action Required. The value can be
'deploy-ci': deploys aws-lc ci. This includes AWS and Docker image resources creation.
Expand All @@ -289,7 +289,7 @@ function export_global_variables() {
export AWS_DEFAULT_REGION="${CDK_DEPLOY_REGION}"
fi
if [[ -z "${GITHUB_REPO_OWNER+x}" || -z "${GITHUB_REPO_OWNER}" ]]; then
export GITHUB_REPO_OWNER='awslabs'
export GITHUB_REPO_OWNER='aws'
fi
if [[ -z "${GITHUB_SOURCE_VERSION+x}" || -z "${GITHUB_SOURCE_VERSION}" ]]; then
export GITHUB_SOURCE_VERSION='main'
Expand All @@ -307,8 +307,8 @@ function export_global_variables() {
export WIN_DOCKER_BUILD_SSM_DOCUMENT="windows-ssm-document-${DATE_NOW}"
export IMG_BUILD_STATUS='unknown'
# 620771051181 is AWS-LC team AWS account.
if [[ "${CDK_DEPLOY_ACCOUNT}" != "620771051181" ]] && [[ "${GITHUB_REPO_OWNER}" == 'awslabs' ]]; then
echo "Only team account is allowed to create CI stacks on awslabs repo."
if [[ "${CDK_DEPLOY_ACCOUNT}" != "620771051181" ]] && [[ "${GITHUB_REPO_OWNER}" == 'aws' ]]; then
echo "Only team account is allowed to create CI stacks on aws repo."
exit 1
fi
}
Expand Down
2 changes: 1 addition & 1 deletion tests/ci/cdk/util/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
WINDOWS_X86_ECR_REPO = EnvUtil.get("ECR_WINDOWS_X86_REPO_NAME", "aws-lc-docker-images-windows-x86")

# Used when AWS CodeBuild needs to create web_hooks.
GITHUB_REPO_OWNER = EnvUtil.get("GITHUB_REPO_OWNER", "awslabs")
GITHUB_REPO_OWNER = EnvUtil.get("GITHUB_REPO_OWNER", "aws")
GITHUB_REPO_NAME = EnvUtil.get("GITHUB_REPO_NAME", "aws-lc")
GITHUB_SOURCE_VERSION = EnvUtil.get("GITHUB_SOURCE_VERSION", "main")

Expand Down
2 changes: 1 addition & 1 deletion tests/ci/common_posix_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ function fips_build_and_test {
# Upon completion of the build process. The module’s status can be verified by 'tool/bssl isfips'.
# https://csrc.nist.gov/CSRC/media/projects/cryptographic-module-validation-program/documents/security-policies/140sp3678.pdf
# FIPS mode is enabled when 'defined(BORINGSSL_FIPS) && !defined(OPENSSL_ASAN)'.
# https://github.com/awslabs/aws-lc/blob/220e266d4e415cf0101388b89a2bd855e0e4e203/crypto/fipsmodule/is_fips.c#L22
# https://github.com/aws/aws-lc/blob/220e266d4e415cf0101388b89a2bd855e0e4e203/crypto/fipsmodule/is_fips.c#L22
expect_fips_mode=1
for build_flag in "$@"
do
Expand Down
2 changes: 1 addition & 1 deletion tests/ci/docker_images/windows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ You can test the images by running `docker run -it vs2015` or `docker run -it
vs2017`. To emulate a CodeBuild run locally execute the following inside one of
the docker images :
```
$ git clone https://github.com/awslabs/aws-lc.git -b main --depth 1
$ git clone https://github.com/aws/aws-lc.git -b main --depth 1
$ cd aws-lc
# Depending on the docker image run:
$ .\tests\ci\run_windows_tests.bat "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
Expand Down
4 changes: 2 additions & 2 deletions tests/ci/run_posix_sanitizers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ build_and_test -DUBSAN=1 "${cflags[@]}"
unset UBSAN_OPTIONS

if [ $(uname -p) == "aarch64" ]; then
# ARM MSAN runs get stuck on PoolTest.Threads for over an hour https://github.com/awslabs/aws-lc/issues/13
# ARM MSAN runs get stuck on PoolTest.Threads for over an hour https://github.com/aws/aws-lc/issues/13
echo "Building AWS-LC in ${build_type} mode with memory sanitizer."
run_build -DMSAN=1 -DUSE_CUSTOM_LIBCXX=1 "${cflags[@]}"
else
Expand All @@ -40,7 +40,7 @@ else
fi

if [ $(uname -p) == "x86_64" ]; then
# x86 TSAN runs get stuck on PoolTest.Threads for over an hour https://github.com/awslabs/aws-lc/issues/13
# x86 TSAN runs get stuck on PoolTest.Threads for over an hour https://github.com/aws/aws-lc/issues/13
echo "Building AWS-LC in ${build_type} mode with thread sanitizer."
run_build -DTSAN=1 -DUSE_CUSTOM_LIBCXX=1 "${cflags[@]}"
else
Expand Down
2 changes: 1 addition & 1 deletion util/asm_dev/armv8/p256/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SPDX-License-Identifier: Apache-2.0 OR ISC

#P256 Armv8 Assembly Functions
This application was used to develop the assembly functions committed to
[awsls:p256-armv8](https://github.com/awslabs/aws-lc/tree/p256-armv8)
[awsls:p256-armv8](https://github.com/aws/aws-lc/tree/p256-armv8)

The goal is bringing the P-256 performance on ARMv8 at par with x86_64.
The ARMv8 assembly code is taken from OpenSSL 1.1.1 (at [this commit](openssl/openssl@46a9ee8)).
Expand Down
2 changes: 1 addition & 1 deletion util/benchmark/ec/p256_awslc_ossl/benchmark-build-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ then
## checkout AWS-LC if it doesn't exist already
# echo "Checkout AWS-LC main tip" && \
# cd .. && \
# git clone https://github.com/awslabs/aws-lc.git && \
# git clone https://github.com/aws/aws-lc.git && \
# cd ${BENCH_DIR}
fi

Expand Down

0 comments on commit c2d1886

Please sign in to comment.