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

Fix 'key' option in s_server can be in ENGINE keyform (master) #4405

Closed
wants to merge 1 commit into from

Conversation

deemru
Copy link
Contributor

@deemru deemru commented Sep 22, 2017

Basically it is a reflection of key in s_client.c: https://github.com/openssl/openssl/blob/master/apps/s_client.c#L626

@deemru deemru changed the title Fix 'key' option in s_server can be in ENGINE keyform Fix 'key' option in s_server can be in ENGINE keyform (master) Sep 22, 2017
@snhenson snhenson added the approval: review pending This pull request needs review by a committer label Sep 22, 2017
@snhenson snhenson closed this Sep 23, 2017
levitte pushed a commit that referenced this pull request Sep 23, 2017
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Stephen Henson <steve@openssl.org>
(Merged from #4405)
@dot-asm
Copy link
Contributor

dot-asm commented Sep 23, 2017

This is totally cherry-pick-able to 1.1.0. I meas suggestion is to cherry-pick this to 1.1.0 and just close #4404.

@dot-asm dot-asm reopened this Sep 23, 2017
@dot-asm dot-asm added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Sep 23, 2017
levitte pushed a commit that referenced this pull request Sep 23, 2017
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Stephen Henson <steve@openssl.org>
(Merged from #4405)

(cherry picked from commit 75c445e)
@dot-asm dot-asm added 1.1.0 branch: master Merge to master branch labels Sep 23, 2017
@dot-asm
Copy link
Contributor

dot-asm commented Sep 23, 2017

But wait for travis...

@dot-asm
Copy link
Contributor

dot-asm commented Sep 23, 2017

But wait for travis...

Well, it's kind of meaningless request, because travis won't run 1.1.0 tests. Sorry about confusion. What I was alarmed by was that https://travis-ci.org/openssl/openssl/branches suggests that #4406 triggers some problem in extended tests, and it looks as if this request "adds" failure in 1st test...

@dot-asm dot-asm closed this Sep 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval: done This pull request has the required number of approvals branch: master Merge to master branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants