Skip to content

Commit ce18fb6

Browse files
singkusingku
authored
Daily fix (aws#103)
remove extra CRLF
1 parent da68260 commit ce18fb6

20 files changed

+40409
-40409
lines changed

‎LICENSE.txt

+65-65
Large diffs are not rendered by default.

‎NOTICE.txt

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
AWS SDK for C++
2-
Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3-
4-
This product includes software developed by
5-
Amazon Technologies, Inc (http://www.amazon.com/).
6-
7-
**********************
8-
THIRD PARTY COMPONENTS
9-
**********************
10-
This software includes third party software subject to the following copyrights:
11-
- XML parsing and utility functions from TinyXml2 - Lee Thomason.
12-
- JSON parsing and utility functions from JsonCpp - Copyright (c) 2007-2010 Baptiste Lepilleur.
13-
- OpenSSL build files for cmake used for Android Builds - Copyright (C) 2007-2012 LuaDist and Copyright (C) 2013 Brian Sidebotham
14-
- Android tool chain cmake build files - Copyright (c) 2010-2011, Ethan Rublee and Copyright (c) 2011-2014, Andrey Kamaev
15-
16-
The licenses for these third party components are included in LICENSE.txt
1+
AWS SDK for C++
2+
Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
4+
This product includes software developed by
5+
Amazon Technologies, Inc (http://www.amazon.com/).
6+
7+
**********************
8+
THIRD PARTY COMPONENTS
9+
**********************
10+
This software includes third party software subject to the following copyrights:
11+
- XML parsing and utility functions from TinyXml2 - Lee Thomason.
12+
- JSON parsing and utility functions from JsonCpp - Copyright (c) 2007-2010 Baptiste Lepilleur.
13+
- OpenSSL build files for cmake used for Android Builds - Copyright (C) 2007-2012 LuaDist and Copyright (C) 2013 Brian Sidebotham
14+
- Android tool chain cmake build files - Copyright (c) 2010-2011, Ethan Rublee and Copyright (c) 2011-2014, Andrey Kamaev
15+
16+
The licenses for these third party components are included in LICENSE.txt

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ CMake options are variables that can either be ON or OFF, with a controllable de
143143
##### NO_HTTP_CLIENT
144144
(Defaults to OFF) If enabled, prevents the default platform-specific http client from being built into the library. Turn this ON if you wish to inject your own http client implementation.
145145

146-
#####NO_ENCRYPTION
146+
##### NO_ENCRYPTION
147147
(Defaults to OFF) If enabled, prevents the default platform-specific cryptography implementation from being built into the library. Turn this ON if you wish to inject your own cryptography implementation.
148148

149149
##### ENABLE_RTTI
@@ -180,10 +180,10 @@ An override path for where the build system should find the Android NDK. By def
180180
Several directories are appended with \*integration-tests. After building your project, you can run these executables to ensure everything works properly.
181181

182182
#### Dependencies:
183-
To compile in Linux, you must have the header files for libcurl, libopenssl, and libuuid. The packages are typically available in your package manager.
183+
To compile in Linux, you must have the header files for libcurl, libopenssl. The packages are typically available in your package manager.
184184

185185
Debian example:
186-
`sudo apt-get install libcurl-dev uuid-dev`
186+
`sudo apt-get install libcurl-dev`
187187

188188
### Using the SDK
189189
After they are constructed, individual service clients are very similar to other SDKs, such as Java and .NET. This section explains how core works, how to use each feature, and how to construct an individual client.

‎aws-cpp-sdk-core-tests/resources/aws4_testsuite/aws4_testsuite/normalize-path/normalize-path.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
A note about signing requests to Amazon S3:
2-
1+
A note about signing requests to Amazon S3:
2+
33
In exception to this, you do not normalize URI paths for requests to Amazon S3. For example, if you have a bucket with an object named my-object//example//photo.user, use that path. Normalizing the path to my-object/example/photo.user will cause the request to fail. For more information, see Task 1: Create a Canonical Request in the Amazon Simple Storage Service API Reference: http://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-header-based-auth.html#canonical-request

‎aws-cpp-sdk-core-tests/resources/aws4_testsuite/aws4_testsuite/post-sts-token/readme.txt

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
A note about using temporary security credentials:
2-
3-
You can use temporary security credentials provided by the AWS Security Token Service (AWS STS) to sign a request. The process is the same as using long-term credentials but requires an additional HTTP header or query string parameter for the security token. The name of the header or query string parameter is X-Amz-Security-Token, and the value is the session token (the string that you received from AWS STS when you obtained temporary security credentials).
4-
5-
When you add X-Amz-Security-Token, some services require that you include this parameter in the canonical (signed) request. For other services, you add this parameter at the end, after you calculate the signature. For details see the API reference documentation for that service.
6-
7-
The test suite has 2 examples:
8-
9-
post-sts-header-before - The X-Amz-Security-Token header is part of the canonical request.
10-
11-
post-sts-header-after - The X-Amz-Security-Token header is added to the request after you calculate the signature.
12-
13-
The test suite uses this example value for X-Amz-Security-Token:
14-
1+
A note about using temporary security credentials:
2+
3+
You can use temporary security credentials provided by the AWS Security Token Service (AWS STS) to sign a request. The process is the same as using long-term credentials but requires an additional HTTP header or query string parameter for the security token. The name of the header or query string parameter is X-Amz-Security-Token, and the value is the session token (the string that you received from AWS STS when you obtained temporary security credentials).
4+
5+
When you add X-Amz-Security-Token, some services require that you include this parameter in the canonical (signed) request. For other services, you add this parameter at the end, after you calculate the signature. For details see the API reference documentation for that service.
6+
7+
The test suite has 2 examples:
8+
9+
post-sts-header-before - The X-Amz-Security-Token header is part of the canonical request.
10+
11+
post-sts-header-after - The X-Amz-Security-Token header is added to the request after you calculate the signature.
12+
13+
The test suite uses this example value for X-Amz-Security-Token:
14+
1515
AQoDYXdzEPT//////////wEXAMPLEtc764bNrC9SAPBSM22wDOk4x4HIZ8j4FZTwdQWLWsKWHGBuFqwAeMicRXmxfpSPfIeoIYRqTflfKD8YUuwthAx7mSEI/qkPpKPi/kMcGdQrmGdeehM4IC1NtBmUpp2wUE8phUZampKsburEDy0KPkyQDYwT7WZ0wq5VSXDvp75YU9HFvlRd8Tx6q6fE8YQcHNVXAkiY9q6d+xo0rKwT38xVqr7ZD0u0iPPkUL64lIZbqBAz+scqKmlzm8FDrypNC9Yjc8fPOLn9FX9KSYvKTr4rvx3iSIlTJabIQwj2ICCR/oLxBA==

‎aws-cpp-sdk-s3-encryption-integration-tests/CMakeLists.txt

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
add_project(aws-cpp-sdk-s3-encryption-integration-tests
22
"Integration tests for the Amazon S3 Encryption Client"
33
testing-resources
4-
aws-cpp-sdk-core
5-
aws-cpp-sdk-s3
6-
aws-cpp-sdk-kms
7-
aws-cpp-sdk-s3-encryption)
8-
9-
# Headers are included in the source so that they show up in Visual Studio.
10-
# They are included elsewhere for consistency.
11-
12-
file(GLOB S3ENCRYPTION_INT_TEST_SRC
13-
"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
14-
)
15-
16-
set(S3ECRYPTION_INT_TEST_APPLICATION_INCLUDES
17-
"${CMAKE_SOURCE_DIR}/aws-cpp-sdk-core/include/"
18-
"${CMAKE_SOURCE_DIR}/aws-cpp-sdk-s3/include/"
19-
"${CMAKE_SOURCE_DIR}/aws-cpp-sdk-s3-encryption/include/"
20-
"${CMAKE_SOURCE_DIR}/testing-resources/include/"
21-
"${CMAKE_SOURCE_DIR}/aws-cpp-sdk-kms/include"
22-
)
23-
24-
include_directories(${S3ECRYPTION_INT_TEST_APPLICATION_INCLUDES})
25-
26-
if(USE_WINDOWS_DLL_SEMANTICS AND BUILD_SHARED_LIBS)
27-
add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
28-
endif()
29-
30-
enable_testing()
31-
32-
if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
33-
add_library(aws-cpp-sdk-s3-encryption-integration-tests ${LIBTYPE} ${S3ENCRYPTION_INT_TEST_SRC})
34-
else()
35-
add_executable(aws-cpp-sdk-s3-encryption-integration-tests ${S3ENCRYPTION_INT_TEST_SRC})
36-
endif()
37-
38-
target_link_libraries(aws-cpp-sdk-s3-encryption-integration-tests ${PROJECT_LIBS})
39-
copyDlls(aws-cpp-sdk-s3-encryption-integration-tests ${PROJECT_LIBS})
4+
aws-cpp-sdk-core
5+
aws-cpp-sdk-s3
6+
aws-cpp-sdk-kms
7+
aws-cpp-sdk-s3-encryption)
8+
9+
# Headers are included in the source so that they show up in Visual Studio.
10+
# They are included elsewhere for consistency.
11+
12+
file(GLOB S3ENCRYPTION_INT_TEST_SRC
13+
"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
14+
)
15+
16+
set(S3ECRYPTION_INT_TEST_APPLICATION_INCLUDES
17+
"${CMAKE_SOURCE_DIR}/aws-cpp-sdk-core/include/"
18+
"${CMAKE_SOURCE_DIR}/aws-cpp-sdk-s3/include/"
19+
"${CMAKE_SOURCE_DIR}/aws-cpp-sdk-s3-encryption/include/"
20+
"${CMAKE_SOURCE_DIR}/testing-resources/include/"
21+
"${CMAKE_SOURCE_DIR}/aws-cpp-sdk-kms/include"
22+
)
23+
24+
include_directories(${S3ECRYPTION_INT_TEST_APPLICATION_INCLUDES})
25+
26+
if(USE_WINDOWS_DLL_SEMANTICS AND BUILD_SHARED_LIBS)
27+
add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
28+
endif()
29+
30+
enable_testing()
31+
32+
if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
33+
add_library(aws-cpp-sdk-s3-encryption-integration-tests ${LIBTYPE} ${S3ENCRYPTION_INT_TEST_SRC})
34+
else()
35+
add_executable(aws-cpp-sdk-s3-encryption-integration-tests ${S3ENCRYPTION_INT_TEST_SRC})
36+
endif()
37+
38+
target_link_libraries(aws-cpp-sdk-s3-encryption-integration-tests ${PROJECT_LIBS})
39+
copyDlls(aws-cpp-sdk-s3-encryption-integration-tests ${PROJECT_LIBS})

0 commit comments

Comments
 (0)