feature: ssl: add new API methods for TLS-PSK#150
Open
vartiait wants to merge 8 commits intoopenresty:masterfrom
Open
feature: ssl: add new API methods for TLS-PSK#150vartiait wants to merge 8 commits intoopenresty:masterfrom
vartiait wants to merge 8 commits intoopenresty:masterfrom
Conversation
added 8 commits
October 9, 2017 17:48
…psk_key(). doc: added new API functions get_psk_identity() and set_psk_key() to ngx.ssl lib.
doc: Changed ssl_psk_by_lua* with ssl_certificate_by_lua*.
|
@vartiait Could you resolve the conflict? Thanks. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I hereby granted the copyright of the changes in this pull request
to the authors of this lua-resty-core project.
Adds following new methods to ngx.ssl for TLS-PSK support:
This is related to PR at lua-nginx-module/pull/1167