Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tls1.3 win update #676

Draft
wants to merge 164 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
164 commits
Select commit Hold shift + click to select a range
624fe50
tls1.3 support
alfred2g May 16, 2024
6c28ad0
add version check
alfred2g May 18, 2024
de09df2
add version check
alfred2g May 18, 2024
5586e6a
sync
alfred2g May 18, 2024
c20a5dd
version info
alfred2g May 18, 2024
4f50b77
crate acquire common section
alfred2g May 18, 2024
a5a3390
Split newer and older versions of windows
alfred2g May 19, 2024
9d7eec0
more cleanups
alfred2g May 19, 2024
f8299fa
Fix missing definitions sc_ctx
alfred2g May 20, 2024
f49ae4a
typo
alfred2g May 20, 2024
bcf5e8a
Fix dwflags
alfred2g May 20, 2024
4625803
Fix version number fetch
alfred2g May 20, 2024
3f25df0
separate credentials into common parameter
alfred2g May 20, 2024
cd61590
remove duplicate status
alfred2g May 20, 2024
ff9ba3b
fix some errors
alfred2g May 20, 2024
ec1653b
Add local schannel credential
alfred2g May 20, 2024
07f3959
fix reference paCred
alfred2g May 20, 2024
41e5652
use common code for credentials
alfred2g May 20, 2024
3bb3396
Remove comments
alfred2g May 21, 2024
eee6ade
Fix indentation
alfred2g May 21, 2024
75db3db
Fix warnings
alfred2g May 21, 2024
324ade1
add logs
alfred2g May 21, 2024
e9871c6
Fix warnings
alfred2g May 21, 2024
bf25cd2
clang format
alfred2g May 21, 2024
f5f8c3b
clang format
alfred2g May 21, 2024
92c9936
Style: clang-format
alfred2g May 21, 2024
4fa64c2
enable protocol fields
alfred2g May 22, 2024
6c8743f
clang format
alfred2g May 22, 2024
7469078
enable tls1.3
alfred2g May 22, 2024
228d45b
Fix enabled protocols
alfred2g May 22, 2024
38e9e10
Remove some logs
alfred2g May 22, 2024
9841bd3
Fix review comments
alfred2g May 24, 2024
f03bf38
clang-format
alfred2g May 24, 2024
5e405da
Better logging for windows version
alfred2g May 24, 2024
ebf3bbe
Add Variable check
alfred2g May 29, 2024
f256416
Clang format
alfred2g May 29, 2024
38ee533
clang format
alfred2g May 29, 2024
69c58da
style: clang-format
alfred2g May 29, 2024
b4a4801
Add comment for the environment variable
alfred2g May 29, 2024
2d69731
test tls1.3 on aws endpoint
alfred2g May 29, 2024
1aa6c8d
test update
alfred2g May 29, 2024
ac82db7
clang format
alfred2g May 29, 2024
b7f9af3
Enable testcase
alfred2g May 29, 2024
d0e8b18
send packet to iot core
alfred2g May 31, 2024
1a1c938
fix build error
alfred2g May 31, 2024
c2b67df
fix timeout
alfred2g Jun 2, 2024
7368732
Fix syntax error
alfred2g Jun 2, 2024
7e90e13
certificate
alfred2g Jun 3, 2024
1e78132
Fix test
alfred2g Jun 4, 2024
26ea49d
Run 1.3 test only on windows
alfred2g Jun 4, 2024
7ece56a
run tls1.3 test only on supported windows version
alfred2g Jun 5, 2024
e1ea12e
Remove weird characters
alfred2g Jun 5, 2024
3c1f42d
change license
alfred2g Jun 5, 2024
42ca698
fix build error
alfred2g Jun 5, 2024
69a0823
print windows machine version
alfred2g Jun 5, 2024
8c24342
add root ca
alfred2g Jun 5, 2024
211ba95
debug print
alfred2g Jun 5, 2024
ed181f7
different connect packet
alfred2g Jun 5, 2024
3f3de38
connect test to port 8883
alfred2g Jun 13, 2024
6f1f73c
add connack assertions
alfred2g Jun 13, 2024
b8524ec
uncomment code
alfred2g Jun 13, 2024
7331dfc
clang format
alfred2g Jun 13, 2024
6d3e19d
remove blank lines
alfred2g Jun 13, 2024
19fa6da
add alpn protocol
alfred2g Jun 13, 2024
bafa0bc
remove commented code
alfred2g Jun 13, 2024
e056004
clang format
alfred2g Jun 13, 2024
98a9ebc
clang-format
alfred2g Jun 13, 2024
895c348
clang-format
alfred2g Jun 13, 2024
4cf7d05
clang-format
alfred2g Jun 13, 2024
8c84482
clang format
alfred2g Jun 13, 2024
fc98455
clang format
alfred2g Jun 13, 2024
558f075
Add and remove environment variable
alfred2g Jun 14, 2024
e3be4f5
Add test case to cmakefiles
alfred2g Jun 14, 2024
d6bef11
Fix unreachable code
alfred2g Jun 14, 2024
3ecbac8
clang-format
alfred2g Jun 14, 2024
279c609
Fix environment variable
alfred2g Jun 14, 2024
a5b4131
fix syntax error
alfred2g Jun 14, 2024
2380f9e
syntax error
alfred2g Jun 14, 2024
adb7b43
get environment variable
alfred2g Jun 14, 2024
e7b5a59
clang format
alfred2g Jun 14, 2024
acabfe5
clang format
alfred2g Jun 14, 2024
50d7064
Change build version for server 2022
alfred2g Jun 14, 2024
6d37fd8
fix memory cleanup
alfred2g Jun 18, 2024
11c0e29
merge with main
sbSteveK Sep 16, 2024
57e5cb3
missing close bracket
sbSteveK Sep 16, 2024
a8edf64
remove duplicate pcerts
sbSteveK Sep 16, 2024
640e48d
Windows version check renaming
sbSteveK Sep 16, 2024
2f932ed
there is no need to convert to ul. If there is an issue with int, it'…
sbSteveK Sep 16, 2024
a798351
missed a few
sbSteveK Sep 16, 2024
2be13e3
update cr changes
xiazhvera Sep 22, 2024
08f34fe
quick compile fix
xiazhvera Sep 23, 2024
9c944ee
move windows private function to new header file
xiazhvera Sep 23, 2024
0d364bd
Merge branch 'tls1.3_win_update' of https://github.com/awslabs/aws-c-…
xiazhvera Sep 23, 2024
913168a
reset credential.cCreds to default 0
xiazhvera Sep 23, 2024
3687654
Fix ALPN regression
bretambrose Sep 27, 2024
1499b68
Fix comment
sfodagain Oct 2, 2024
e08da9e
Remove resetting buffer on renegotiation
sfodagain Oct 2, 2024
f01b604
Fix raising error unconditionally
sfodagain Oct 2, 2024
1554b15
Merge branch 'main' into tls1.3_win_update
sfodagain Oct 17, 2024
37dc1ec
Split SEC_E_OK and SEC_I_RENEGOTIATE
sfodagain Nov 20, 2024
a2574dc
format
sfodagain Nov 20, 2024
88e4985
Fix conversion warning
sfodagain Nov 20, 2024
f743fe1
Merge branch 'main' into tls1.3_win_update
sfodagain Nov 20, 2024
7d66548
Run local TLS server
sfodagain Nov 22, 2024
914d75e
Simplify check
sfodagain Nov 22, 2024
df17fd8
Use local TLS server in TLS 1.3 test
sfodagain Nov 22, 2024
7819260
test fixup
sfodagain Nov 22, 2024
810c671
debugging
sfodagain Nov 22, 2024
c416590
debugging
sfodagain Nov 22, 2024
221184a
debugging
sfodagain Nov 22, 2024
0258e31
Add trace, use 127.0.0.1
sfodagain Nov 22, 2024
0ca64ac
Print openssl logs
sfodagain Nov 22, 2024
0963767
Listen on 127.0.0.1
sfodagain Nov 22, 2024
ce8e3d2
Remove -trace
sfodagain Nov 22, 2024
d342953
Change port
sfodagain Nov 22, 2024
6062cc1
Print openssl version
sfodagain Nov 23, 2024
ab19921
fixup
sfodagain Nov 23, 2024
6252e28
debugging
sfodagain Nov 23, 2024
72dd3e7
Print more
sfodagain Nov 23, 2024
f5cf27e
debugging
sfodagain Nov 23, 2024
54bc002
Try no tls 1.3
sfodagain Nov 26, 2024
8740984
debugging
sfodagain Nov 26, 2024
41c6ae2
debugging
sfodagain Nov 27, 2024
c07fda6
Use communicate
sfodagain Nov 27, 2024
e7a8cf7
Add s_client
sfodagain Nov 27, 2024
8bd355e
Fix port typo
sfodagain Nov 27, 2024
279aa22
Add CA file
sfodagain Nov 27, 2024
5ba2a0b
Add debug
sfodagain Nov 28, 2024
9b84984
Set servername
sfodagain Nov 28, 2024
cdc3265
debugging
sfodagain Nov 28, 2024
00f4ae3
List ciphers
sfodagain Nov 28, 2024
8dddbb8
fixup
sfodagain Nov 28, 2024
810a79c
debugging
sfodagain Nov 28, 2024
fd4c494
debugging
sfodagain Nov 28, 2024
687707f
Generate new creds
sfodagain Nov 28, 2024
5b41dac
remove client creds
sfodagain Nov 28, 2024
bcaac99
use chain
sfodagain Nov 28, 2024
c80a444
debugging
sfodagain Nov 28, 2024
9a708bb
Add persisting RSA keys
sfodagain Dec 5, 2024
87b1643
Add cert to trusted store
sfodagain Dec 6, 2024
cc36e1b
Use python ssl
sfodagain Dec 6, 2024
5634ad5
Fix path
sfodagain Dec 6, 2024
6950ac5
Print cwd
sfodagain Dec 6, 2024
aaef323
debugging
sfodagain Dec 6, 2024
f5af977
Move python server
sfodagain Dec 6, 2024
db527b3
fixup
sfodagain Dec 6, 2024
9233a26
Use new keys
sfodagain Dec 9, 2024
ee307c4
Add client root cert
sfodagain Dec 9, 2024
87d9a38
Clean up setting up tls server
sfodagain Dec 9, 2024
61218a0
Cleanup setting up test TLS server
sfodagain Dec 9, 2024
21a322b
Remove excess files
sfodagain Dec 9, 2024
6b06194
Merge client and server RSA import
sfodagain Dec 9, 2024
500609f
Disable tls 1.3 for ephemeral keys
sfodagain Dec 9, 2024
4a40cd0
fixup
sfodagain Dec 9, 2024
eecfbb7
Merge branch 'main' into tls1.3_win_update
sfodagain Dec 9, 2024
2d20528
Remove unused files
sfodagain Dec 9, 2024
95a909d
Fix comments
sfodagain Dec 10, 2024
8daa924
Fix test name
sfodagain Dec 10, 2024
6a16eb1
fixup tls server
sfodagain Dec 10, 2024
aa7cc7b
Add more checks
sfodagain Dec 10, 2024
d6d5244
Remove excess coment
sfodagain Dec 10, 2024
7e88849
Fix test name
sfodagain Dec 17, 2024
6ace418
Fix log messages
sfodagain Dec 17, 2024
695d70c
Use separate status var for alpn
sfodagain Dec 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup
sfodagain committed Dec 6, 2024
commit db527b39eadd5c2b84a423db3f843d46bc141881
20 changes: 11 additions & 9 deletions tests/resources/main.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import socket
import ssl
import os

context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
cwd = os.getcwd()
print("Current dir is {}".format(cwd))
context.minimum_version = ssl.TLSVersion.TLSv1_3
context.maximum_version = ssl.TLSVersion.TLSv1_3
context.load_cert_chain('tls13.pem.crt', 'tls13.key')

with socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0) as sock:
sock.bind(('127.0.0.1', 59443))
sock.listen(5)
with context.wrap_socket(sock, server_side=True) as ssock:
conn, addr = ssock.accept()
print("accepted new conn: {}".format(addr))
cnt = 0
while cnt < 2:
with socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0) as sock:
sock.bind(('127.0.0.1', 59443))
sock.listen(5)
with context.wrap_socket(sock, server_side=True) as ssock:
conn, addr = ssock.accept()
print("accepted new conn: {}".format(addr))
cnt = cnt + 1