From f42d7ae8e7d6c783e7c80cf125db4e383c06ce98 Mon Sep 17 00:00:00 2001
From: Nadav Kohen <nadavk25@gmail.com>
Date: Tue, 19 Apr 2022 08:12:27 -0500
Subject: [PATCH] Added validation to signature methods to avoid corruption
 edge cases (#4214)

---
 .../org/bitcoins/crypto/CryptoUtil.scala      | 37 +++++++++++++++----
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/crypto/src/main/scala/org/bitcoins/crypto/CryptoUtil.scala b/crypto/src/main/scala/org/bitcoins/crypto/CryptoUtil.scala
index aa62c8bd50..ab1bbd1fa5 100644
--- a/crypto/src/main/scala/org/bitcoins/crypto/CryptoUtil.scala
+++ b/crypto/src/main/scala/org/bitcoins/crypto/CryptoUtil.scala
@@ -90,14 +90,24 @@ trait CryptoUtil extends CryptoRuntime {
 
   override def sign(
       privateKey: ECPrivateKey,
-      dataToSign: ByteVector): ECDigitalSignature =
-    cryptoRuntime.sign(privateKey, dataToSign)
+      dataToSign: ByteVector): ECDigitalSignature = {
+    val sig = cryptoRuntime.sign(privateKey, dataToSign)
+    assert(
+      verify(privateKey.publicKey, dataToSign, sig),
+      "Something has gone wrong, a generated signature may have been corrupted")
+    sig
+  }
 
   override def signWithEntropy(
       privateKey: ECPrivateKey,
       bytes: ByteVector,
-      entropy: ByteVector): ECDigitalSignature =
-    cryptoRuntime.signWithEntropy(privateKey, bytes, entropy)
+      entropy: ByteVector): ECDigitalSignature = {
+    val sig = cryptoRuntime.signWithEntropy(privateKey, bytes, entropy)
+    assert(
+      verify(privateKey.publicKey, bytes, sig),
+      "Something has gone wrong, a generated signature may have been corrupted")
+    sig
+  }
 
   override def secKeyVerify(privateKeybytes: ByteVector): Boolean =
     cryptoRuntime.secKeyVerify(privateKeybytes)
@@ -145,14 +155,25 @@ trait CryptoUtil extends CryptoRuntime {
   override def schnorrSign(
       dataToSign: ByteVector,
       privateKey: ECPrivateKey,
-      auxRand: ByteVector): SchnorrDigitalSignature =
-    cryptoRuntime.schnorrSign(dataToSign, privateKey, auxRand)
+      auxRand: ByteVector): SchnorrDigitalSignature = {
+    val sig = cryptoRuntime.schnorrSign(dataToSign, privateKey, auxRand)
+    assert(
+      schnorrVerify(dataToSign, privateKey.schnorrPublicKey, sig),
+      "Something has gone wrong, a generated signature may have been corrupted")
+    sig
+  }
 
   override def schnorrSignWithNonce(
       dataToSign: ByteVector,
       privateKey: ECPrivateKey,
-      nonceKey: ECPrivateKey): SchnorrDigitalSignature =
-    cryptoRuntime.schnorrSignWithNonce(dataToSign, privateKey, nonceKey)
+      nonceKey: ECPrivateKey): SchnorrDigitalSignature = {
+    val sig =
+      cryptoRuntime.schnorrSignWithNonce(dataToSign, privateKey, nonceKey)
+    assert(
+      schnorrVerify(dataToSign, privateKey.schnorrPublicKey, sig),
+      "Something has gone wrong, a generated signature may have been corrupted")
+    sig
+  }
 
   override def schnorrVerify(
       data: ByteVector,