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

Jump to bottom

CLI: make self-encryption optional #1606

Merged
merged 2 commits into from
Dec 30, 2015
Merged

CLI: make self-encryption optional #1606

merged 2 commits into from
Dec 30, 2015

Conversation

maxtaco
Copy link
Contributor

@maxtaco maxtaco commented Dec 29, 2015

  • plumb options through to engine
  • tested successfully via the command line
  • test in engine/
  • fix C/I tests for new encryption arg format

@maxtaco
CLI: make self-encryption optional
42c2555 
- plumb options through to engine
- tested successfully via the command line
- test in engine/
- fix C/I tests for new encryption arg format
@maxtaco
Copy link
Contributor Author

maxtaco commented Dec 29, 2015

@akalin-keybase here is the new PR

akalin-keybase
akalin-keybase reviewed Dec 30, 2015
View reviewed changes
go/engine/saltpack_decrypt.go
@@ -71,5 +78,8 @@ func (e *SaltPackDecrypt) Run(ctx *Context) (err error) {
return libkb.KeyCannotDecryptError{}
}

return libkb.SaltPackDecrypt(e.arg.Source, e.arg.Sink, kp)
e.G().Log.Debug("| run SaltPackDecrypt")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these logs seem redundant to the ones at the top of the function...

@akalin-keybase
Copy link
Contributor

lgtm after nit!

maxtaco added a commit that referenced this pull request Dec 30, 2015
@maxtaco
Merge pull request #1606 from keybase/maxtaco/CORE-2143
996786e 
CLI: make self-encryption optional
@maxtaco maxtaco merged commit 996786e into master Dec 30, 2015
@maxtaco maxtaco deleted the maxtaco/CORE-2143 branch December 30, 2015 14:00
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.
2 participants
@maxtaco @akalin-keybase