fix: Change curve name from P-256 to secp256k1.

Signed-off-by: Markus Sabadello <[email protected]>
WebOfTrustInfo · Apr 3, 2020 · 0bf14dc · 0bf14dc
1 parent 53b2b3e
commit 0bf14dc
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ Example Usage of `PrivateKeySignerFactory`:
 
       // keytype must be one of the following
       String keyType = "RSA";
-      String keyType = "P-256K";
+      String keyType = "secp256k1";
       String keyType = "Ed25519";
       
       // algorithm must be one of the following

diff --git a/src/main/java/info/weboftrust/ldsignatures/crypto/PrivateKeySignerFactory.java b/src/main/java/info/weboftrust/ldsignatures/crypto/PrivateKeySignerFactory.java
@@ -10,7 +10,7 @@
 import com.nimbusds.jose.jwk.KeyType;
 
 import info.weboftrust.ldsignatures.crypto.impl.Ed25519_EdDSA_PrivateKeySigner;
-import info.weboftrust.ldsignatures.crypto.impl.P256K_ES256K_PrivateKeySigner;
+import info.weboftrust.ldsignatures.crypto.impl.secp256k1_ES256K_PrivateKeySigner;
 import info.weboftrust.ldsignatures.crypto.impl.RSA_PS256_PrivateKeySigner;
 import info.weboftrust.ldsignatures.crypto.impl.RSA_RS256_PrivateKeySigner;
 
