search

RustCrypto / PAKEs

Password-Authenticated Key Agreement protocols
106 stars 35 forks source link

Add spake2 #3

Closed warner closed 6 years ago

warner commented 6 years ago

This does a "git subtree add", moving the entire history of https://github.com/warner/spake2.rs into the spake2/ subdirectory of this repo. I think that's the appropriate thing to do.. it makes the history look a little funky (there are now two unparented commits, not just the usual one original commit), but it keeps all the revision IDs identical.

If this seems reasonable and we land it, I'll add tags next (with names like spake2-0.1.0), and then update the travis config, then the READMEs.

newpavlov commented 6 years ago

Argh, I've squashed and merged this PR. Do you think I should revert and merge it instead? Maybe it's worth to archive warner/spake2.rs. (considering that already published versions point to it)

warner commented 6 years ago

Yeah, if you don't mind reverting it, it might be nice to include the history in the repo going forward. Especially the release tags.

If you don't feel comfortable with a force-push, you could revert just the last commit (leaving both forward and backwards commits in the history, but restoring the tree contents to those from the srp-v0.2.5 tag (1afa40d)). Then I can re-run the git subtree add and file a new PR.

newpavlov commented 6 years ago

I think I've merged it correctly, can you check it to be safe?

warner commented 6 years ago

Yep, looks like you force-pushed the original a23222c commit. The tree looks fine to me now. Thanks!

I'll add the spake2 tags later today, and will look at the travis situation too. What's our pattern for tag names.. would it be spake2-0.1.0, or spake2_0.1.0, or spake2-v0.1.0?

newpavlov commented 6 years ago

Currently it's spake2-v0.1.0. Previously I was using crate_x.y.z, but I plan to rename them one day.

warner commented 6 years ago

ok, tags pushed. I'll look at travis and file a PR later.

newpavlov commented 6 years ago

I've update readme a bit. BTW how about re-licensing spake2 under dual MIT OR Apache-2.0 license for uniformity?

warner commented 6 years ago

Done. The badges won't get updated until we push a new release and crates.io sees the change. I fixed the srp/Cargo.toml to point at the correct repo to (PAKEs instead of PAKE).

I'll try to push a new release tonight or tomorrow.