Skip to content

Commit 0ab2aea

Browse files
peacekeeperpeacekeeper
committed
fix: Use newer version of nimbus-jose-jwt, and replace "P-256K" with "P-256K".
Signed-off-by: Markus Sabadello <markus@danubetech.com>
1 parent b453f6f commit 0ab2aea

File tree

5 files changed

+33
-33
lines changed

5 files changed

+33
-33
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<dependency>
8989
<groupId>com.nimbusds</groupId>
9090
<artifactId>nimbus-jose-jwt</artifactId>
91-
<version>8.2.1</version>
91+
<version>8.11</version>
9292
<scope>compile</scope>
9393
</dependency>
9494
<dependency>

‎src/main/java/com/danubetech/keyformats/JWKToPrivateKey.java‎ renamed to ‎src/main/java/com/danubetech/keyformats/JWK_to_PrivateKey.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,49 +12,49 @@
1212
import com.nimbusds.jose.jwk.KeyType;
1313
import com.nimbusds.jose.jwk.RSAKey;
1414

15-
public class JWKToPrivateKey {
15+
public class JWK_to_PrivateKey {
1616

17-
public static Object JWKToAnyPrivateKey(JWK jsonWebKey) throws JOSEException {
17+
public static Object JWK_to_anyPrivateKey(JWK jsonWebKey) throws JOSEException {
1818

19-
String keyType = JWKKeyTypes.keyTypeForJWK(jsonWebKey);
19+
String keyType = JWKKeyTypes.keyType_for_JWK(jsonWebKey);
2020

2121
if (KeyType.RSA.getValue().equals(keyType))
22-
return JWKToRSAPrivateKey(jsonWebKey);
23-
else if (Curve.P_256K.getName().equals(keyType))
24-
return JWKToP_256KPrivateKey(jsonWebKey);
22+
return JWK_to_RSAPrivateKey(jsonWebKey);
23+
else if (Curve.SECP256K1.getName().equals(keyType))
24+
return JWK_to_secp256k1PrivateKey(jsonWebKey);
2525
else if (Curve.Ed25519.getName().equals(keyType))
26-
return JWKToEd25519PrivateKeyBytes(jsonWebKey);
26+
return JWK_to_Ed25519PrivateKeyBytes(jsonWebKey);
2727
else if (Curve.X25519.getName().equals(keyType))
28-
return JWKToX25519PrivateKeyBytes(jsonWebKey);
28+
return JWK_to_X25519PrivateKeyBytes(jsonWebKey);
2929
else
3030
throw new IllegalArgumentException("Unsupported key type: " + keyType);
3131
}
3232

33-
public static RSAPrivateKey JWKToRSAPrivateKey(JWK jsonWebKey) throws JOSEException {
33+
public static RSAPrivateKey JWK_to_RSAPrivateKey(JWK jsonWebKey) throws JOSEException {
3434

3535
if (! KeyType.RSA.equals(jsonWebKey.getKeyType())) throw new IllegalArgumentException("Incorrect key type: " + jsonWebKey.getKeyType());
3636

3737
return (RSAPrivateKey) RSAKeyUtils.toRSAPrivateKey((RSAKey) jsonWebKey);
3838
}
3939

40-
public static ECKey JWKToP_256KPrivateKey(JWK jsonWebKey) throws JOSEException {
40+
public static ECKey JWK_to_secp256k1PrivateKey(JWK jsonWebKey) throws JOSEException {
4141

42-
byte[] privateKeyBytes = JWKToP_256KPrivateKeyBytes(jsonWebKey);
42+
byte[] privateKeyBytes = JWK_to_secp256k1PrivateKeyBytes(jsonWebKey);
4343

4444
return ECKey.fromPrivate(privateKeyBytes);
4545
}
4646

47-
public static byte[] JWKToP_256KPrivateKeyBytes(JWK jsonWebKey) throws JOSEException {
47+
public static byte[] JWK_to_secp256k1PrivateKeyBytes(JWK jsonWebKey) throws JOSEException {
4848

4949
if (! KeyType.EC.equals(jsonWebKey.getKeyType())) throw new IllegalArgumentException("Incorrect key type: " + jsonWebKey.getKeyType());
5050

5151
com.nimbusds.jose.jwk.ECKey ecKey = (com.nimbusds.jose.jwk.ECKey) jsonWebKey;
52-
if (! Curve.P_256K.equals(ecKey.getCurve())) throw new IllegalArgumentException("Incorrect curve: " + ecKey.getCurve());
52+
if (! Curve.SECP256K1.equals(ecKey.getCurve())) throw new IllegalArgumentException("Incorrect curve: " + ecKey.getCurve());
5353

5454
return ecKey.getD().decode();
5555
}
5656

57-
public static byte[] JWKToEd25519PrivateKeyBytes(JWK jsonWebKey) {
57+
public static byte[] JWK_to_Ed25519PrivateKeyBytes(JWK jsonWebKey) {
5858

5959
if (! KeyType.OKP.equals(jsonWebKey.getKeyType())) throw new IllegalArgumentException("Incorrect key type: " + jsonWebKey.getKeyType());
6060

@@ -68,7 +68,7 @@ public static byte[] JWKToEd25519PrivateKeyBytes(JWK jsonWebKey) {
6868
return privateKeyBytes;
6969
}
7070

71-
public static byte[] JWKToX25519PrivateKeyBytes(JWK jsonWebKey) {
71+
public static byte[] JWK_to_X25519PrivateKeyBytes(JWK jsonWebKey) {
7272

7373
if (! KeyType.OKP.equals(jsonWebKey.getKeyType())) throw new IllegalArgumentException("Incorrect key type: " + jsonWebKey.getKeyType());
7474

‎src/main/java/com/danubetech/keyformats/PrivateKeyToJWK.java‎ renamed to ‎src/main/java/com/danubetech/keyformats/PrivateKey_to_JWK.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import com.nimbusds.jose.jwk.KeyUse;
1212
import com.nimbusds.jose.util.Base64URL;
1313

14-
public class PrivateKeyToJWK {
14+
public class PrivateKey_to_JWK {
1515

16-
public static com.nimbusds.jose.jwk.RSAKey RSAPrivateKeyToJWK(RSAPrivateKey privateKey, RSAPublicKey publicKey, String kid, String use) {
16+
public static com.nimbusds.jose.jwk.RSAKey RSAPrivateKey_to_JWK(RSAPrivateKey privateKey, RSAPublicKey publicKey, String kid, String use) {
1717

1818
com.nimbusds.jose.jwk.RSAKey jsonWebKey = new com.nimbusds.jose.jwk.RSAKey.Builder(publicKey)
1919
.privateKey(privateKey)
@@ -24,15 +24,15 @@ public static com.nimbusds.jose.jwk.RSAKey RSAPrivateKeyToJWK(RSAPrivateKey priv
2424
return jsonWebKey;
2525
}
2626

27-
public static com.nimbusds.jose.jwk.ECKey P_256KPrivateKeyToJWK(ECKey privateKey, String kid, String use) {
27+
public static com.nimbusds.jose.jwk.ECKey secp256k1PrivateKey_to_JWK(ECKey privateKey, String kid, String use) {
2828

2929
ECPoint publicKeyPoint = privateKey.getPubKeyPoint();
3030
byte[] privateKeyBytes = privateKey.getPrivKeyBytes();
3131
Base64URL xParameter = Base64URL.encode(publicKeyPoint.getAffineXCoord().getEncoded());
3232
Base64URL yParameter = Base64URL.encode(publicKeyPoint.getAffineYCoord().getEncoded());
3333
Base64URL dParameter = Base64URL.encode(privateKeyBytes);
3434

35-
com.nimbusds.jose.jwk.ECKey jsonWebKey = new com.nimbusds.jose.jwk.ECKey.Builder(Curve.P_256K, xParameter, yParameter)
35+
com.nimbusds.jose.jwk.ECKey jsonWebKey = new com.nimbusds.jose.jwk.ECKey.Builder(Curve.SECP256K1, xParameter, yParameter)
3636
.d(dParameter)
3737
.keyID(kid)
3838
.keyUse(use == null ? null : new KeyUse(use))
@@ -41,14 +41,14 @@ public static com.nimbusds.jose.jwk.ECKey P_256KPrivateKeyToJWK(ECKey privateKey
4141
return jsonWebKey;
4242
}
4343

44-
public static com.nimbusds.jose.jwk.ECKey P_256KPrivateKeyBytesToJWK(byte[] privateKeyBytes, String kid, String use) {
44+
public static com.nimbusds.jose.jwk.ECKey secp256k1PrivateKeyBytes_to_JWK(byte[] privateKeyBytes, String kid, String use) {
4545

4646
ECKey privateKey = ECKey.fromPrivate(privateKeyBytes);
4747

48-
return P_256KPrivateKeyToJWK(privateKey, kid, use);
48+
return secp256k1PrivateKey_to_JWK(privateKey, kid, use);
4949
}
5050

51-
public static com.nimbusds.jose.jwk.OctetKeyPair Ed25519PrivateKeyBytesToJWK(byte[] privateKeyBytes, byte[] publicKeyBytes, String kid, String use) {
51+
public static com.nimbusds.jose.jwk.OctetKeyPair Ed25519PrivateKeyBytes_to_JWK(byte[] privateKeyBytes, byte[] publicKeyBytes, String kid, String use) {
5252

5353
byte[] onlyPrivateKeyBytes = Arrays.copyOf(privateKeyBytes, 32);
5454
Base64URL xParameter = Base64URL.encode(publicKeyBytes);
@@ -63,7 +63,7 @@ public static com.nimbusds.jose.jwk.OctetKeyPair Ed25519PrivateKeyBytesToJWK(byt
6363
return jsonWebKey;
6464
}
6565

66-
public static com.nimbusds.jose.jwk.OctetKeyPair X25519PrivateKeyBytesToJWK(byte[] privateKeyBytes, byte[] publicKeyBytes, String kid, String use) {
66+
public static com.nimbusds.jose.jwk.OctetKeyPair X25519PrivateKeyBytes_to_JWK(byte[] privateKeyBytes, byte[] publicKeyBytes, String kid, String use) {
6767

6868
byte[] onlyPrivateKeyBytes = Arrays.copyOf(privateKeyBytes, 32);
6969
Base64URL xParameter = Base64URL.encode(publicKeyBytes);

‎src/main/java/com/danubetech/keyformats/PublicKeyToJWK.java‎ renamed to ‎src/main/java/com/danubetech/keyformats/PublicKey_to_JWK.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import com.nimbusds.jose.jwk.KeyUse;
1111
import com.nimbusds.jose.util.Base64URL;
1212

13-
public class PublicKeyToJWK {
13+
public class PublicKey_to_JWK {
1414

15-
public static JWK RSAPublicKeyToJWK(RSAPublicKey publicKey, String kid, String use) {
15+
public static JWK RSAPublicKey_to_JWK(RSAPublicKey publicKey, String kid, String use) {
1616

1717
JWK jsonWebKey = new com.nimbusds.jose.jwk.RSAKey.Builder(publicKey)
1818
.keyID(kid)
@@ -22,28 +22,28 @@ public static JWK RSAPublicKeyToJWK(RSAPublicKey publicKey, String kid, String u
2222
return jsonWebKey;
2323
}
2424

25-
public static JWK P_256KPublicKeyToJWK(ECKey publicKey, String kid, String use) {
25+
public static JWK secp256k1PublicKey_to_JWK(ECKey publicKey, String kid, String use) {
2626

2727
ECPoint publicKeyPoint = publicKey.getPubKeyPoint();
2828
Base64URL xParameter = Base64URL.encode(publicKeyPoint.getAffineXCoord().getEncoded());
2929
Base64URL yParameter = Base64URL.encode(publicKeyPoint.getAffineYCoord().getEncoded());
3030

31-
JWK jsonWebKey = new com.nimbusds.jose.jwk.ECKey.Builder(Curve.P_256K, xParameter, yParameter)
31+
JWK jsonWebKey = new com.nimbusds.jose.jwk.ECKey.Builder(Curve.SECP256K1, xParameter, yParameter)
3232
.keyID(kid)
3333
.keyUse(use == null ? null : new KeyUse(use))
3434
.build();
3535

3636
return jsonWebKey;
3737
}
3838

39-
public static JWK P_256KPublicKeyBytesToJWK(byte[] publicKeyBytes, String kid, String use) {
39+
public static JWK secp256k1PublicKeyBytes_to_JWK(byte[] publicKeyBytes, String kid, String use) {
4040

4141
ECKey publicKey = ECKey.fromPublicOnly(publicKeyBytes);
4242

43-
return P_256KPublicKeyToJWK(publicKey, kid, use);
43+
return secp256k1PublicKey_to_JWK(publicKey, kid, use);
4444
}
4545

46-
public static JWK Ed25519PublicKeyBytesToJWK(byte[] publicKeyBytes, String kid, String use) {
46+
public static JWK Ed25519PublicKeyBytes_to_JWK(byte[] publicKeyBytes, String kid, String use) {
4747

4848
Base64URL xParameter = Base64URL.encode(publicKeyBytes);
4949

@@ -55,7 +55,7 @@ public static JWK Ed25519PublicKeyBytesToJWK(byte[] publicKeyBytes, String kid,
5555
return jsonWebKey;
5656
}
5757

58-
public static JWK X25519PublicKeyBytesToJWK(byte[] publicKeyBytes, String kid, String use) {
58+
public static JWK X25519PublicKeyBytes_to_JWK(byte[] publicKeyBytes, String kid, String use) {
5959

6060
Base64URL xParameter = Base64URL.encode(publicKeyBytes);
6161

‎src/main/java/com/danubetech/keytypes/JWKKeyTypes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
public class JWKKeyTypes {
99

10-
public static String keyTypeForJWK(JWK jsonWebKey) {
10+
public static String keyType_for_JWK(JWK jsonWebKey) {
1111

1212
if (KeyType.RSA.equals(jsonWebKey.getKeyType()))
1313
return jsonWebKey.getKeyType().getValue();

0 commit comments

Comments
 (0)