Skip to content

cmd: Allows import of PEM/DER/JSON encoded keys #916

Merged
aeneasr merged 4 commits intomasterfrom
close-98
Jul 11, 2018
Merged

cmd: Allows import of PEM/DER/JSON encoded keys #916
aeneasr merged 4 commits intomasterfrom
close-98

Conversation

@aeneasr
Copy link
Copy Markdown
Member

@aeneasr aeneasr commented Jul 8, 2018 •
edited
Loading

To do:

arekkas added 3 commits July 8, 2018 14:20
jwk: Resolves minor issues in the HTTP handler
75c1c65 
Signed-off-by: arekkas <aeneas@ory.am>
cmd: Allows import of PEM/DER/JSON encoded keys
9ac87fd 
Closes #98

Signed-off-by: arekkas <aeneas@ory.am>
config: Add method that forces the endpoint url to be set
407a059 
Signed-off-by: arekkas <aeneas@ory.am>
vendor: Updates vendor lockfile
ddaf760 
Signed-off-by: arekkas <aeneas@ory.am>
@aeneasr aeneasr merged commit a6ec396 into master Jul 11, 2018
@aeneasr aeneasr deleted the close-98 branch July 11, 2018 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@aeneasr