pr feedback

Author: xinsong-cui

runtime/runtime-core/api/runtime-core.api

@@ -726,16 +726,11 @@ public final class aws/smithy/kotlin/runtime/hashing/Crc32cKt {
 }
 
 public final class aws/smithy/kotlin/runtime/hashing/EcdsaJVMKt {
-	public static final fun ecdsaSecp256r1 ([B[BLaws/smithy/kotlin/runtime/hashing/EcdsaSignatureType;)[B
-	public static synthetic fun ecdsaSecp256r1$default ([B[BLaws/smithy/kotlin/runtime/hashing/EcdsaSignatureType;ILjava/lang/Object;)[B
+	public static final fun ecdsaSecp256r1 ([B[B)[B
 }
 
-public final class aws/smithy/kotlin/runtime/hashing/EcdsaSignatureType : java/lang/Enum {
-	public static final field ASN1_DER Laws/smithy/kotlin/runtime/hashing/EcdsaSignatureType;
-	public static final field RAW_RS Laws/smithy/kotlin/runtime/hashing/EcdsaSignatureType;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/hashing/EcdsaSignatureType;
-	public static fun values ()[Laws/smithy/kotlin/runtime/hashing/EcdsaSignatureType;
+public final class aws/smithy/kotlin/runtime/hashing/EcdsaKt {
+	public static final fun ecdsaSecp256r1Rs ([B[B)[B
 }
 
 public abstract interface class aws/smithy/kotlin/runtime/hashing/HashFunction {

runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/hashing/Ecdsa.kt

@@ -4,16 +4,43 @@
  */
 package aws.smithy.kotlin.runtime.hashing
 
-public enum class EcdsaSignatureType {
-    ASN1_DER,
-    RAW_RS,
+
+/**
+ * ECDSA on the SECP256R1 curve returning ASN.1 DER format.
+ */
+public expect fun ecdsaSecp256r1(key: ByteArray, message: ByteArray): ByteArray
+
+/**
+ * ECDSA on the SECP256R1 curve returning raw r||s format.
+ */
+public fun ecdsaSecp256r1Rs(key: ByteArray, message: ByteArray): ByteArray {
+    val derSignature = ecdsaSecp256r1(key, message)
+    return parseDerSignature(derSignature)
 }
 
 /**
- * ECDSA on the SECP256R1 curve.
+ * Parses an ASN.1 DER encoded ECDSA signature and converts it to raw r||s format.
  */
-public expect fun ecdsaSecp256r1(
-    key: ByteArray,
-    message: ByteArray,
-    signatureType: EcdsaSignatureType = EcdsaSignatureType.ASN1_DER,
-): ByteArray
+private fun parseDerSignature(derSignature: ByteArray): ByteArray {
+    var index = 2 // Skip SEQUENCE tag and length
+
+    // Read r
+    index++ // Skip INTEGER tag
+    val rLength = derSignature[index++].toInt() and 0xFF
+    val r = derSignature.sliceArray(index until index + rLength)
+    index += rLength
+
+    // Read s
+    index++ // Skip INTEGER tag
+    val sLength = derSignature[index++].toInt() and 0xFF
+    val s = derSignature.sliceArray(index until index + sLength)
+
+    // Remove leading zero bytes and pad to 32 bytes
+    val rFixed = r.dropWhile { it == 0.toByte() }.toByteArray()
+    val sFixed = s.dropWhile { it == 0.toByte() }.toByteArray()
+
+    val rPadded = if (rFixed.size < 32) ByteArray(32 - rFixed.size) + rFixed else rFixed
+    val sPadded = if (sFixed.size < 32) ByteArray(32 - sFixed.size) + sFixed else sFixed
+
+    return rPadded + sPadded
+}

runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/hashing/EcdsaJVM.kt

@@ -12,11 +12,7 @@ import java.security.spec.*
 /**
  * ECDSA on the SECP256R1 curve.
  */
-public actual fun ecdsaSecp256r1(
-    key: ByteArray,
-    message: ByteArray,
-    signatureType: EcdsaSignatureType,
-): ByteArray {
+public actual fun ecdsaSecp256r1(key: ByteArray, message: ByteArray): ByteArray {
     // Convert private key to BigInteger
     val d = BigInteger(key)
 
@@ -32,42 +28,10 @@ public actual fun ecdsaSecp256r1(
     val privateKey = keyFactory.generatePrivate(privateKeySpec)
 
     // Sign the message
-    val derSignature = Signature.getInstance("SHA256withECDSA").apply {
+    return Signature.getInstance("SHA256withECDSA").apply {
         initSign(privateKey)
         update(message)
     }.sign()
-
-    return when (signatureType) {
-        EcdsaSignatureType.ASN1_DER -> derSignature
-        EcdsaSignatureType.RAW_RS -> parseDerSignature(derSignature)
-    }
 }
 
 private fun BigInteger.toJvm(): java.math.BigInteger = java.math.BigInteger(1, toByteArray())
-
-/**
- * Parses an ASN.1 DER encoded ECDSA signature and converts it to raw r||s format.
- */
-private fun parseDerSignature(derSignature: ByteArray): ByteArray {
-    var index = 2 // Skip SEQUENCE tag and length
-
-    // Read r
-    index++ // Skip INTEGER tag
-    val rLength = derSignature[index++].toInt() and 0xFF
-    val r = derSignature.sliceArray(index until index + rLength)
-    index += rLength
-
-    // Read s
-    index++ // Skip INTEGER tag
-    val sLength = derSignature[index++].toInt() and 0xFF
-    val s = derSignature.sliceArray(index until index + sLength)
-
-    // Remove leading zero bytes and pad to 32 bytes
-    val rFixed = r.dropWhile { it == 0.toByte() }.toByteArray()
-    val sFixed = s.dropWhile { it == 0.toByte() }.toByteArray()
-
-    val rPadded = if (rFixed.size < 32) ByteArray(32 - rFixed.size) + rFixed else rFixed
-    val sPadded = if (sFixed.size < 32) ByteArray(32 - sFixed.size) + sFixed else sFixed
-
-    return rPadded + sPadded
-}

runtime/runtime-core/native/src/aws/smithy/kotlin/runtime/hashing/EcdsaNative.kt

@@ -7,8 +7,4 @@ package aws.smithy.kotlin.runtime.hashing
 /**
  * ECDSA on the SECP256R1 curve.
  */
-public actual fun ecdsaSecp256r1(
-    key: ByteArray,
-    message: ByteArray,
-    signatureType: EcdsaSignatureType,
-): ByteArray = error("This function should not be invoked on Native, which uses the CrtAwsSigner.")
+public actual fun ecdsaSecp256r1(key: ByteArray, message: ByteArray): ByteArray = error("This function should not be invoked on Native, which uses the CrtAwsSigner.")