Update aws-c-common and aws-c-io

* Update `contrib/restricted/aws/aws-c-io` to 0.11.0
* Backport cJSON symbol renaming logic from aws-sdk-cpp upstream

ref:396829235a01ed34888651ee38ebd76c95510d6b

1 files changed, 43 insertions, 0 deletions

diff --git a/contrib/restricted/aws/aws-c-io/.yandex_meta/licenses.list.txt b/contrib/restricted/aws/aws-c-io/.yandex_meta/licenses.list.txt
index 15c55379f0..aa9cdb63ae 100644
--- a/contrib/restricted/aws/aws-c-io/.yandex_meta/licenses.list.txt
+++ b/contrib/restricted/aws/aws-c-io/.yandex_meta/licenses.list.txt
@@ -215,9 +215,52 @@ This library is licensed under the Apache 2.0 License.
 SPDX-License-Identifier: Apache-2.0.
 
 ====================COPYRIGHT====================
+/* Copyright (c) OASIS Open 2016. All Rights Reserved./
+
+
+====================COPYRIGHT====================
+Copyright (c) OASIS Open 2016. All Rights Reserved.
+
+
+====================COPYRIGHT====================
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
 
+====================Custom-Oasis-Pkcs11====================
+ * /Distributed under the terms of the OASIS IPR Policy,
+ * [http://www.oasis-open.org/policies-guidelines/ipr], AS-IS, WITHOUT ANY
+ * IMPLIED OR EXPRESS WARRANTY; there is no warranty of MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE or NONINFRINGEMENT of the rights of others.
+
+
+====================Custom-Oasis-Pkcs11====================
+FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
+ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE
+
+
+====================Custom-Oasis-Pkcs11====================
+This document and translations of it may be copied and furnished to others, and
+derivative works that comment on or otherwise explain it or assist in its
+implementation may be prepared, copied, published, and distributed, in whole or
+in part, without restriction of any kind, provided that the above copyright
+notice and this section are included on all such copies and derivative works.
+However, this document itself may not be modified in any way, including by
+removing the copyright notice or references to OASIS, except as needed for the
+purpose of developing any document or deliverable produced by an OASIS
+Technical Committee (in which case the rules applicable to copyrights, as set
+forth in the OASIS IPR Policy, must be followed) or as required to translate it
+into languages other than English.
+
+The limited permissions granted above are perpetual and will not be revoked by
+OASIS or its successors or assigns.
+
+This document and the information contained herein is provided on an "AS IS"
+basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
+INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
+FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
+
+
 ====================File: NOTICE====================
 AWS C Io
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.