Skip to content

EdDSAEngine.initVerify(): Handle any non-EdDSAPublicKey X.509-encoded pubkey #78

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

Merged
str4d merged 2 commits into from
Aug 4, 2019
Merged

EdDSAEngine.initVerify(): Handle any non-EdDSAPublicKey X.509-encoded pubkey #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35c34a5
EdDSAEngine.initVerify(): Handle any non-EdDSAPublicKey X.509-encoded…
str4d Jan 27, 2019
8d90c59
Travis CI: Use Trusty build environment
str4d Aug 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
language: java
dist: trusty

jdk:
- oraclejdk11
Expand Down
3 changes: 1 addition & 2 deletions src/net/i2p/crypto/eddsa/EdDSAEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import net.i2p.crypto.eddsa.math.Curve;
import net.i2p.crypto.eddsa.math.GroupElement;
import net.i2p.crypto.eddsa.math.ScalarOps;
import sun.security.x509.X509Key;

/**
* Signing and verification for EdDSA.
Expand Down Expand Up @@ -157,7 +156,7 @@ protected void engineInitVerify(PublicKey publicKey) throws InvalidKeyException
}
} else if (!key.getParams().getHashAlgorithm().equals(digest.getAlgorithm()))
throw new InvalidKeyException("Key hash algorithm does not match chosen digest");
} else if (publicKey instanceof X509Key) {
} else if (publicKey.getFormat().equals("X.509")) {
// X509Certificate will sometimes contain an X509Key rather than the EdDSAPublicKey itself; the contained
// key is valid but needs to be instanced as an EdDSAPublicKey before it can be used.
EdDSAPublicKey parsedPublicKey;
Expand Down