From 6568f294c6c1675648d7bd3e63b442112fb0626d Mon Sep 17 00:00:00 2001
From: Doug Chapman <dougch@amazon.com>
Date: Fri, 27 Sep 2019 17:12:38 -0700
Subject: [PATCH 01/11] Release v1.0.1

---
 CHANGELOG.rst    | 54 +++++++++++++++++++--------
 CMakeLists.txt   |  2 +-
 codebuild/osx.sh | 97 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 136 insertions(+), 17 deletions(-)
 create mode 100755 codebuild/osx.sh

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 86b30f7f8..0cf6fd8e1 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,14 +2,40 @@
 Changelog
 *********
 
-0.1.0 -- 2019-02-05
-===================
-* Initial public release
+1.0.1 -- 2019-09-27
+=================== 
+* Merge pull request #376 from lucasmt/dependency-graph
+* Modified Doxygen config file to generate dependency graphs
+* Merge pull request #426 from danielsn/reformat ran reformat
+* Merge pull request #433 from nchong-at-aws/strengthen-atomic-refcount-down 
+  Strengthen memory_order for refcount_down
+* Merge pull request #391 from johnwalker/prtemplate Update PR template
+* Merge pull request #430 from dougch/clang_format_322 Issue #322; Refreshing the clang-format file and checking the version
+* Fix MultiKeyringNew proof so it runs again. (#444)
+* Windows build fixes (#446)
+** Changed aws-sdk-cpp version from 1.7.36 to 1.7.163
+** Fix for error C2259: anonymous-namespace::BufferedLogSystem cannot instantiate abstract class for windows builds
+** Modified Flush() function
+** Version bump of dep: aws-sdk-cpp
+** Don't add empty strings to library path
+** Pull in change from PR #386
+** Fixed calling EVP_EncryptUpdate and EVP_DecryptUpdate when AAD is NULL
+** Removed test size 0 and added test size 5 to fix failure case
+** Fix typo: aad
+** Pulling in changes from PR#446
 
-0.1.1 -- 2019-02-21
+1.0.0 -- 2019-05-20
+=================== 
+* Changed links from awslabs to aws 
+* Initial stable release 
+
+0.2.0 -- 2019-05-13
 ===================
-* Fixed cmake bug regarding git version of KMS user agent
-* Added CBMC header file needed by newer aws-c-common versions
+* Added API function to make session from keyring
+* 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
 
 0.1.2 -- 2019-02-28
 ===================
@@ -17,15 +43,11 @@ Changelog
 * Local tests only by default
 * Fix of MAP_ANONYMOUS issue for older Linuxes
 
-0.2.0 -- 2019-05-13
+0.1.1 -- 2019-02-21
 ===================
-* Added API function to make session from keyring
-* 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 cmake bug regarding git version of KMS user agent
+* Added CBMC header file needed by newer aws-c-common versions
 
-1.0.0 -- 2019-05-20
-=================== 
-* Changed links from awslabs to aws 
-* Initial stable release 
\ No newline at end of file
+0.1.0 -- 2019-02-05
+===================
+* Initial public release
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7481f90b6..d6f95da34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,7 @@ set(PROJECT_NAME aws-encryption-sdk)
 # Version number of the SDK to be consumed by C code and Doxygen
 set(MAJOR 1)
 set(MINOR 0)
-set(PATCH 0)
+set(PATCH 1)
 
 # Compiler feature tests and feature flags
 set(USE_ASM TRUE
diff --git a/codebuild/osx.sh b/codebuild/osx.sh
new file mode 100755
index 000000000..b05dab809
--- /dev/null
+++ b/codebuild/osx.sh
@@ -0,0 +1,97 @@
+#!/bin/bash
+# OSX build script placeholder.
+
+set -ex
+
+OS=$(uname -s)
+CPP_VER="1.7.163"  #github versioned branch
+BUILDROOT="/var/tmp/build-$(date +%s)"
+BUILDLOG="${BUILDROOT}/build.log"
+#OPENSSLVER="openssl@1.1" #note this is a brew label, not an exact version reference
+OPENSSLVER="openssl"
+#BUILDROOT="/var/tmp/build-$(date +%s)"
+BUILDROOT="/var/tmp/build-1569628622"
+CSDK_VER="master" 
+
+deps(){
+  if [ $(which brew|grep -c 'brew') -lt 1 ]; then
+    echo "Can't find brew, required to build"
+    exit 1
+  fi
+  #brew install openssl@1.1 cmake || true
+  mkdir $BUILDROOT || true
+  mkdir $INSTALLROOT || true
+}
+
+build_cpp(){
+    echo "Building cpp"
+    cd $BUILDROOT
+    git clone -b $CPP_VER https://github.com/aws/aws-sdk-cpp.git
+    mkdir -p $BUILDROOT/build-aws-sdk-cpp ||true
+    mkdir -p $BUILDROOT/install || true 
+    cd $BUILDROOT/build-aws-sdk-cpp
+    cmake -DBUILD_SHARED_LIBS=ON -DBUILD_ONLY="kms" -DENABLE_UNITY_BUILD=ON ../aws-sdk-cpp | tee -a ${BUILDLOG}
+    make | tee -a ${BUILDLOG}
+    make install | tee -a ${BUILDLOG}
+}
+
+build_csdk(){
+    echo "Building csdk"
+    cd $BUILDROOT
+    git clone -b ${CSDK_VER} https://github.com/aws/aws-encryption-sdk-c.git | tee -a ${BUILDLOG}
+    mkdir -p $BUILDROOT/build-csdk || true
+    cd $BUILDROOT/build-csdk
+    cmake  -DBUILD_SHARED_LIBS=ON -DBUILD_DOC="ON" -DOPENSSL_ROOT_DIR="/usr/local/opt/${OPENSSLVER}" ../aws-encryption-sdk-c |tee -a ${BUILDLOG}
+#    make |tee -a ${BUILDLOG}
+#    make install |tee -a ${BUILDLOG}
+#    make test '\-\-verbose' |tee -a ${BUILDLOG}
+
+}
+
+clean(){
+for i in /usr/local/include/aws/cryptosdk/cache.h \
+    /usr/local/include/aws/cryptosdk/cipher.h \
+    /usr/local/include/aws/cryptosdk/default_cmm.h \
+    /usr/local/include/aws/cryptosdk/edk.h \
+    /usr/local/include/aws/cryptosdk/enc_ctx.h \
+    /usr/local/include/aws/cryptosdk/error.h \
+    /usr/local/include/aws/cryptosdk/exports.h \
+    /usr/local/include/aws/cryptosdk/header.h \
+    /usr/local/include/aws/cryptosdk/keyring_trace.h \
+    /usr/local/include/aws/cryptosdk/list_utils.h \
+    /usr/local/include/aws/cryptosdk/materials.h \
+    /usr/local/include/aws/cryptosdk/multi_keyring.h \
+    /usr/local/include/aws/cryptosdk/raw_aes_keyring.h \
+    /usr/local/include/aws/cryptosdk/raw_rsa_keyring.h \
+    /usr/local/include/aws/cryptosdk/session.h \
+    /usr/local/include/aws/cryptosdk/vtable.h \
+    /usr/local/include/aws/cryptosdk/version.h \
+    /usr/local/lib/libaws-encryption-sdk.dylib \
+    /usr/local/lib/aws-encryption-sdk/cmake/aws-encryption-sdk-targets.cmake \
+    /usr/local/lib/aws-encryption-sdk/cmake/aws-encryption-sdk-targets-noconfig.cmake \
+    /usr/local/lib/aws-encryption-sdk/cmake/aws-encryption-sdk-config.cmake \
+    /usr/local/include/aws/cryptosdk/cpp/exports.h \
+    /usr/local/include/aws/cryptosdk/cpp/kms_keyring.h \
+    /usr/local/lib/libaws-encryption-sdk-cpp.dylib \
+    /usr/local/lib/aws-encryption-sdk-cpp/cmake/aws-encryption-sdk-cpp-targets.cmake \
+    /usr/local/lib/aws-encryption-sdk-cpp/cmake/aws-encryption-sdk-cpp-targets-noconfig.cmake \
+    /usr/local/lib/aws-encryption-sdk-cpp/cmake/aws-encryption-sdk-cpp-config.cmake; do
+    rm -f ${i};
+done
+}
+
+if [ "$OS" == 'Darwin' ]; then
+  if [ "$#" -eq 0 ]; then
+   # deps
+   # build_cpp
+    build_csdk
+  else
+    case $1 in
+      "clean") 
+        clean;;
+      *)
+        echo "What now?  look at the script to find the exact func to call..."
+      ;;
+    esac
+   fi
+fi

From 35c4505d491935339968f3fdabc0409f49f5559b Mon Sep 17 00:00:00 2001
From: Doug Chapman <dougch@amazon.com>
Date: Fri, 27 Sep 2019 17:19:58 -0700
Subject: [PATCH 02/11] Remove osx file pulled in by accident

---
 codebuild/osx.sh | 97 ------------------------------------------------
 1 file changed, 97 deletions(-)
 delete mode 100755 codebuild/osx.sh

diff --git a/codebuild/osx.sh b/codebuild/osx.sh
deleted file mode 100755
index b05dab809..000000000
--- a/codebuild/osx.sh
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/bash
-# OSX build script placeholder.
-
-set -ex
-
-OS=$(uname -s)
-CPP_VER="1.7.163"  #github versioned branch
-BUILDROOT="/var/tmp/build-$(date +%s)"
-BUILDLOG="${BUILDROOT}/build.log"
-#OPENSSLVER="openssl@1.1" #note this is a brew label, not an exact version reference
-OPENSSLVER="openssl"
-#BUILDROOT="/var/tmp/build-$(date +%s)"
-BUILDROOT="/var/tmp/build-1569628622"
-CSDK_VER="master" 
-
-deps(){
-  if [ $(which brew|grep -c 'brew') -lt 1 ]; then
-    echo "Can't find brew, required to build"
-    exit 1
-  fi
-  #brew install openssl@1.1 cmake || true
-  mkdir $BUILDROOT || true
-  mkdir $INSTALLROOT || true
-}
-
-build_cpp(){
-    echo "Building cpp"
-    cd $BUILDROOT
-    git clone -b $CPP_VER https://github.com/aws/aws-sdk-cpp.git
-    mkdir -p $BUILDROOT/build-aws-sdk-cpp ||true
-    mkdir -p $BUILDROOT/install || true 
-    cd $BUILDROOT/build-aws-sdk-cpp
-    cmake -DBUILD_SHARED_LIBS=ON -DBUILD_ONLY="kms" -DENABLE_UNITY_BUILD=ON ../aws-sdk-cpp | tee -a ${BUILDLOG}
-    make | tee -a ${BUILDLOG}
-    make install | tee -a ${BUILDLOG}
-}
-
-build_csdk(){
-    echo "Building csdk"
-    cd $BUILDROOT
-    git clone -b ${CSDK_VER} https://github.com/aws/aws-encryption-sdk-c.git | tee -a ${BUILDLOG}
-    mkdir -p $BUILDROOT/build-csdk || true
-    cd $BUILDROOT/build-csdk
-    cmake  -DBUILD_SHARED_LIBS=ON -DBUILD_DOC="ON" -DOPENSSL_ROOT_DIR="/usr/local/opt/${OPENSSLVER}" ../aws-encryption-sdk-c |tee -a ${BUILDLOG}
-#    make |tee -a ${BUILDLOG}
-#    make install |tee -a ${BUILDLOG}
-#    make test '\-\-verbose' |tee -a ${BUILDLOG}
-
-}
-
-clean(){
-for i in /usr/local/include/aws/cryptosdk/cache.h \
-    /usr/local/include/aws/cryptosdk/cipher.h \
-    /usr/local/include/aws/cryptosdk/default_cmm.h \
-    /usr/local/include/aws/cryptosdk/edk.h \
-    /usr/local/include/aws/cryptosdk/enc_ctx.h \
-    /usr/local/include/aws/cryptosdk/error.h \
-    /usr/local/include/aws/cryptosdk/exports.h \
-    /usr/local/include/aws/cryptosdk/header.h \
-    /usr/local/include/aws/cryptosdk/keyring_trace.h \
-    /usr/local/include/aws/cryptosdk/list_utils.h \
-    /usr/local/include/aws/cryptosdk/materials.h \
-    /usr/local/include/aws/cryptosdk/multi_keyring.h \
-    /usr/local/include/aws/cryptosdk/raw_aes_keyring.h \
-    /usr/local/include/aws/cryptosdk/raw_rsa_keyring.h \
-    /usr/local/include/aws/cryptosdk/session.h \
-    /usr/local/include/aws/cryptosdk/vtable.h \
-    /usr/local/include/aws/cryptosdk/version.h \
-    /usr/local/lib/libaws-encryption-sdk.dylib \
-    /usr/local/lib/aws-encryption-sdk/cmake/aws-encryption-sdk-targets.cmake \
-    /usr/local/lib/aws-encryption-sdk/cmake/aws-encryption-sdk-targets-noconfig.cmake \
-    /usr/local/lib/aws-encryption-sdk/cmake/aws-encryption-sdk-config.cmake \
-    /usr/local/include/aws/cryptosdk/cpp/exports.h \
-    /usr/local/include/aws/cryptosdk/cpp/kms_keyring.h \
-    /usr/local/lib/libaws-encryption-sdk-cpp.dylib \
-    /usr/local/lib/aws-encryption-sdk-cpp/cmake/aws-encryption-sdk-cpp-targets.cmake \
-    /usr/local/lib/aws-encryption-sdk-cpp/cmake/aws-encryption-sdk-cpp-targets-noconfig.cmake \
-    /usr/local/lib/aws-encryption-sdk-cpp/cmake/aws-encryption-sdk-cpp-config.cmake; do
-    rm -f ${i};
-done
-}
-
-if [ "$OS" == 'Darwin' ]; then
-  if [ "$#" -eq 0 ]; then
-   # deps
-   # build_cpp
-    build_csdk
-  else
-    case $1 in
-      "clean") 
-        clean;;
-      *)
-        echo "What now?  look at the script to find the exact func to call..."
-      ;;
-    esac
-   fi
-fi

