From b3679fe113d1b51b9476d26863fd587f0755cee4 Mon Sep 17 00:00:00 2001
From: Luke Tchang <ltchang@stanford.edu>
Date: Thu, 31 Mar 2022 10:04:28 -0700
Subject: [PATCH] fix: aws signer does not throw error on unnormalized sig
 (#1099)

* fix: reverts aws signer fix around sig normalization

* chore: update changelog
---
 CHANGELOG.md                    | 1 +
 ethers-signers/src/aws/utils.rs | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e58a14a2..41dbefae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Unreleased
 
+- Fix aws signer bug which maps un-normalized signature to error if no normalization occurs (in `aws::utils::decode_signature`)
 - `Transaction::from` will default to `Address::zero()`. Add `recover_from` and
   `recover_from_mut` methods for recovering the sender from signature, and also
   setting the same on tx [1075](https://github.com/gakonst/ethers-rs/pull/1075).
diff --git a/ethers-signers/src/aws/utils.rs b/ethers-signers/src/aws/utils.rs
index 4e2cb6d6..ba28ea67 100644
--- a/ethers-signers/src/aws/utils.rs
+++ b/ethers-signers/src/aws/utils.rs
@@ -93,8 +93,6 @@ pub(super) fn decode_signature(resp: SignResponse) -> Result<KSig, AwsSignerErro
         .signature
         .ok_or_else(|| AwsSignerError::from("Signature not found in response".to_owned()))?;
 
-    let sig = KSig::from_der(&raw)?
-        .normalize_s()
-        .ok_or_else(|| AwsSignerError::from("Could not normalize `s`".to_owned()))?;
-    Ok(sig)
+    let sig = KSig::from_der(&raw)?;
+    Ok(sig.normalize_s().unwrap_or(sig))
 }