Skip to content

Commit f2bd711

Browse files
committed
SigV4a
1 parent 071defd commit f2bd711

File tree

8 files changed

+9
-10
lines changed

8 files changed

+9
-10
lines changed

runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/Canonicalizer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ internal class DefaultCanonicalizer(private val sha256Supplier: HashSupplier = :
124124
}
125125

126126
param("Host", builder.url.hostAndPort, !signViaQueryParams, overwrite = false)
127-
param("X-Amz-Algorithm", config.algorithm.authorizationName , signViaQueryParams)
127+
param("X-Amz-Algorithm", config.algorithm.authorizationName, signViaQueryParams)
128128
param("X-Amz-Credential", credentialValue(config), signViaQueryParams)
129129
param("X-Amz-Content-Sha256", hash, addHashHeader)
130130
param("X-Amz-Date", config.signingDate.format(TimestampFormat.ISO_8601_CONDENSED))

runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/DefaultAwsSigner.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ internal class DefaultAwsSignerImpl(
120120
}
121121
}
122122

123-
124123
/**
125124
* Formats a credential scope consisting of a signing date, region (SigV4 only), service, and a signature type
126125
*/

runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/RequestMutator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ internal val AwsSigningAlgorithm.authorizationName: String
6060
get() = when (this) {
6161
AwsSigningAlgorithm.SIGV4 -> "AWS4-HMAC-SHA256"
6262
AwsSigningAlgorithm.SIGV4_ASYMMETRIC -> "AWS4-ECDSA-P256-SHA256"
63-
}
63+
}

runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/SignatureCalculator.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ internal class SigV4SignatureCalculator(private val sha256Provider: HashSupplier
120120

121121
// FIXME Copied a few functions from SigV4SignatureCalculator, refactor to share
122122
internal class SigV4aSignatureCalculator(
123-
val sha256Provider: HashSupplier = ::Sha256
124-
): SignatureCalculator {
123+
val sha256Provider: HashSupplier = ::Sha256,
124+
) : SignatureCalculator {
125125
override fun calculate(signingKey: ByteArray, stringToSign: String): String =
126126
ecdsasecp256r1(signingKey, stringToSign.encodeToByteArray()).encodeToHex()
127127

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ package aws.smithy.kotlin.runtime.hashing
77
/**
88
* ECDSA on the SECP256R1 curve.
99
*/
10-
public expect fun ecdsasecp256r1(key: ByteArray, message: ByteArray): ByteArray
10+
public expect fun ecdsasecp256r1(key: ByteArray, message: ByteArray): ByteArray

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ package aws.smithy.kotlin.runtime.hashing
66

77
import aws.smithy.kotlin.runtime.content.BigInteger
88
import java.security.*
9-
import java.security.spec.*
109
import java.security.interfaces.*
10+
import java.security.spec.*
1111

1212
/**
1313
* ECDSA on the SECP256R1 curve.

runtime/runtime-core/jvm/test/aws/smithy/kotlin/runtime/hashing/EcdsaJVMTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package aws.smithy.kotlin.runtime.hashing
77
import org.junit.jupiter.api.Assertions.assertFalse
88
import org.junit.jupiter.api.Assertions.assertTrue
99
import java.security.*
10-
import java.security.spec.*
1110
import java.security.interfaces.*
11+
import java.security.spec.*
1212
import kotlin.test.Test
1313
import kotlin.test.assertNotNull
1414

@@ -95,4 +95,4 @@ class EcdsaJVMTest {
9595

9696
assertTrue(verifier.verify(signature))
9797
}
98-
}
98+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ package aws.smithy.kotlin.runtime.hashing
1313
* Or maybe we can _only_ offer the CRT signer on Native?
1414
* Will require updating DefaultAwsSigner to be expect/actual and set to CrtSigner on Native.
1515
*/
16-
public actual fun ecdsasecp256r1(key: ByteArray, message: ByteArray): ByteArray = TODO("Not yet implemented")
16+
public actual fun ecdsasecp256r1(key: ByteArray, message: ByteArray): ByteArray = TODO("Not yet implemented")

0 commit comments

Comments
 (0)