Skip to content

Comments

Update net.i2p.crypto.eddsa to 0.2.0#35

Merged
kruton merged 3 commits intoconnectbot:masterfrom
open-keychain:eddsa
Apr 6, 2018
Merged

Update net.i2p.crypto.eddsa to 0.2.0#35
kruton merged 3 commits intoconnectbot:masterfrom
open-keychain:eddsa

Conversation

@hagau
Copy link
Contributor

@hagau hagau commented Dec 19, 2017

Update net.i2p.crypto.eddsa to 0.2.0 to allow loading keys with the new OIDs from draft-ietf-curdle-pkix.
This overrides dependency of net.vrallev.ecc.ecc-25519-java on eddsa-0.1.0.

net.vrallev.ecc.ecc-25519-java is probably not going to get updated anytime soon, since it has been deprecated.

@jellelicht
Copy link

Could this and #34 be merged? The CI-failures seem related to old Java version and not indicative of any real issues.

as dependency of net.vrallev.ecc.ecc-25519-java
@jplitza
Copy link

jplitza commented Apr 5, 2018

I have two questions:

  1. Is this at all related to the interaction with OpenKeychain? It doesn't look that way to me.
  2. Is this really cleaner? Now we have an constant defined at three different places, where previously we had the same constant in all three places.

@hagau
Copy link
Contributor Author

hagau commented Apr 5, 2018

@jplitza

  1. Yes, this is necessary for proper EdDSA support since OpenKeychain uses net.i2p.crypto.eddsa-0.2.0, which doesn't allow generation of EdDSA keys with the old OID, only import. (I think that was the reason, it's been a while)
  2. Thanks, I somehow overlooked that. I've moved the constant into Ed25519Verify.


return new EdDSAPublicKey(new EdDSAPublicKeySpec(keyBytes,
EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512)));
return new EdDSAPublicKey(new EdDSAPublicKeySpec(keyBytes, EdDSANamedCurveTable.getByName(ED25519_CURVE_NAME) ));
Copy link
Member

Choose a reason for hiding this comment

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

nit: extra space between closing parathenses.

@stickler-ci
Copy link

I couldn't find a .stickler.yml file in this repository. I can make one for you, or you can create one by following the documentation.

@CLAassistant
Copy link

CLAassistant commented Apr 6, 2018

CLA assistant check
All committers have signed the CLA.

@dschuermann
Copy link

@kruton I was wondering about the CLA. Is it new?

Can you put a LICENSE file in the sshlib repo to clarify the status of this library? Assuming from some headers, it should be Apache v2.

@kruton
Copy link
Member

kruton commented Apr 6, 2018

Ah, I should fix any headers... probably IDE auto-inserted. It's 3-Clause BSD originally.

@kruton kruton merged commit 1f62f66 into connectbot:master Apr 6, 2018
@hagau hagau deleted the eddsa branch April 25, 2018 18:11
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.

7 participants