diff --git a/lib/rln b/lib/rln index 2e10b0a..a7d30f1 160000 --- a/lib/rln +++ b/lib/rln @@ -1 +1 @@ -Subproject commit 2e10b0a15cc6ac33a2e4ffbc28a4c755f12d8d7b +Subproject commit a7d30f175f903fa21864470e98445bffe32280da diff --git a/libs/aarch64-linux-android/librln.a b/libs/aarch64-linux-android/librln.a index a11da68..d4bcfe8 100644 Binary files a/libs/aarch64-linux-android/librln.a and b/libs/aarch64-linux-android/librln.a differ diff --git a/libs/arm-linux-androideabi/librln.a b/libs/arm-linux-androideabi/librln.a new file mode 100644 index 0000000..e590c35 Binary files /dev/null and b/libs/arm-linux-androideabi/librln.a differ diff --git a/libs/armv7-linux-androideabi/librln.a b/libs/armv7-linux-androideabi/librln.a index 8929912..1f01405 100644 Binary files a/libs/armv7-linux-androideabi/librln.a and b/libs/armv7-linux-androideabi/librln.a differ diff --git a/libs/i686-linux-android/librln.a b/libs/i686-linux-android/librln.a index 3932c3a..8da05b5 100644 Binary files a/libs/i686-linux-android/librln.a and b/libs/i686-linux-android/librln.a differ diff --git a/libs/x86_64-linux-android/librln.a b/libs/x86_64-linux-android/librln.a index 645e961..57410e3 100644 Binary files a/libs/x86_64-linux-android/librln.a and b/libs/x86_64-linux-android/librln.a differ diff --git a/rln/link.go b/rln/link.go index fd08aaf..e890a19 100644 --- a/rln/link.go +++ b/rln/link.go @@ -6,8 +6,7 @@ package rln #cgo android,arm7 LDFLAGS:-L${SRCDIR}/../libs/armv7-linux-androideabi #cgo android,amd64 LDFLAGS:-L${SRCDIR}/../libs/x86_64-linux-android #cgo android,386 LDFLAGS:-L${SRCDIR}/../libs/i686-linux-android -#cgo linux,arm,!arm7 LDFLAGS:-L${SRCDIR}/../libs/arm-unknown-linux-gnueabi -#cgo linux,arm7 LDFLAGS:-L${SRCDIR}/../libs/arm-unknown-linux-gnueabihf +#cgo linux,arm LDFLAGS:-L${SRCDIR}/../libs/armv7-linux-androideabi #cgo linux,arm64 LDFLAGS:-L${SRCDIR}/../libs/aarch64-unknown-linux-gnu #cgo linux,amd64,musl,!android LDFLAGS:-L${SRCDIR}/../libs/x86_64-unknown-linux-musl #cgo linux,amd64,!musl,!android LDFLAGS:-L${SRCDIR}/../libs/x86_64-unknown-linux-gnu diff --git a/rln/rln.go b/rln/rln.go index 141b81c..f5bb5c3 100644 --- a/rln/rln.go +++ b/rln/rln.go @@ -36,7 +36,7 @@ func NewRLNWithDepth(depth int, params []byte) (*RLN, error) { in := (*C.Buffer)(C.malloc(C.size_t(size))) *in = buf - if !bool(C.new_circuit_from_params(C.ulong(depth), in, &r.ptr)) { + if !bool(C.new_circuit_from_params(C.uintptr_t(depth), in, &r.ptr)) { return nil, errors.New("failed to initialize") } @@ -80,7 +80,7 @@ func toBuffer(data []byte) C.Buffer { dataPtr, dataLen := sliceToPtr(data) return C.Buffer{ ptr: dataPtr, - len: C.ulong(dataLen), + len: C.uintptr_t(dataLen), } } @@ -207,7 +207,7 @@ func (r *RLN) InsertMember(idComm IDCommitment) bool { // parameter is the position of the id commitment key to be deleted from the tree. // The deleted id commitment key is replaced with a zero leaf func (r *RLN) DeleteMember(index MembershipIndex) bool { - deletionSuccess := bool(C.delete_member(r.ptr, C.ulong(index))) + deletionSuccess := bool(C.delete_member(r.ptr, C.uintptr_t(index))) return deletionSuccess }