-
Notifications
You must be signed in to change notification settings - Fork 185
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
b0502be
commit a6d9d66
Showing
7 changed files
with
56 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/source/windows/secure_channel_tls_handler.c b/source/windows/secure_channel_tls_handler.c | ||
index b62b1a0..48f4556 100644 | ||
--- a/source/windows/secure_channel_tls_handler.c | ||
+++ b/source/windows/secure_channel_tls_handler.c | ||
@@ -53,7 +53,7 @@ struct secure_channel_ctx { | ||
struct aws_tls_ctx ctx; | ||
struct aws_string *alpn_list; | ||
SCHANNEL_CRED credentials; | ||
- PCERT_CONTEXT pcerts; | ||
+ PCCERT_CONTEXT pcerts; | ||
HCERTSTORE cert_store; | ||
HCERTSTORE custom_trust_store; | ||
HCRYPTPROV crypto_provider; | ||
@@ -188,7 +188,7 @@ static int s_manually_verify_peer_cert(struct aws_channel_handler *handler) { | ||
int result = AWS_OP_ERR; | ||
CERT_CONTEXT *peer_certificate = NULL; | ||
HCERTCHAINENGINE engine = NULL; | ||
- CERT_CHAIN_CONTEXT *cert_chain_ctx = NULL; | ||
+ PCCERT_CHAIN_CONTEXT cert_chain_ctx = NULL; | ||
|
||
/* get the peer's certificate so we can validate it.*/ | ||
SECURITY_STATUS status = |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
diff --git a/src/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp b/src/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp | ||
index b8ab519..7cd91e9 100644 | ||
--- a/src/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp | ||
+++ b/src/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp | ||
@@ -19,6 +19,7 @@ | ||
|
||
#include <Windows.h> | ||
#include <winhttp.h> | ||
+#include <WinSock2.h> | ||
#include <mstcpip.h> // for tcp_keepalive | ||
#include <sstream> | ||
#include <iostream> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
diff --git a/src/cdf.h b/src/cdf.h | ||
index 0505666..9645114 100644 | ||
--- a/src/cdf.h | ||
+++ b/src/cdf.h | ||
@@ -35,11 +35,6 @@ | ||
#ifndef _H_CDF_ | ||
#define _H_CDF_ | ||
|
||
-#ifdef WIN32 | ||
-#include <winsock2.h> | ||
-#define timespec timeval | ||
-#define tv_nsec tv_usec | ||
-#endif | ||
#ifdef __DJGPP__ | ||
#define timespec timeval | ||
#define tv_nsec tv_usec |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters