alg fixes

velocitycareerlabs · Feb 14, 2024 · 2cdc224 · 2cdc224
1 parent 8912cf4
commit 2cdc224
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/VCL/src/main/java/io/velocitycareerlabs/api/VCLSignatureAlgorithm.kt b/VCL/src/main/java/io/velocitycareerlabs/api/VCLSignatureAlgorithm.kt
@@ -29,7 +29,7 @@ enum class VCLSignatureAlgorithm(val value: String) {
             when (value) {
                 ES256.value -> ES256
                 SECP256k1.value -> SECP256k1
-                else -> ES256
+                else -> SECP256k1
             }
     }
 }
diff --git a/...ain/java/io/velocitycareerlabs/api/entities/initialization/VCLCryptoServicesDescriptor.kt b/...ain/java/io/velocitycareerlabs/api/entities/initialization/VCLCryptoServicesDescriptor.kt
@@ -12,7 +12,7 @@ import io.velocitycareerlabs.api.VCLSignatureAlgorithm
 
 data class VCLCryptoServicesDescriptor(
     val cryptoServiceType: VCLCryptoServiceType = VCLCryptoServiceType.Local,
-    val signatureAlgorithm: VCLSignatureAlgorithm = VCLSignatureAlgorithm.ES256,
+    val signatureAlgorithm: VCLSignatureAlgorithm = VCLSignatureAlgorithm.SECP256k1,
     val injectedCryptoServicesDescriptor: VCLInjectedCryptoServicesDescriptor? = null,
     val remoteCryptoServicesUrlsDescriptor: VCLRemoteCryptoServicesUrlsDescriptor? = null
 )
diff --git a/VCL/src/main/java/io/velocitycareerlabs/impl/GlobalConfig.kt b/VCL/src/main/java/io/velocitycareerlabs/impl/GlobalConfig.kt
@@ -17,7 +17,7 @@ internal object GlobalConfig {
 
     var CurrentEnvironment = VCLEnvironment.Prod
     var XVnfProtocolVersion = VCLXVnfProtocolVersion.XVnfProtocolVersion1
-    var SignatureAlgorithm = VCLSignatureAlgorithm.ES256
+    var SignatureAlgorithm = VCLSignatureAlgorithm.SECP256k1
 
     var IsDebugOn = false //BuildConfig.DEBUG
 

diff --git a/VCL/src/test/java/io/velocitycareerlabs/usecases/JwtServiceUseCaseTest.kt b/VCL/src/test/java/io/velocitycareerlabs/usecases/JwtServiceUseCaseTest.kt
@@ -81,6 +81,7 @@ internal class JwtServiceUseCaseTest {
         ) {
             it.handleResult(
                 { jwt ->
+                    assert(jwt.header?.toJSONObject()?.get("alg") as? String == VCLSignatureAlgorithm.SECP256k1.jwsAlgorithm.name)
                     assert(((jwt.header?.toJSONObject()?.get("jwk") as? Map<*, *>)!!["crv"] as? String) == VCLSignatureAlgorithm.SECP256k1.curve.name)
                     assert(jwt.header?.toJSONObject()?.get("typ") as? String == "JWT")
                 },
@@ -106,6 +107,7 @@ internal class JwtServiceUseCaseTest {
         ) {
             it.handleResult(
                 { jwt ->
+                    assert(jwt.header?.toJSONObject()?.get("alg") as? String == VCLSignatureAlgorithm.ES256.jwsAlgorithm.name)
                     assert(((jwt.header?.toJSONObject()?.get("jwk") as? Map<*, *>)!!["crv"] as? String) == VCLSignatureAlgorithm.ES256.curve.name)
                     assert(jwt.header?.toJSONObject()?.get("typ") as? String == "JWT")
                 },