@@ -26,9 +26,9 @@ public static PrivateKeySigner<?> privateKeySignerForKey(String keyType, String
 
 			if (JWSAlgorithm.RS256.getName().equals(algorithm)) return new RSA_RS256_PrivateKeySigner((RSAPrivateKey) privateKey);
 			if (JWSAlgorithm.PS256.getName().equals(algorithm)) return new RSA_PS256_PrivateKeySigner((RSAPrivateKey) privateKey);
-		} else if (Curve.P_256K.getName().equals(keyType)) {
+		} else if (Curve.SECP256K1.getName().equals(keyType)) {
 
-			if (JWSAlgorithm.ES256K.getName().equals(algorithm)) return new P256K_ES256K_PrivateKeySigner((ECKey) privateKey);
+			if (JWSAlgorithm.ES256K.getName().equals(algorithm)) return new secp256k1_ES256K_PrivateKeySigner((ECKey) privateKey);
 		} else if (Curve.Ed25519.getName().equals(keyType)) {
 
 			if (JWSAlgorithm.EdDSA.getName().equals(algorithm)) return new Ed25519_EdDSA_PrivateKeySigner((byte[]) privateKey);

diff --git a/src/main/java/info/weboftrust/ldsignatures/crypto/PublicKeyVerifierFactory.java b/src/main/java/info/weboftrust/ldsignatures/crypto/PublicKeyVerifierFactory.java
@@ -10,7 +10,7 @@
 import com.nimbusds.jose.jwk.KeyType;
 
 import info.weboftrust.ldsignatures.crypto.impl.Ed25519_EdDSA_PublicKeyVerifier;
-import info.weboftrust.ldsignatures.crypto.impl.P256K_ES256K_PublicKeyVerifier;
+import info.weboftrust.ldsignatures.crypto.impl.secp256k1_ES256K_PublicKeyVerifier;
 import info.weboftrust.ldsignatures.crypto.impl.RSA_PS256_PublicKeyVerifier;
 import info.weboftrust.ldsignatures.crypto.impl.RSA_RS256_PublicKeyVerifier;
 
@@ -26,9 +26,9 @@ public static PublicKeyVerifier<?> publicKeyVerifierForKey(String keyType, Strin
 
 			if (JWSAlgorithm.RS256.getName().equals(algorithm)) return new RSA_RS256_PublicKeyVerifier((RSAPublicKey) publicKey);
 			if (JWSAlgorithm.PS256.getName().equals(algorithm)) return new RSA_PS256_PublicKeyVerifier((RSAPublicKey) publicKey);
-		} else if (Curve.P_256K.getName().equals(keyType)) {
+		} else if (Curve.SECP256K1.getName().equals(keyType)) {
 
-			if (JWSAlgorithm.ES256K.getName().equals(algorithm)) return new P256K_ES256K_PublicKeyVerifier((ECKey) publicKey);
+			if (JWSAlgorithm.ES256K.getName().equals(algorithm)) return new secp256k1_ES256K_PublicKeyVerifier((ECKey) publicKey);
 		} else if (Curve.Ed25519.getName().equals(keyType)) {
 
 			if (JWSAlgorithm.EdDSA.getName().equals(algorithm)) return new Ed25519_EdDSA_PublicKeyVerifier((byte[]) publicKey);

diff --git a/...o/impl/P256K_ES256K_PrivateKeySigner.java → ...pl/secp256k1_ES256K_PrivateKeySigner.java b/...o/impl/P256K_ES256K_PrivateKeySigner.java → ...pl/secp256k1_ES256K_PrivateKeySigner.java
@@ -7,9 +7,9 @@
 
 import info.weboftrust.ldsignatures.crypto.PrivateKeySigner;
 
-public class P256K_ES256K_PrivateKeySigner extends PrivateKeySigner<ECKey> {
+public class secp256k1_ES256K_PrivateKeySigner extends PrivateKeySigner<ECKey> {
 
-	public P256K_ES256K_PrivateKeySigner(ECKey privateKey) {
+	public secp256k1_ES256K_PrivateKeySigner(ECKey privateKey) {
 
 		super(privateKey, "ES256K");
 	}

diff --git a/.../impl/P256K_ES256K_PublicKeyVerifier.java → ...l/secp256k1_ES256K_PublicKeyVerifier.java b/.../impl/P256K_ES256K_PublicKeyVerifier.java → ...l/secp256k1_ES256K_PublicKeyVerifier.java
@@ -8,9 +8,9 @@
 
 import info.weboftrust.ldsignatures.crypto.PublicKeyVerifier;
 
-public class P256K_ES256K_PublicKeyVerifier extends PublicKeyVerifier<ECKey> {
+public class secp256k1_ES256K_PublicKeyVerifier extends PublicKeyVerifier<ECKey> {
 
-	public P256K_ES256K_PublicKeyVerifier(ECKey publicKey) {
+	public secp256k1_ES256K_PublicKeyVerifier(ECKey publicKey) {
 
 		super(publicKey, "ES256K");
 	}

diff --git a/src/main/java/info/weboftrust/ldsignatures/signer/EcdsaKoblitzSignature2016LdSigner.java b/src/main/java/info/weboftrust/ldsignatures/signer/EcdsaKoblitzSignature2016LdSigner.java
@@ -13,7 +13,7 @@
 
 import info.weboftrust.ldsignatures.crypto.ByteSigner;
 import info.weboftrust.ldsignatures.crypto.adapter.JWSSignerAdapter;
-import info.weboftrust.ldsignatures.crypto.impl.P256K_ES256K_PrivateKeySigner;
+import info.weboftrust.ldsignatures.crypto.impl.secp256k1_ES256K_PrivateKeySigner;
 import info.weboftrust.ldsignatures.suites.EcdsaKoblitzSignature2016SignatureSuite;
 import info.weboftrust.ldsignatures.suites.SignatureSuites;
 import info.weboftrust.ldsignatures.util.JWSUtil;
@@ -27,7 +27,7 @@ public EcdsaKoblitzSignature2016LdSigner(ByteSigner signer) {
 
 	public EcdsaKoblitzSignature2016LdSigner(ECKey privateKey) {
 
-		this(new P256K_ES256K_PrivateKeySigner(privateKey));
+		this(new secp256k1_ES256K_PrivateKeySigner(privateKey));
 	}
 
 	public EcdsaKoblitzSignature2016LdSigner() {

diff --git a/src/main/java/info/weboftrust/ldsignatures/signer/EcdsaSecp256k1Signature2019LdSigner.java b/src/main/java/info/weboftrust/ldsignatures/signer/EcdsaSecp256k1Signature2019LdSigner.java
@@ -13,7 +13,7 @@
 
 import info.weboftrust.ldsignatures.crypto.ByteSigner;
 import info.weboftrust.ldsignatures.crypto.adapter.JWSSignerAdapter;
-import info.weboftrust.ldsignatures.crypto.impl.P256K_ES256K_PrivateKeySigner;
+import info.weboftrust.ldsignatures.crypto.impl.secp256k1_ES256K_PrivateKeySigner;
 import info.weboftrust.ldsignatures.suites.EcdsaSecp256k1Signature2019SignatureSuite;
 import info.weboftrust.ldsignatures.suites.SignatureSuites;
 import info.weboftrust.ldsignatures.util.JWSUtil;
@@ -27,7 +27,7 @@ public EcdsaSecp256k1Signature2019LdSigner(ByteSigner signer) {
 
 	public EcdsaSecp256k1Signature2019LdSigner(ECKey privateKey) {
 
-		this(new P256K_ES256K_PrivateKeySigner(privateKey));
+		this(new secp256k1_ES256K_PrivateKeySigner(privateKey));
 	}
 
 	public EcdsaSecp256k1Signature2019LdSigner() {

diff --git a/src/main/java/info/weboftrust/ldsignatures/verifier/EcdsaKoblitzSignature2016LdVerifier.java b/src/main/java/info/weboftrust/ldsignatures/verifier/EcdsaKoblitzSignature2016LdVerifier.java
@@ -13,7 +13,7 @@
 import info.weboftrust.ldsignatures.LdSignature;
 import info.weboftrust.ldsignatures.crypto.ByteVerifier;
 import info.weboftrust.ldsignatures.crypto.adapter.JWSVerifierAdapter;
-import info.weboftrust.ldsignatures.crypto.impl.P256K_ES256K_PublicKeyVerifier;
+import info.weboftrust.ldsignatures.crypto.impl.secp256k1_ES256K_PublicKeyVerifier;
 import info.weboftrust.ldsignatures.suites.EcdsaKoblitzSignature2016SignatureSuite;
 import info.weboftrust.ldsignatures.suites.SignatureSuites;
 import info.weboftrust.ldsignatures.util.JWSUtil;
@@ -27,7 +27,7 @@ public EcdsaKoblitzSignature2016LdVerifier(ByteVerifier verifier) {
 
 	public EcdsaKoblitzSignature2016LdVerifier(ECKey publicKey) {
 
-		this(new P256K_ES256K_PublicKeyVerifier(publicKey));
+		this(new secp256k1_ES256K_PublicKeyVerifier(publicKey));
 	}
 
 	public EcdsaKoblitzSignature2016LdVerifier() {

diff --git a/...ain/java/info/weboftrust/ldsignatures/verifier/EcdsaSecp256k1Signature2019LdVerifier.java b/...ain/java/info/weboftrust/ldsignatures/verifier/EcdsaSecp256k1Signature2019LdVerifier.java
@@ -13,7 +13,7 @@
 import info.weboftrust.ldsignatures.LdSignature;
 import info.weboftrust.ldsignatures.crypto.ByteVerifier;
 import info.weboftrust.ldsignatures.crypto.adapter.JWSVerifierAdapter;
-import info.weboftrust.ldsignatures.crypto.impl.P256K_ES256K_PublicKeyVerifier;
+import info.weboftrust.ldsignatures.crypto.impl.secp256k1_ES256K_PublicKeyVerifier;
 import info.weboftrust.ldsignatures.suites.EcdsaSecp256k1Signature2019SignatureSuite;
 import info.weboftrust.ldsignatures.suites.SignatureSuites;
 import info.weboftrust.ldsignatures.util.JWSUtil;
@@ -27,7 +27,7 @@ public EcdsaSecp256k1Signature2019LdVerifier(ByteVerifier verifier) {
 
 	public EcdsaSecp256k1Signature2019LdVerifier(ECKey publicKey) {
 
-		this(new P256K_ES256K_PublicKeyVerifier(publicKey));
+		this(new secp256k1_ES256K_PublicKeyVerifier(publicKey));
 	}
 
 	public EcdsaSecp256k1Signature2019LdVerifier() {