update genkeypair
This commit is contained in:
+22
-5
@@ -22,8 +22,8 @@ class CryptoUtil {
|
|||||||
return random
|
return random
|
||||||
}
|
}
|
||||||
|
|
||||||
fun generateKeyPair(keyId: String?): Pair<String, String> {
|
fun generateKeyPair(): Any {
|
||||||
val keyIdString = keyId ?: UUID.randomUUID().toString()
|
val keyIdString = UUID.randomUUID().toString()
|
||||||
|
|
||||||
val keyPairGen = KeyPairGenerator.getInstance("EC")
|
val keyPairGen = KeyPairGenerator.getInstance("EC")
|
||||||
keyPairGen.initialize(Curve.P_256.toECParameterSpec())
|
keyPairGen.initialize(Curve.P_256.toECParameterSpec())
|
||||||
@@ -44,9 +44,26 @@ class CryptoUtil {
|
|||||||
.algorithm(Algorithm.parse("ES256"))
|
.algorithm(Algorithm.parse("ES256"))
|
||||||
.build()
|
.build()
|
||||||
|
|
||||||
return Pair(
|
|
||||||
publicJwk.toString(),
|
return JWKPair(
|
||||||
privateJwk.toString()
|
JWK(
|
||||||
|
alg = privateJwk.algorithm.toString(),
|
||||||
|
kty = privateJwk.keyType.toString(),
|
||||||
|
crv = privateJwk.curve.toString(),
|
||||||
|
x = privateJwk.x.toString(),
|
||||||
|
y = privateJwk.y.toString(),
|
||||||
|
use = privateJwk.keyUse.toString(),
|
||||||
|
kid = privateJwk.keyID
|
||||||
|
),
|
||||||
|
JWK(
|
||||||
|
alg = publicJwk.algorithm.toString(),
|
||||||
|
kty = publicJwk.keyType.toString(),
|
||||||
|
crv = publicJwk.curve.toString(),
|
||||||
|
x = publicJwk.x.toString(),
|
||||||
|
y = publicJwk.y.toString(),
|
||||||
|
use = publicJwk.keyUse.toString(),
|
||||||
|
kid = publicJwk.keyID
|
||||||
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user