right pad incomplete inputs for eip-196 in gnark-crypto impl

Signed-off-by: garyschulte <garyschulte@gmail.com>
hyperledger · Jul 16, 2024 · b650498 · b650498
1 parent b9b7a2b
commit b650498
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 21 deletions.
diff --git a/bls12-381/src/test/resources/org/hyperledger/besu/nativelib/bls12_381/eip196_g1_mul.csv b/bls12-381/src/test/resources/org/hyperledger/besu/nativelib/bls12_381/eip196_g1_mul.csv
@@ -101,6 +101,9 @@ input,result,gas,notes
 0d6ad8e12b4f61e3e2a2252ce11428941f2a84b7f0a821cb8cc7699303bd4fec2247870562618fd8d6169072d9b33614d2acf800b3ba0ff68ef8d5fd4d6c250d3e70b3bed17894f958579644c83fa9d485121d580e2b061c697e68f950297768,0be6d75e2fe2887835d396dae11321ca7c53083abd6a0b270ee1c087593517aa2ffd1bad577de7cf2b19b82bfff0c66e2afbfb79a72cbe834290437f3caf2f21,6000,
 d2acf800b3ba0ff68ef8d5fd4d6c250d3e70b3bed17894f958579644c83fa9d485121d580e2b061c697e68f9502977680d6ad8e12b4f61e3e2a2252ce11428941f2a84b7f0a821cb8cc7699303bd4fec2247870562618fd8d6169072d9b33614,,6000,invalid input parameters, Failed to parse Fp element
 02acf800b3ba0ff68ef8d5fd4d6c250d3e70b3bed17894f958579644c83fa9d405121d580e2b061c697e68f9502977680d6ad8e12b4f61e3e2a2252ce11428941f2a84b7f0a821cb8cc7699303bd4fec2247870562618fd8d6169072d9b33614,,6000,invalid input parameters, Point is not on curve
+1c2cb2b4504b19c7e073679432e625f2706b7c4728cd9bd3ce36579f4de2f3902c8605f723ac2f73baa15eac674f62ab,00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,6000,invalid input parameters, Point is not on curve
 ,00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,6000,
 1A87B0584CE92F4593D161480614F2989035225609F08058CCFA3D0F940FEBE31A2F3C951F6DADCC7EE9007DFF81504B0FCD6D7CF59996EFDC33D92BF7F9F8F60100000000000000000000000000000000,0x220cb1540fa85ba04d863dca86de9359a43ac9fc084aebb9f2a936d989abbb602ccdc6c020dd2cf78332132b3f1d1122391b515035623cd6f53d4aea24ea2466,6000,
 1A87B0584CE92F4593D161480614F2989035225609F08058CCFA3D0F940FEBE31A2F3C951F6DADCC7EE9007DFF81504B0FCD6D7CF59996EFDC33D92BF7F9F8F60000000000000000000000000000000100000000000000000000000000000000,1051acb0700ec6d42a88215852d582efbaef31529b6fcbc3277b5c1b300f5cf0135b2394bb45ab04b8bd7611bd2dfe1de6a4e6e2ccea1ea1955f577cd66af85b,6000,