From 499edaff91a40179029772015d129c9d97addab0 Mon Sep 17 00:00:00 2001
From: Doug Chapman <dougch@amazon.com>
Date: Mon, 30 Sep 2019 12:49:02 -0700
Subject: [PATCH 03/11] Limit changelog to PRs

---
 CHANGELOG.rst | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 0cf6fd8e1..f8791948e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,24 +5,12 @@ Changelog
 1.0.1 -- 2019-09-27
 =================== 
 * Merge pull request #376 from lucasmt/dependency-graph
-* Modified Doxygen config file to generate dependency graphs
-* Merge pull request #426 from danielsn/reformat ran reformat
+* Merge pull request #426 from danielsn/reformat 
 * Merge pull request #433 from nchong-at-aws/strengthen-atomic-refcount-down 
-  Strengthen memory_order for refcount_down
-* Merge pull request #391 from johnwalker/prtemplate Update PR template
-* Merge pull request #430 from dougch/clang_format_322 Issue #322; Refreshing the clang-format file and checking the version
-* Fix MultiKeyringNew proof so it runs again. (#444)
-* Windows build fixes (#446)
-** Changed aws-sdk-cpp version from 1.7.36 to 1.7.163
-** Fix for error C2259: anonymous-namespace::BufferedLogSystem cannot instantiate abstract class for windows builds
-** Modified Flush() function
-** Version bump of dep: aws-sdk-cpp
-** Don't add empty strings to library path
-** Pull in change from PR #386
-** Fixed calling EVP_EncryptUpdate and EVP_DecryptUpdate when AAD is NULL
-** Removed test size 0 and added test size 5 to fix failure case
-** Fix typo: aad
-** Pulling in changes from PR#446
+* Merge pull request #391 from johnwalker/prtemplate 
+* Merge pull request #430 from dougch/clang_format_322 
+* Fix MultiKeyringNew proof so it runs again. #444
+* Windows build fixes #446
 
 1.0.0 -- 2019-05-20
 =================== 

From f3f9c589df831dbc172b73171544abd3e0a4b65f Mon Sep 17 00:00:00 2001
From: Doug Chapman <dougch@amazon.com>
Date: Thu, 3 Oct 2019 11:10:12 -0700
Subject: [PATCH 04/11] Cleaning up the changelog further and tightening up
 README version words.

---
 CHANGELOG.rst | 10 +++++-----
 README.md     |  7 ++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f8791948e..471d05eb6 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,11 +4,11 @@ Changelog
 
 1.0.1 -- 2019-09-27
 =================== 
-* Merge pull request #376 from lucasmt/dependency-graph
-* Merge pull request #426 from danielsn/reformat 
-* Merge pull request #433 from nchong-at-aws/strengthen-atomic-refcount-down 
-* Merge pull request #391 from johnwalker/prtemplate 
-* Merge pull request #430 from dougch/clang_format_322 
+* Modified Doxygen config file to generate dependency graphs #376
+* Ran reformat #426
+* Strengthen memory_order for refcount_down #433
+* Update PR template #391
+* Refreshing the clang-format file and checking the version #430
 * Fix MultiKeyringNew proof so it runs again. #444
 * Windows build fixes #446
 
diff --git a/README.md b/README.md
index bbae181c3..08c1d0efa 100644
--- a/README.md
+++ b/README.md
@@ -10,17 +10,18 @@ Also, see the [API documentation](https://aws.github.io/aws-encryption-sdk-c/htm
 ## Dependencies
 
 The only direct dependencies of this code are OpenSSL 1.0.2 or higher or 1.1.0 or higher and
-[aws-c-common](https://github.com/awslabs/aws-c-common) v0.3.0 or higher. You will also need
+[aws-c-common](https://github.com/awslabs/aws-c-common) v0.3.15. You will also need
 a C compiler and CMake 3.9 or higher.
 
 To integrate with [KMS](https://aws.amazon.com/kms/) the AWS Encryption SDK for C also requires
 the [AWS SDK for C++](https://github.com/aws/aws-sdk-cpp), a C++ compiler, and libcurl.
 
 For best results when doing a build with KMS integration, do not install aws-c-common directly.
-Build and install the AWS SDK for C++, which will build and install aws-c-common for you. If
+Build and install the AWS SDK for C++, which will build and install aws-c-common for you (see the C++ SDK dependancies
+ [here](https://github.com/aws/aws-sdk-cpp/blob/master/third-party/CMakeLists.txt#L18)). If
 you install aws-c-common before building the AWS SDK for C++, this will fool the AWS SDK for
 C++ install logic, and you will be forced to install several other dependencies manually. The
-minimum supported version of the AWS SDK for C++ is 1.7.163.
+current supported version of the AWS SDK for C++ is 1.7.163.
 
 You need to compile both the AWS Encryption SDK for C and its dependencies as either all
 shared or all static libraries. We will use all shared library builds in our examples by

From a60e5645581875b4efc62d8924b0dd071a1e05eb Mon Sep 17 00:00:00 2001
From: Doug Chapman <dougch@amazon.com>
Date: Mon, 7 Oct 2019 17:07:20 -0700
Subject: [PATCH 05/11] Changelog format to markdown; address PR comments

---
 CHANGELOG.md  | 34 ++++++++++++++++++++++++++++++++++
 CHANGELOG.rst | 41 -----------------------------------------
 2 files changed, 34 insertions(+), 41 deletions(-)
 create mode 100644 CHANGELOG.md
 delete mode 100644 CHANGELOG.rst

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..647fcb5f8
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,34 @@
+# Changelog
+
+
+## 1.0.1 -- 2019-09-27
+* Modified Doxygen config file to generate dependency graphs [#376](https://github.com/aws/aws-encryption-sdk-c/pull/376)
+* Ran reformat [#426](https://github.com/aws/aws-encryption-sdk-c/pull/426)
+* Strengthen memory_order for refcount_down [#433](https://github.com/aws/aws-encryption-sdk-c/pull/433)
+* Update PR template [#391](https://github.com/aws/aws-encryption-sdk-c/pull/391)
+* Refreshing the clang-format file and checking the version [#430](https://github.com/aws/aws-encryption-sdk-c/pull/430)
+* Fix MultiKeyringNew proof so it runs again. [#444](https://github.com/aws/aws-encryption-sdk-c/pull/444)
+* Windows build fixes [#446](https://github.com/aws/aws-encryption-sdk-c/pull/446)
+
+## 1.0.0 -- 2019-05-20
+* Changed links from awslabs to aws 
+* Initial stable release 
+
+## 0.2.0 -- 2019-05-13
+* Added API function to make session from keyring
+* 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
+
+## 0.1.2 -- 2019-02-28
+* Fixed empty string bug on git version of KMS user agent
+* Local tests only by default
+* Fix of MAP_ANONYMOUS issue for older Linuxes
+
+## 0.1.1 -- 2019-02-21
+* Fixed cmake bug regarding git version of KMS user agent
+* Added CBMC header file needed by newer aws-c-common versions
+
+## 0.1.0 -- 2019-02-05
+* Initial public release
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
deleted file mode 100644
index 471d05eb6..000000000
--- a/CHANGELOG.rst
+++ /dev/null
@@ -1,41 +0,0 @@
-*********
-Changelog
-*********
-
-1.0.1 -- 2019-09-27
-=================== 
-* Modified Doxygen config file to generate dependency graphs #376
-* Ran reformat #426
-* Strengthen memory_order for refcount_down #433
-* Update PR template #391
-* Refreshing the clang-format file and checking the version #430
-* Fix MultiKeyringNew proof so it runs again. #444
-* Windows build fixes #446
-
-1.0.0 -- 2019-05-20
-=================== 
-* Changed links from awslabs to aws 
-* Initial stable release 
-
-0.2.0 -- 2019-05-13
-===================
-* Added API function to make session from keyring
-* 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
-
-0.1.2 -- 2019-02-28
-===================
-* Fixed empty string bug on git version of KMS user agent
-* Local tests only by default
-* Fix of MAP_ANONYMOUS issue for older Linuxes
-
-0.1.1 -- 2019-02-21
-===================
-* Fixed cmake bug regarding git version of KMS user agent
-* Added CBMC header file needed by newer aws-c-common versions
-
-0.1.0 -- 2019-02-05
-===================
-* Initial public release

From 8089d24349665ecf14ca1859a96ada8982178b06 Mon Sep 17 00:00:00 2001
From: Doug Chapman <dougch@amazon.com>
Date: Tue, 8 Oct 2019 12:16:52 -0700
Subject: [PATCH 06/11] Improve README words on version dependancies.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 08c1d0efa..c86a015c1 100644
--- a/README.md
+++ b/README.md
@@ -20,8 +20,8 @@ For best results when doing a build with KMS integration, do not install aws-c-c
 Build and install the AWS SDK for C++, which will build and install aws-c-common for you (see the C++ SDK dependancies
  [here](https://github.com/aws/aws-sdk-cpp/blob/master/third-party/CMakeLists.txt#L18)). If
 you install aws-c-common before building the AWS SDK for C++, this will fool the AWS SDK for
-C++ install logic, and you will be forced to install several other dependencies manually. The
-current supported version of the AWS SDK for C++ is 1.7.163.
+C++ install logic, and you will be forced to install several other dependencies manually. Version 1.7.163 of the 
+AWS SDK for C++ is supported by version v1.0.1 of the AWS Encryption SDK for C.
 
 You need to compile both the AWS Encryption SDK for C and its dependencies as either all
 shared or all static libraries. We will use all shared library builds in our examples by

From b339168230dfe01dd95256a90b3cd867dde3bf7f Mon Sep 17 00:00:00 2001
From: Doug Chapman <dougch@amazon.com>
Date: Thu, 10 Oct 2019 13:48:36 -0700
Subject: [PATCH 07/11] Add macOS PR to CHANGELOG

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 647fcb5f8..41789daa6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 
 
-## 1.0.1 -- 2019-09-27
+## 1.0.1 -- 2019-10-10
 * Modified Doxygen config file to generate dependency graphs [#376](https://github.com/aws/aws-encryption-sdk-c/pull/376)
 * Ran reformat [#426](https://github.com/aws/aws-encryption-sdk-c/pull/426)
 * Strengthen memory_order for refcount_down [#433](https://github.com/aws/aws-encryption-sdk-c/pull/433)
@@ -9,6 +9,7 @@
 * Refreshing the clang-format file and checking the version [#430](https://github.com/aws/aws-encryption-sdk-c/pull/430)
 * Fix MultiKeyringNew proof so it runs again. [#444](https://github.com/aws/aws-encryption-sdk-c/pull/444)
 * Windows build fixes [#446](https://github.com/aws/aws-encryption-sdk-c/pull/446)
+* OSX build steps and README updates [#453](https://github.com/aws/aws-encryption-sdk-c/pull/)
 
 ## 1.0.0 -- 2019-05-20
 * Changed links from awslabs to aws 

From a4ef0a4e4283e456c88d6ac37b5ec785186504b7 Mon Sep 17 00:00:00 2001
From: Doug Chapman <dougch@amazon.com>
Date: Mon, 21 Oct 2019 11:49:53 -0700
Subject: [PATCH 08/11] Update Chagnelog to reflect PRs 408 and 385 getting
 merged.

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41789daa6..2e02d6c21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,9 @@
 * Fix MultiKeyringNew proof so it runs again. [#444](https://github.com/aws/aws-encryption-sdk-c/pull/444)
 * Windows build fixes [#446](https://github.com/aws/aws-encryption-sdk-c/pull/446)
 * OSX build steps and README updates [#453](https://github.com/aws/aws-encryption-sdk-c/pull/)
+* Fix duplicate in encryption context deserialization bug [#408](https://github.com/aws/aws-encryption-sdk-c/pull/408)
+* Fix a bug where framefmt serialize returns a wrong ciphertext size [#385](https://github.com/aws/aws-encryption-sdk-c/pull/385)
+
 
 ## 1.0.0 -- 2019-05-20
 * Changed links from awslabs to aws 

From 29126b905fc36b590bff9fc1117b00c9f248b536 Mon Sep 17 00:00:00 2001
From: Doug Chapman <dougch@amazon.com>
Date: Thu, 31 Oct 2019 13:08:30 -0700
Subject: [PATCH 09/11] doc: Update CHANGELOG with PR#451.

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e02d6c21..188b06c6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
 * OSX build steps and README updates [#453](https://github.com/aws/aws-encryption-sdk-c/pull/)
 * Fix duplicate in encryption context deserialization bug [#408](https://github.com/aws/aws-encryption-sdk-c/pull/408)
 * Fix a bug where framefmt serialize returns a wrong ciphertext size [#385](https://github.com/aws/aws-encryption-sdk-c/pull/385)
-
+* Fix: Improve initialization. [#451](https://github.com/aws/aws-encryption-sdk-c/pull/451)
 
 ## 1.0.0 -- 2019-05-20
 * Changed links from awslabs to aws 

From 42e5600f448ce9da1d1c8fbe9bb5c17b337f4cac Mon Sep 17 00:00:00 2001
From: Doug Chapman <dougch@amazon.com>
Date: Mon, 4 Nov 2019 10:47:08 -0800
Subject: [PATCH 10/11] Address PR comments about version tracking

---
 include/aws/cryptosdk/version.h.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/aws/cryptosdk/version.h.in b/include/aws/cryptosdk/version.h.in
index fc74915f3..d02359f34 100644
--- a/include/aws/cryptosdk/version.h.in
+++ b/include/aws/cryptosdk/version.h.in
@@ -29,6 +29,10 @@
  *
  * This API documentation was generated from the v@MAJOR@.@MINOR@.@PATCH@ source code.
  *
+ * There are addiitonal dependancies built by the aws-sdk-cpp package, with the following versions:
+ * aws-c-common: AWS_C_COMMON_TAG
+ * aws-checksums: AWS_CHECKSUMS_TAG
+ * aws-c-event-stream: AWS_EVENT_STREAM_TAG
  * <b>License</b>
  *
  * This library is licensed under the Apache 2.0 License.

From 4d3b2925348a88859224d346ba2a6e5505b37298 Mon Sep 17 00:00:00 2001
From: Doug Chapman <dougch@amazon.com>
Date: Mon, 4 Nov 2019 11:11:08 -0800
Subject: [PATCH 11/11] Revert "Address PR comments about version tracking" -
 not ready.

This reverts commit 42e5600f448ce9da1d1c8fbe9bb5c17b337f4cac.
---
 include/aws/cryptosdk/version.h.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/include/aws/cryptosdk/version.h.in b/include/aws/cryptosdk/version.h.in
index d02359f34..fc74915f3 100644
--- a/include/aws/cryptosdk/version.h.in
+++ b/include/aws/cryptosdk/version.h.in
@@ -29,10 +29,6 @@
  *
  * This API documentation was generated from the v@MAJOR@.@MINOR@.@PATCH@ source code.
  *
- * There are addiitonal dependancies built by the aws-sdk-cpp package, with the following versions:
- * aws-c-common: AWS_C_COMMON_TAG
- * aws-checksums: AWS_CHECKSUMS_TAG
- * aws-c-event-stream: AWS_EVENT_STREAM_TAG
  * <b>License</b>
  *
  * This library is licensed under the Apache 2.0 License.