Skip to content

Commit

Permalink
Changed links from awslabs to aws and updated version number to 1.0.0 (
Browse files Browse the repository at this point in the history
  • Loading branch information
ttjsu-aws committed May 20, 2019
1 parent a9c677b commit 3d0afa9
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 26 deletions.
Expand Up @@ -13,16 +13,15 @@
* limitations under the License.
*/

#include <aws/cryptosdk/multi_keyring.h>
#include <aws/cryptosdk/materials.h>
#include <aws/cryptosdk/multi_keyring.h>
#include "proof_allocators.h"

// This is a memory safety proof for aws_cryptosdk_multi_keyring() defined in
// https://github.com/awslabs/aws-encryption-sdk-c/blob/master/source/multi_keyring.c
void harness()
{
struct aws_allocator* alloc = can_fail_allocator();
struct aws_cryptosdk_keyring generator;
aws_cryptosdk_keyring_base_init(&generator, NULL);
struct aws_cryptosdk_keyring *result = aws_cryptosdk_multi_keyring_new(alloc, &generator);
// This is a memory safety proof for aws_cryptosdk_multi_keyring() defined in
// https://github.com/aws/aws-encryption-sdk-c/blob/master/source/multi_keyring.c
void harness() {
struct aws_allocator *alloc = can_fail_allocator();
struct aws_cryptosdk_keyring generator;
aws_cryptosdk_keyring_base_init(&generator, NULL);
struct aws_cryptosdk_keyring *result = aws_cryptosdk_multi_keyring_new(alloc, &generator);
}
7 changes: 6 additions & 1 deletion CHANGELOG.rst
Expand Up @@ -23,4 +23,9 @@ Changelog
* Added API function to make caching CMM from keyring
* Added "_from_cmm" to end of "aws_cryptosdk_caching_cmm_new" function name
* Changed "aws_cryptosdk_session_get_algorithm" to "aws_cryptosdk_session_get_alg_id"
* Fixed HKDF bug
* Fixed HKDF bug

1.0.0 -- 2019-05-20
===================
* Changed links from awslabs to aws
* Initial stable release
4 changes: 2 additions & 2 deletions CMakeLists.txt
Expand Up @@ -49,8 +49,8 @@ include(FindOpenSSL)
set(PROJECT_NAME aws-encryption-sdk)

# Version number of the SDK to be consumed by C code and Doxygen
set(MAJOR 0)
set(MINOR 2)
set(MAJOR 1)
set(MINOR 0)
set(PATCH 0)

# Compiler feature tests and feature flags
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Expand Up @@ -11,7 +11,7 @@ information to effectively respond to your bug report or contribution.

We welcome you to use the GitHub issue tracker to report bugs or suggest features.

When filing an issue, please check [existing open](https://github.com/awslabs/aws-encryption-sdk-c/issues), or [recently closed](https://github.com/awslabs/aws-encryption-sdk-c/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
When filing an issue, please check [existing open](https://github.com/aws/aws-encryption-sdk-c/issues), or [recently closed](https://github.com/aws/aws-encryption-sdk-c/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:

* A reproducible test case or series of steps
Expand Down Expand Up @@ -47,7 +47,7 @@ Linux or other unix-linux platforms, as long as you have clang-format 6.0
installed.

## Finding contributions to work on
Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/awslabs/aws-encryption-sdk-c/labels/help%20wanted) issues is a great place to start.
Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/aws/aws-encryption-sdk-c/labels/help%20wanted) issues is a great place to start.


## Code of Conduct
Expand All @@ -58,6 +58,6 @@ opensource-codeofconduct@amazon.com with any additional questions or comments.

## Licensing

See the [LICENSE](https://github.com/awslabs/aws-encryption-sdk-c/blob/master/LICENSE) file for our project's licensing. We will ask you confirm the licensing of your contribution.
See the [LICENSE](https://github.com/aws/aws-encryption-sdk-c/blob/master/LICENSE) file for our project's licensing. We will ask you confirm the licensing of your contribution.

We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.
14 changes: 5 additions & 9 deletions README.md
Expand Up @@ -5,11 +5,7 @@ everyone to encrypt and decrypt data using industry standards and best practices
data format compatible with the AWS Encryption SDKs in other languages. For more information on
the AWS Encryption SDKs in all languages, see the [Developer Guide](https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/introduction.html).

Also, see the [API documentation](https://awslabs.github.io/aws-encryption-sdk-c/html/) for the AWS Encryption SDK for C.

**This library is currently under public preview**. Feel free to check out the code and give
it a spin, but be aware that the APIs are still in flux. We'd love to hear your feedback on
the APIs before they're fully nailed down.
Also, see the [API documentation](https://aws.github.io/aws-encryption-sdk-c/html/) for the AWS Encryption SDK for C.

## Dependencies

Expand Down Expand Up @@ -101,7 +97,7 @@ Now build and install aws-c-common:

#### Amazon Linux: Build and install the AWS Encryption SDK for C

git clone https://github.com/awslabs/aws-encryption-sdk-c.git
git clone https://github.com/aws/aws-encryption-sdk-c.git
mkdir build-aws-encryption-sdk-c && cd build-aws-encryption-sdk-c
cmake -DBUILD_SHARED_LIBS=ON ../aws-encryption-sdk-c
make && sudo make install ; cd ..
Expand Down Expand Up @@ -147,7 +143,7 @@ Now build and install aws-c-common:

#### Ubuntu: Build and install the AWS Encryption SDK for C

git clone https://github.com/awslabs/aws-encryption-sdk-c.git
git clone https://github.com/aws/aws-encryption-sdk-c.git
mkdir build-aws-encryption-sdk-c && cd build-aws-encryption-sdk-c
cmake -DBUILD_SHARED_LIBS=ON ../aws-encryption-sdk-c
make && sudo make install ; cd ..
Expand Down Expand Up @@ -196,7 +192,7 @@ Build and install aws-c-common:
Brew installed OpenSSL 1.1 to a place that is not picked up by default so we will
set the directory manually in our build.

git clone https://github.com/awslabs/aws-encryption-sdk-c.git
git clone https://github.com/aws/aws-encryption-sdk-c.git
mkdir build-aws-encryption-sdk-c && cd build-aws-encryption-sdk-c
cmake -DBUILD_SHARED_LIBS=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl\@1.1 ../aws-encryption-sdk-c
make && sudo make install ; cd ..
Expand Down Expand Up @@ -243,7 +239,7 @@ Build and install aws-c-common:

#### Windows: Build and install the AWS Encryption SDK for C

git clone https://github.com/awslabs/aws-encryption-sdk-c.git
git clone https://github.com/aws/aws-encryption-sdk-c.git
mkdir build-aws-encryption-sdk-c && cd build-aws-encryption-sdk-c
cmake -DCMAKE_INSTALL_PREFIX=%cd%\..\..\install -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DCMAKE_TOOLCHAIN_FILE=%cd%\..\vcpkg\scripts\buildsystems\vcpkg.cmake -G Ninja ..\aws-encryption-sdk-c
cmake --build . && cmake --build . --target install && cd ..
Expand Down
2 changes: 1 addition & 1 deletion codebuild/bin/install-aws-deps.sh
Expand Up @@ -62,6 +62,6 @@ for libtype in shared static; do
root=/deps/$libtype

# not installing aws-c-common anymore because aws-sdk-cpp installs it for us
build_pkg $root/install https://github.com/awslabs/aws-sdk-cpp.git 1.7.36 $CMAKE_ARGS -DBUILD_ONLY=kms -DENABLE_UNITY_BUILD=ON
build_pkg $root/install https://github.com/aws/aws-sdk-cpp.git 1.7.36 $CMAKE_ARGS -DBUILD_ONLY=kms -DENABLE_UNITY_BUILD=ON
done

2 changes: 1 addition & 1 deletion include/aws/cryptosdk/version.h.in
Expand Up @@ -25,7 +25,7 @@
* <a href="https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/introduction.html">Developer Guide</a>.
*
* Source code and installation instructions are available in
* <a href="https://github.com/awslabs/aws-encryption-sdk-c">the GitHub repository</a>.
* <a href="https://github.com/aws/aws-encryption-sdk-c">the GitHub repository</a>.
*
* This API documentation was generated from the v@MAJOR@.@MINOR@.@PATCH@ source code.
*
Expand Down

0 comments on commit 3d0afa9

Please sign in to comment.