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

Access SSL contexts using names instead of Settings #30953

Merged
merged 39 commits into from
Jul 13, 2018
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
8fbe6e1
Refer to SSL contexts by name not settings
tvernum May 7, 2018
222015b
Merge branch 'master' into fix/30344-ssl-context-names
tvernum May 10, 2018
a360d22
[WIP] Use named SSL context in LDAP
tvernum May 14, 2018
29077e2
Merge branch 'master' into fix/30344-ssl-context-names
tvernum May 28, 2018
9ea7a52
Update openldap QA tests for named SSL contexts
tvernum May 28, 2018
997a1ec
Remove sslSocketFactory(Settings) from SSLService
tvernum May 28, 2018
2999649
Deprecate createSSLEngine(Settings)
tvernum May 29, 2018
bcde8a5
Remove createSSLEngine(Settings)
tvernum May 29, 2018
6ce4d32
Reduce use of Settings in SSL
tvernum May 30, 2018
f9cc028
Merge branch 'master' into fix/30344-ssl-context-names
tvernum May 30, 2018
e0561ee
Merge branch 'master' into fix/30344-ssl-context-names
tvernum Jun 12, 2018
bee987c
Improve SSLService tests
tvernum Jun 12, 2018
7c060d7
Small cleanup
tvernum Jun 12, 2018
2282d01
Merge branch 'master' into fix/30344-ssl-context-names
tvernum Jun 13, 2018
1aa0c14
Add additional test for named SSL configurations
tvernum Jun 14, 2018
39e6629
Merge branch 'master' into fix/30344-ssl-context-names
tvernum Jun 14, 2018
ef58ff1
Merge branch 'master' into fix/30344-ssl-context-names
tvernum Jun 14, 2018
d94dd57
Merge branch 'master' into fix/30344-ssl-context-names
tvernum Jun 14, 2018
ee32357
Remove unused imports
tvernum Jun 14, 2018
5a57fd6
Merge branch 'master' into fix/30344-ssl-context-names
tvernum Jun 15, 2018
cf2fdf0
Merge branch 'master' into fix/30344-ssl-context-names
tvernum Jun 18, 2018
42e3aa1
Fix test (feedback)
tvernum Jun 18, 2018
fb0505e
Merge branch 'master' into fix/30344-ssl-context-names
tvernum Jun 22, 2018
37cc028
Merge branch 'master' into fix/30344-ssl-context-names
tvernum Jun 26, 2018
817c565
Merge branch 'master' into fix/30344-ssl-context-names
tvernum Jul 9, 2018
2eb845a
Fix monitoring to work with dynamic SSL settings
tvernum Jul 9, 2018
2f6c87b
Merge branch 'master' into fix/30344-ssl-context-names
tvernum Jul 10, 2018
255a42e
Cleanup test static vars
tvernum Jul 10, 2018
8ea7e35
Address feedback from @jaymode (round 1)
tvernum Jul 10, 2018
e8d8299
Fix import
tvernum Jul 10, 2018
b11d61b
Rename test & context name
tvernum Jul 11, 2018
f4bab91
Remove more uses of sslConfiguration from settings
tvernum Jul 11, 2018
f637dc7
Merge branch 'master' into fix/30344-ssl-context-names
tvernum Jul 11, 2018
f774e6d
Remove remaining uses of deprecated methods
tvernum Jul 11, 2018
d1f3147
Don't use JKS keystore in test
tvernum Jul 11, 2018
44c4cf1
Fix broken test
tvernum Jul 11, 2018
9a0c026
Merge branch 'master' into fix/30344-ssl-context-names
tvernum Jul 12, 2018
bc3095e
Fix broken tests
tvernum Jul 12, 2018
9f6fa6d
Merge branch 'master' into fix/30344-ssl-context-names
tvernum Jul 13, 2018
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
Merge branch 'master' into fix/30344-ssl-context-names
  • Loading branch information
tvernum committed Jul 12, 2018
commit 9a0c0264bf482e0f2154bef7d437849b3a3439d2

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.