Skip to content

chore: Only use C.int on public cgo methods #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore: Only use C.int on public cgo methods #269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 67 additions & 18 deletions gnark/gnark-jni/gnark-eip-2537.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@ func eip2537blsG1Add(javaInputBuf, javaOutputBuf, javaErrorBuf *C.char, cInputLe
}

// Store the result of the G1 addition into the output buffer
return nonMontgomeryMarshalG1(result, javaOutputBuf, errorBuf)
err = nonMontgomeryMarshalG1(result, javaOutputBuf)
if err != nil {
copy(errorBuf, err.Error())
return 1
}
return 0
}

func _blsG1Add(input []byte) (*bls12381.G1Affine, error) {
Expand Down Expand Up @@ -157,7 +162,12 @@ func eip2537blsG1Mul(javaInputBuf, javaOutputBuf, javaErrorBuf *C.char, cInputLe
}

// Store the result of the G1 scalar multiplication into the output buffer
return nonMontgomeryMarshalG1(result, javaOutputBuf, errorBuf)
err = nonMontgomeryMarshalG1(result, javaOutputBuf)
if err != nil {
copy(errorBuf, err.Error())
return 1
}
return 0
}

func _blsG1Mul(input []byte) (*bls12381.G1Affine, error) {
Expand Down Expand Up @@ -227,7 +237,12 @@ func eip2537blsG1MultiExp(javaInputBuf, javaOutputBuf, javaErrorBuf *C.char, cIn
}

// Store the result of the G1 multi-scalar multiplication into the output buffer
return nonMontgomeryMarshalG1(result, javaOutputBuf, errorBuf)
err = nonMontgomeryMarshalG1(result, javaOutputBuf)
if err != nil {
copy(errorBuf, err.Error())
return 1
}
return 0
}

func _blsG1MultiExp(input []byte) (*bls12381.G1Affine, error) {
Expand Down Expand Up @@ -313,7 +328,12 @@ func eip2537blsG1MultiExpParallel(javaInputBuf, javaOutputBuf, javaErrorBuf *C.c
}

// Store the result of the G1 multi-scalar multiplication into the output buffer
return nonMontgomeryMarshalG1(result, javaOutputBuf, errorBuf)
err = nonMontgomeryMarshalG1(result, javaOutputBuf)
if err != nil {
copy(errorBuf, err.Error())
return 1
}
return 0
}

func _blsG1MultiExpParallel(input []byte, nbTasks int) (*bls12381.G1Affine, error) {
Expand Down Expand Up @@ -388,7 +408,12 @@ func eip2537blsG2Add(javaInputBuf, javaOutputBuf, javaErrorBuf *C.char, cInputLe
}

// Store the result of the G2 addition into the output buffer
return nonMontgomeryMarshalG2(result, javaOutputBuf, errorBuf)
err = nonMontgomeryMarshalG2(result, javaOutputBuf)
if err != nil {
copy(errorBuf, err.Error())
return 1
}
return 0
}

func _blsG2Add(input []byte) (*bls12381.G2Affine, error) {
Expand Down Expand Up @@ -455,7 +480,12 @@ func eip2537blsG2Mul(javaInputBuf, javaOutputBuf, javaErrorBuf *C.char, cInputLe
}

// Store the result of the G2 scalar multiplication into the output buffer
return nonMontgomeryMarshalG2(result, javaOutputBuf, errorBuf)
err = nonMontgomeryMarshalG2(result, javaOutputBuf)
if err != nil {
copy(errorBuf, err.Error())
return 1
}
return 0
}

func _blsG2Mul(input []byte) (*bls12381.G2Affine, error) {
Expand Down Expand Up @@ -524,7 +554,12 @@ func eip2537blsG2MultiExp(javaInputBuf, javaOutputBuf, javaErrorBuf *C.char, cIn
}

// Store the result of the G2 multi-scalar multiplication into the output buffer
return nonMontgomeryMarshalG2(result, javaOutputBuf, errorBuf)
err = nonMontgomeryMarshalG2(result, javaOutputBuf)
if err != nil {
copy(errorBuf, err.Error())
return 1
}
return 0
}

func _blsG2MultiExp(input []byte) (*bls12381.G2Affine, error) {
Expand Down Expand Up @@ -609,7 +644,12 @@ func eip2537blsG2MultiExpParallel(javaInputBuf, javaOutputBuf, javaErrorBuf *C.c
}

// Store the result of the G2 multi-scalar multiplication into the output buffer
return nonMontgomeryMarshalG2(result, javaOutputBuf, errorBuf)
err = nonMontgomeryMarshalG2(result, javaOutputBuf)
if err != nil {
copy(errorBuf, err.Error())
return 1
}
return 0
}

func _blsG2MultiExpParallel(input []byte, nbTasks int) (*bls12381.G2Affine, error) {
Expand Down Expand Up @@ -778,7 +818,12 @@ func eip2537blsMapFpToG1(javaInputBuf, javaOutputBuf, javaErrorBuf *C.char, cInp
}

// Store the result of the mapping into the output buffer
return nonMontgomeryMarshalG1(result, javaOutputBuf, errorBuf)
err = nonMontgomeryMarshalG1(result, javaOutputBuf)
if err != nil {
copy(errorBuf, err.Error())
return 1
}
return 0
}

func _blsMapFpToG1(input []byte) (*bls12381.G1Affine, error) {
Expand Down Expand Up @@ -845,7 +890,13 @@ func eip2537blsMapFp2ToG2(javaInputBuf, javaOutputBuf, javaErrorBuf *C.char, cIn
}

// Store the result of the mapping into the output buffer
return nonMontgomeryMarshalG2(result, javaOutputBuf, errorBuf)
err = nonMontgomeryMarshalG2(result, javaOutputBuf)
if err != nil {
copy(errorBuf, err.Error())
return 1
}

return 0
}

func _blsMapFp2ToG2(input []byte) (*bls12381.G2Affine, error) {
Expand Down Expand Up @@ -1039,22 +1090,20 @@ func nonMontgomeryMarshal(xVal, yVal *fp.Element, output *C.char, outputOffset i
return nil
}

func nonMontgomeryMarshalG1(g1 *bls12381.G1Affine, output *C.char, errorBuf []byte) C.int {
func nonMontgomeryMarshalG1(g1 *bls12381.G1Affine, output *C.char) error {
if nil == nonMontgomeryMarshal(&g1.X, &g1.Y, output, 0) {
return 0
return nil
} else {
copy(errorBuf, ErrMalformedOutputBytes.Error())
return 1
return ErrMalformedOutputBytes
}
}

func nonMontgomeryMarshalG2(g2 *bls12381.G2Affine, output *C.char, errorBuf []byte) C.int {
func nonMontgomeryMarshalG2(g2 *bls12381.G2Affine, output *C.char) error {
if nil == nonMontgomeryMarshal(&g2.X.A0, &g2.X.A1, output, 0) &&
nil == nonMontgomeryMarshal(&g2.Y.A0, &g2.Y.A1, output, 128) {
return 0
return nil
} else {
copy(errorBuf, ErrMalformedOutputBytes.Error())
return 1
return ErrMalformedOutputBytes
}
}

Expand Down