Use safeRewind for schnorr and adaptor sig functions (#1775)

bitcoin-s · Aug 28, 2020 · e1db81d · e1db81d
1 parent 5463d2f
commit e1db81d
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/secp256k1jni/src/main/java/org/bitcoin/NativeSecp256k1.java b/secp256k1jni/src/main/java/org/bitcoin/NativeSecp256k1.java
@@ -530,7 +530,8 @@ public static byte[] schnorrSign(byte[] data, byte[] secKey, byte[] auxRand) thr
             byteBuff.order(ByteOrder.nativeOrder());
             nativeECDSABuffer.set(byteBuff);
         }
-        byteBuff.rewind();
+
+        safeRewind(byteBuff);
         byteBuff.put(data);
         byteBuff.put(secKey);
         byteBuff.put(auxRand);
@@ -567,7 +568,8 @@ public static byte[] schnorrSignWithNonce(byte[] data, byte[] secKey, byte[] non
             byteBuff.order(ByteOrder.nativeOrder());
             nativeECDSABuffer.set(byteBuff);
         }
-        byteBuff.rewind();
+
+        safeRewind(byteBuff);
         byteBuff.put(data);
         byteBuff.put(secKey);
         byteBuff.put(nonce);
@@ -597,7 +599,8 @@ public static byte[] schnorrComputeSigPoint(byte[] data, byte[] nonce, byte[] pu
             byteBuff.order(ByteOrder.nativeOrder());
             nativeECDSABuffer.set(byteBuff);
         }
-        byteBuff.rewind();
+
+        safeRewind(byteBuff);
         byteBuff.put(data);
         byteBuff.put(nonce);
         byteBuff.put(pubkey);
@@ -636,7 +639,8 @@ public static boolean schnorrVerify(byte[] sig, byte[] data, byte[] pubx) throws
             byteBuffer.order(ByteOrder.nativeOrder());
             nativeECDSABuffer.set(byteBuffer);
         }
-        byteBuffer.rewind();
+
+        safeRewind(byteBuffer);
         byteBuffer.put(sig);
         byteBuffer.put(data);
         byteBuffer.put(pubx);
@@ -685,7 +689,8 @@ public static byte[] adaptorSign(byte[] seckey, byte[] adaptorPoint, byte[] data
             byteBuff.order(ByteOrder.nativeOrder());
             nativeECDSABuffer.set(byteBuff);
         }
-        byteBuff.rewind();
+
+        safeRewind(byteBuff);
         byteBuff.put(seckey);
         byteBuff.put(adaptorPoint);
         byteBuff.put(data);
@@ -727,7 +732,8 @@ public static boolean adaptorVerify(byte[] adaptorSig, byte[] pubKey, byte[] dat
             byteBuff.order(ByteOrder.nativeOrder());
             nativeECDSABuffer.set(byteBuff);
         }
-        byteBuff.rewind();
+
+        safeRewind(byteBuff);
         byteBuff.put(adaptorSig);
         byteBuff.put(pubKey);
         byteBuff.put(data);
@@ -751,7 +757,8 @@ public static byte[] adaptorAdapt(byte[] adaptorSec, byte[] adaptorSig) throws A
             byteBuff.order(ByteOrder.nativeOrder());
             nativeECDSABuffer.set(byteBuff);
         }
-        byteBuff.rewind();
+
+        safeRewind(byteBuff);
         byteBuff.put(adaptorSec);
         byteBuff.put(adaptorSig);
 
@@ -782,7 +789,8 @@ public static byte[] adaptorExtractSecret(byte[] sig, byte[] adaptorSig, byte[]
             byteBuff.order(ByteOrder.nativeOrder());
             nativeECDSABuffer.set(byteBuff);
         }
-        byteBuff.rewind();
+
+        safeRewind(byteBuff);
         byteBuff.put(sig);
         byteBuff.put(adaptorSig);
         byteBuff.put(adaptor);