+1c2cb2b4504b19c7e073679432e625f2706b7c4728cd9bd3ce36579f4de2f390,,6000,invalid input parameters, Point is not on curve
+1c2cb2b4504b19c7e073679432e625f2706b7c4728cd9bd3ce36579f4de2f3902c8605f723ac2f73baa15eac674f62ab06c79809aa4a4be3391c4d41d5a6e62c,00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,6000,
diff --git a/gnark/gnark-jni/gnark-eip-196.go b/gnark/gnark-jni/gnark-eip-196.go
@@ -61,7 +61,7 @@ func eip196altbn128G1Add(javaInputBuf, javaOutputBuf, javaErrorBuf *C.char, cInp
     input := (*[2*EIP196PreallocateForG1]byte)(unsafe.Pointer(javaInputBuf))[:inputLen:inputLen]
 
     if (inputLen == 0) {
-        *outputLen = 0
+        *outputLen = EIP196PreallocateForG1
         return 0
     }
 
@@ -89,9 +89,15 @@ func eip196altbn128G1Add(javaInputBuf, javaOutputBuf, javaErrorBuf *C.char, cInp
         dryError(err, errorBuf, outputLen, errorLen)
         return 1
     }
-
-    // Use the Add method to combine points
-    result := p0.Add(p0, p1)
+    var result *bn254.G1Affine
+
+    if p1 == nil {
+        // if p1 is nil, just return p0
+        result = p0
+    } else {
+        // Use the Add method to combine points
+        result = p0.Add(p0, p1)
+    }
 
     // marshal the resulting point and encode directly to the output buffer
     ret := result.Marshal()
@@ -110,9 +116,9 @@ func eip196altbn128G1Mul(javaInputBuf, javaOutputBuf, javaErrorBuf *C.char, cInp
     // Convert error C pointers to Go slices
     errorBuf := castErrorBufferEIP196(javaErrorBuf, errorLen)
 
-    if inputLen < EIP196PreallocateForG1 {
-        // if we do not have complete input, return 0
-        *outputLen = 0
+    if inputLen == 0 {
+        // zero input returns 0
+        *outputLen = EIP196PreallocateForG1
         return 0
     }
 
@@ -132,8 +138,14 @@ func eip196altbn128G1Mul(javaInputBuf, javaOutputBuf, javaErrorBuf *C.char, cInp
         return 1
     }
 
+    if inputLen < EIP196PreallocateForG1 + 1 {
+        // if there is not even a partial input scalar, return 0
+        *outputLen = EIP196PreallocateForG1
+        return 0
+    }
+
     // Convert byte slice to *big.Int
-    scalarBytes := input[64:]
+    scalarBytes := input[EIP196PreallocateForG1:]
     if (96 > int(cInputLen)) {
       // if the input is truncated, copy the bytes to the high order portion of the scalar
       scalarBytes = make([]byte, 32)
@@ -242,22 +254,35 @@ func g1AffineEncode(g1Point []byte, output *C.char) (error) {
 func safeUnmarshalEIP196(input []byte, offset int) (*bn254.G1Affine, error) {
     var g1 bn254.G1Affine
 
-    if (len(input) - offset < 64) {
-        return nil, ErrMalformedPointEIP196
-    }
+	var pointBytes []byte
+
+	// If we effectively have _NO_ input, return empty
+	if len(input)-offset <= 0 {
+		return nil, nil
+	} else if len(input)-offset < 64 {
+		// If we have some input, but it is incomplete, pad with zero
+		pointBytes = make([]byte, 64)
+		shortLen := len(input) - offset
+		copy(pointBytes, input[offset:len(input)])
+		for i := shortLen; i < 64; i++ {
+			pointBytes[i] = 0
+		}
+	} else {
+		pointBytes = input[offset : offset+64]
+	}
 
-    if !checkInFieldEIP196(input[offset: offset + 32]) {
+    if !checkInFieldEIP196(pointBytes[0:32]) {
         return nil, ErrPointNotInFieldEIP196
     }
 
-    err := g1.X.SetBytesCanonical(input[offset:offset + 32])
+    err := g1.X.SetBytesCanonical(pointBytes[0:32])
 
     if (err == nil) {
 
-        if !checkInFieldEIP196(input[offset + 32: offset + 64]) {
+        if !checkInFieldEIP196(pointBytes[32:64]) {
             return nil, ErrPointNotInFieldEIP196
         }
-        err := g1.Y.SetBytesCanonical(input[offset + 32:offset + 64])
+        err := g1.Y.SetBytesCanonical(pointBytes[32:64])
         if (err == nil) {
             if (!g1.IsOnCurve()) {
                 return nil, ErrPointOnCurveCheckFailedEIP196

diff --git a/gnark/src/test/resources/org/hyperledger/besu/nativelib/gnark/eip196_g1_add.csv b/gnark/src/test/resources/org/hyperledger/besu/nativelib/gnark/eip196_g1_add.csv
@@ -100,10 +100,10 @@ input,result,gas,notes
 16eea4cc6a5c21b361c4d144f81f0c5774181b19b6341ebc3317b6d9c78b493407abc49d40a88a2336ea698f6bcc5b767f290fa5255f1ea9c449237dfa75259210264114425d52ebb998a32b103fe50d3c44b156f53dd16fec92c805c51b3bc117986b497207e3198ca7beb705537ba0d6c82cb8e6e1c507e74dece3fbb17fc2,2ef81763011baa4945a15da4c312cd2c280017994fcbea76048907c58acaf8f01a66e2bd9a4c4e1ca39a7fa9ba43f615c3720ae73c0d2aa6b2cb14e5a24f233d,150,
 1ca0717a8dfb9c3940a731d7c52f1699f64fe05e76189a91dc622e8fafd99de62313a1df5b32b17c21e53e2d0a1ff3eeac6ab4359a9f86e51b1c236f414d87ea0e9729271df80f9967d618c33d9e8389bd4afb88e8b1e26e20b98868406da8ce1aca0647ae2e8573e39970f442aa3900175beeef2984af814fa51cf4ab59e07c,278782b7f77402d99c21f0bb831e899431703967252026abb6a6cfefd6d368600bd99290fca19622267066ee211842111904f2ced987023a34048236be757231,150,
 1ca0717a8dfb9c3940a731d7c52f1699f64fe05e76189a91dc622e8fafd99de62313a1df5b32b17c21e53e2d0a1ff3eeac6ab4359a9f86e51b1c236f414d87ea00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,1ca0717a8dfb9c3940a731d7c52f1699f64fe05e76189a91dc622e8fafd99de62313a1df5b32b17c21e53e2d0a1ff3eeac6ab4359a9f86e51b1c236f414d87ea,150,
-1234,,150,invalid input parameters, invalid point encoding
-0174fc233104c2ad4f56a8396b8c1b7d9c6ad10bffc70761c5e8f5280862f137029733a9f20a4cdbb7ae9c5dd1adf6ccc7fe3439d7dc71093af0656ae0ca0f290964773f12e2292f332306374f957d10,,150,invalid input parameters, invalid point encoding
+1234,,150,invalid input parameters, point is not on curve
+0174fc233104c2ad4f56a8396b8c1b7d9c6ad10bffc70761c5e8f5280862f137029733a9f20a4cdbb7ae9c5dd1adf6ccc7fe3439d7dc71093af0656ae0ca0f290964773f12e2292f332306374f957d10,,150,invalid input parameters, point is not on curve
 0174fc233104c2ad4f56a8396b8c1b7d9c6ad10bffc70761c5e8f5280862f137029733a9f20a4cdbb7ae9c5dd1adf6ccc7fe3439d7dc71093af0656ae0ca0f290964773f12e2292f332306374f957d10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,150,invalid input parameters, point is not on curve
 67376aad340c93eb0fc9bc8e040dc691bd00e426c6456b4d13079e7f1dbb3da847eb0fc271cd23da50c6ebc261928abb1af9bfcea998791e18af1817b06221e1fe708d2f4224275523fcd37460a310ce4b56f1694dfe36280410f0fb6efc5f47b85662e5b08d881242a72acbc2c8e2fa71ac593be977ad3e090c8158aace0247,,150,invalid input parameters, point not in field
-,,150,
-ff000000000000000000000000000000000000000000000000000000000000ff,,150,invalid input parameters, invalid point encoding
+,00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,150,
+ff000000000000000000000000000000000000000000000000000000000000ff,,150,invalid input parameters, point not in field
 1470b80a6d5de1470aeadfa0b2eb913d9286bd966aa8a99b09879f3b10c985d02432b8ccd7083d421127dac6ad90bd569e763810e32d37114a786c7645864647,1470b80a6d5de1470aeadfa0b2eb913d9286bd966aa8a99b09879f3b10c985d02432b8ccd7083d421127dac6ad90bd569e763810e32d37114a786c7645864647,150,
diff --git a/gnark/src/test/resources/org/hyperledger/besu/nativelib/gnark/eip196_g1_mul.csv b/gnark/src/test/resources/org/hyperledger/besu/nativelib/gnark/eip196_g1_mul.csv
@@ -101,7 +101,9 @@ input,result,gas,notes
 0d6ad8e12b4f61e3e2a2252ce11428941f2a84b7f0a821cb8cc7699303bd4fec2247870562618fd8d6169072d9b33614d2acf800b3ba0ff68ef8d5fd4d6c250d3e70b3bed17894f958579644c83fa9d485121d580e2b061c697e68f950297768,0be6d75e2fe2887835d396dae11321ca7c53083abd6a0b270ee1c087593517aa2ffd1bad577de7cf2b19b82bfff0c66e2afbfb79a72cbe834290437f3caf2f21,6000,
 d2acf800b3ba0ff68ef8d5fd4d6c250d3e70b3bed17894f958579644c83fa9d485121d580e2b061c697e68f9502977680d6ad8e12b4f61e3e2a2252ce11428941f2a84b7f0a821cb8cc7699303bd4fec2247870562618fd8d6169072d9b33614,,6000,invalid input parameters, point not in field
 02acf800b3ba0ff68ef8d5fd4d6c250d3e70b3bed17894f958579644c83fa9d405121d580e2b061c697e68f9502977680d6ad8e12b4f61e3e2a2252ce11428941f2a84b7f0a821cb8cc7699303bd4fec2247870562618fd8d6169072d9b33614,,6000,invalid input parameters, point is not on curve
-1c2cb2b4504b19c7e073679432e625f2706b7c4728cd9bd3ce36579f4de2f3902c8605f723ac2f73baa15eac674f62ab,,6000,
-,,6000,
+1c2cb2b4504b19c7e073679432e625f2706b7c4728cd9bd3ce36579f4de2f3902c8605f723ac2f73baa15eac674f62ab,00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,6000,invalid input parameters, point is not on curve
+,00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,6000,
 1A87B0584CE92F4593D161480614F2989035225609F08058CCFA3D0F940FEBE31A2F3C951F6DADCC7EE9007DFF81504B0FCD6D7CF59996EFDC33D92BF7F9F8F60100000000000000000000000000000000,0x220cb1540fa85ba04d863dca86de9359a43ac9fc084aebb9f2a936d989abbb602ccdc6c020dd2cf78332132b3f1d1122391b515035623cd6f53d4aea24ea2466,6000,
 1A87B0584CE92F4593D161480614F2989035225609F08058CCFA3D0F940FEBE31A2F3C951F6DADCC7EE9007DFF81504B0FCD6D7CF59996EFDC33D92BF7F9F8F60000000000000000000000000000000100000000000000000000000000000000,1051acb0700ec6d42a88215852d582efbaef31529b6fcbc3277b5c1b300f5cf0135b2394bb45ab04b8bd7611bd2dfe1de6a4e6e2ccea1ea1955f577cd66af85b,6000,
+1c2cb2b4504b19c7e073679432e625f2706b7c4728cd9bd3ce36579f4de2f390,,6000,invalid input parameters, point is not on curve
+1c2cb2b4504b19c7e073679432e625f2706b7c4728cd9bd3ce36579f4de2f3902c8605f723ac2f73baa15eac674f62ab06c79809aa4a4be3391c4d41d5a6e62c,00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,6000,