Skip to content

Commit f7d6ec8

Browse files
committed
Use correct JCA format for Signature algorithm name
Closes #33.
1 parent 0e4d5bd commit f7d6ec8

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/net/i2p/crypto/eddsa/EdDSAEngine.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@
6464
*
6565
*/
6666
public final class EdDSAEngine extends Signature {
67+
public static final String SIGNATURE_ALGORITHM = "NONEwithEdDSA";
68+
6769
private MessageDigest digest;
6870
private ByteArrayOutputStream baos;
6971
private EdDSAKey key;

src/net/i2p/crypto/eddsa/EdDSASecurityProvider.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
import java.security.Provider;
1717
import java.security.Security;
1818

19-
import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable;
20-
2119
/**
2220
* A security {@link Provider} that can be registered via {@link Security#addProvider(Provider)}
2321
*
@@ -43,6 +41,6 @@ protected void setup() {
4341
// see https://docs.oracle.com/javase/8/docs/technotes/guides/security/crypto/HowToImplAProvider.html
4442
put("KeyPairGenerator." + EdDSAKey.KEY_ALGORITHM, "net.i2p.crypto.eddsa.KeyPairGenerator");
4543
put("KeyFactory." + EdDSAKey.KEY_ALGORITHM, "net.i2p.crypto.eddsa.KeyFactory");
46-
put("Signature." + EdDSANamedCurveTable.CURVE_ED25519_SHA512, "net.i2p.crypto.eddsa.EdDSAEngine");
44+
put("Signature." + EdDSAEngine.SIGNATURE_ALGORITHM, "net.i2p.crypto.eddsa.EdDSAEngine");
4745
}
4846
}

test/net/i2p/crypto/eddsa/EdDSASecurityProviderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void canGetInstancesWhenProviderIsPresent() throws Exception {
3838

3939
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("EdDSA", "EdDSA");
4040
KeyFactory keyFac = KeyFactory.getInstance("EdDSA", "EdDSA");
41-
Signature sgr = Signature.getInstance("SHA512withEd25519", "EdDSA");
41+
Signature sgr = Signature.getInstance("NONEwithEdDSA", "EdDSA");
4242

4343
Security.removeProvider("EdDSA");
4444
}

0 commit comments

Comments
 (0)