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.

Sign up for GitHub

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

allowing disable of TLSv1.3 #654

Merged
merged 12 commits into from
Oct 16, 2023
Merged

allowing disable of TLSv1.3 #654

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c723bca
allowing disable of TLSv1.3
jordanfilteau1995 Oct 12, 2023
cd5274e
code simplify; changing to enum for maxTls
jordanfilteau1995 Oct 12, 2023
482b7df
fixing whitespace
jordanfilteau1995 Oct 12, 2023
d0e805d
Merge branch 'v2.x/staging' into zss-tls1.3
jordanfilteau1995 Oct 12, 2023
6cfcc1c
Add ability to do tls tracing via config
1000TurquoisePogs Oct 13, 2023
3e39427
fix ref to include agent
1000TurquoisePogs Oct 13, 2023
b5ddbbe
Merge pull request #655 from zowe/feature/tls-tracing-config
1000TurquoisePogs Oct 13, 2023
53f8442
splitting 1.2 and 1.3 default ciphers and configuration
jordanfilteau1995 Oct 13, 2023
c83cc1c
Merge branch 'zss-tls1.3' of github.com:zowe/zss into zss-tls1.3
jordanfilteau1995 Oct 13, 2023
2c2e6ef
updating submodule for zowe-common-c
jordanfilteau1995 Oct 13, 2023
dd3f02f
concatenating v1.2 ciphers to v1.3 ciphers
jordanfilteau1995 Oct 13, 2023
61baa0b
reverting changes
jordanfilteau1995 Oct 13, 2023
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
2 changes: 2 additions & 0 deletions c/zss.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,6 +1173,8 @@ static bool readAgentHttpsSettingsV2(ShortLivedHeap *slh,
*/
char *keyshares = jsonObjectGetString(httpsConfigObject, "keyshares");
settings->keyshares = keyshares ? keyshares : DEFAULT_TLS_KEY_SHARES;
char *maxTls = jsonObjectGetString(httpsConfigObject, "maxTls");
settings->maxTls = maxTls;
settings->keyring = jsonObjectGetString(httpsConfigObject, "keyring");
settings->label = jsonObjectGetString(httpsConfigObject, "label");
/* settings->stash = jsonObjectGetString(httpsConfigObject, "stash"); - this is obsolete */
Expand Down
2 changes: 1 addition & 1 deletion deps/zowe-common-c
Open in desktop
Submodule zowe-common-c updated 2 files
+30 −8 c/tls.c
+7 −1 h/tls.h
4 changes: 4 additions & 0 deletions schemas/zss-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@
"keyshares": {
"type": [ "string", "null" ],
"description": "The list of key shares in order of priority"
},
"maxTls": {
"type": [ "string", "null" ],
"description": "Maximum tls version allowed."
jordanfilteau1995 marked this conversation as resolved.
Show resolved Hide resolved
}
}
},
Expand Down