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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring in the latest from golang/crypto upstream #42

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

brianmario
Copy link

馃憢 hello again!

I'm not sure if this is the way you normally do this, or if commits are cherry-picked more intentionally. So I thought I'd propose this and start the discussion on the best way to move forward.

We'd like to continue using the keybase fork of the golang/crypto repo for the other additions that have been added, but I also wanted to get things synced up so further work could be added based on top of it - specifically now that a ed25519 implementation exists upstream. I'd like to try and get support for that added to the openpgp package.

What do you think would be the best way forward?

FYI there were a handful of merge conflicts but I unfortunately didn't keep track of which files they were :\

@maxtaco
Copy link

maxtaco commented Jan 19, 2017

good idea, we should do this, we're just swamped right now with other stuff. will hopefully get to it soon.

@zapu
Copy link

zapu commented Jan 21, 2017

I can have a try with this once #40 is done

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants