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

Added support for shake-128/256 #43

Merged
merged 1 commit into from
Apr 24, 2017
Merged

Conversation

tabrath
Copy link
Contributor

@tabrath tabrath commented Feb 25, 2017

No extra dependencies, as it's in the sha3 package. Closes #20

@@ -0,0 +1,3 @@
{
"vsicons.presets.angular": false
Copy link
Member

Choose a reason for hiding this comment

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

Accidentally added this, mind removing? (can add to gitignore if you want)

Copy link
Member

@whyrusleeping whyrusleeping left a comment

Choose a reason for hiding this comment

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

Need to remove the vscode settings file, and then get these codes into the table at https://github.com/multiformats/multihash/blob/master/hashtable.csv

Thanks for all the work here :)

@whyrusleeping
Copy link
Member

Oh whoops, i thought these codes were missing, but i see them now.

Mind rebasing to fix the merge conflicts?

@tabrath tabrath force-pushed the feat/shake branch 5 times, most recently from 4372004 to 540f149 Compare March 9, 2017 23:32
@whyrusleeping
Copy link
Member

github doesnt make this merging easy... It seems after each PR of yours that i merge, there are conflicts in all the others. If you want, you can go ahead and put them all in the same PR, with separate commits for each change

Implemented support for Shake128/256
@tabrath
Copy link
Contributor Author

tabrath commented Apr 24, 2017

@whyrusleeping I've successfully rebased all my pr's now, hope you'll check them out soon :)

@Kubuxu Kubuxu merged commit 1a9dbc3 into multiformats:master Apr 24, 2017
@tabrath tabrath deleted the feat/shake branch April 24, 2017 12:46
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