Skip to content

Commit 0cbd571

Browse files
authored
update the counter_share and public_key to jByteArray type (#63)
1 parent 1c48c15 commit 0cbd571

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

ffi/ffi_java/ffi_java_acv/src/coordinator.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ use jni::{
88
JNIEnv,
99
};
1010

11+
use jni::sys::jbyteArray;
1112
use protobuf::{self, Message};
1213
use wedpr_ffi_common::utils::{
13-
bytes_to_string, java_jstring_to_bytes, java_new_jobject,
14-
java_set_error_field_and_extract_jobject,
14+
bytes_to_string, java_jbytes_to_bytes, java_jstring_to_bytes,
15+
java_new_jobject, java_set_error_field_and_extract_jobject,
1516
};
1617

1718
use wedpr_s_anonymous_ciphertext_voting;
@@ -82,14 +83,14 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_makePollParamet
8283
pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_certifyVoter(
8384
_env: JNIEnv,
8485
_class: JClass,
85-
secret_key_data: JString,
86+
secret_key_data: jbyteArray,
8687
registration_request: JString,
8788
voter_weight: jint,
8889
) -> jobject {
8990
let result_jobject = get_result_jobject(&_env);
9091
let certify_result =
9192
match wedpr_s_anonymous_ciphertext_voting::coordinator::certify_voter(
92-
&java_safe_jstring_to_bytes!(_env, result_jobject, secret_key_data),
93+
&java_safe_jbytes_to_bytes!(_env, result_jobject, secret_key_data),
9394
&java_safe_jstring_to_pb!(
9495
_env,
9596
result_jobject,
@@ -122,14 +123,14 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_certifyVoter(
122123
pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_certifyUnboundedVoter(
123124
_env: JNIEnv,
124125
_class: JClass,
125-
secret_key_data: JString,
126+
secret_key_data: jbyteArray,
126127
registration_request: JString,
127128
voter_weight: jint,
128129
) -> jobject {
129130
let result_jobject = get_result_jobject(&_env);
130131
let certify_result =
131132
match wedpr_s_anonymous_ciphertext_voting::coordinator::certify_unbounded_voter(
132-
&java_safe_jstring_to_bytes!(_env, result_jobject, secret_key_data),
133+
&java_safe_jbytes_to_bytes!(_env, result_jobject, secret_key_data),
133134
&java_safe_jstring_to_pb!(
134135
_env,
135136
result_jobject,

ffi/ffi_java/ffi_java_acv/src/verifier.rs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ use jni::{
88
JNIEnv,
99
};
1010

11+
use jni::sys::jbyteArray;
1112
use protobuf::{self, Message};
1213
use wedpr_ffi_common::utils::{
13-
java_jstring_to_bytes, java_new_jobject,
14+
java_jbytes_to_bytes, java_jstring_to_bytes, java_new_jobject,
1415
java_set_error_field_and_extract_jobject,
1516
};
1617

@@ -42,7 +43,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyVoteReque
4243
_class: JClass,
4344
poll_parameters: JString,
4445
vote_request: JString,
45-
public_key_str: JString,
46+
public_key_bytes: jbyteArray,
4647
) -> jobject {
4748
let result_jobject = get_result_jobject(&_env);
4849
let pb_poll_parameters = java_safe_jstring_to_pb!(
@@ -58,7 +59,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyVoteReque
5859
VoteRequest
5960
);
6061
let public_key =
61-
java_safe_jstring_to_bytes!(_env, result_jobject, public_key_str);
62+
java_safe_jbytes_to_bytes!(_env, result_jobject, public_key_bytes);
6263
let verify_result =
6364
match wedpr_s_anonymous_ciphertext_voting::verifier::verify_vote_request(
6465
&pb_poll_parameters,
@@ -91,7 +92,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyUnbounded
9192
_class: JClass,
9293
poll_parameters: JString,
9394
vote_request: JString,
94-
public_key_str: JString,
95+
public_key_bytes: jbyteArray,
9596
) -> jobject {
9697
let result_jobject = get_result_jobject(&_env);
9798
let pb_poll_parameters = java_safe_jstring_to_pb!(
@@ -107,7 +108,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyUnbounded
107108
VoteRequest
108109
);
109110
let public_key =
110-
java_safe_jstring_to_bytes!(_env, result_jobject, public_key_str);
111+
java_safe_jbytes_to_bytes!(_env, result_jobject, public_key_bytes);
111112
let verify_result = match wedpr_s_anonymous_ciphertext_voting::verifier::verify_unbounded_vote_request(&pb_poll_parameters,
112113
&pb_vote_request, &public_key)
113114
{
@@ -137,7 +138,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyUnbounded
137138
_class: JClass,
138139
poll_parameters: JString,
139140
vote_request: JString,
140-
public_key_str: JString,
141+
public_key_bytes: jbyteArray,
141142
) -> jobject {
142143
let result_jobject = get_result_jobject(&_env);
143144
let pb_poll_parameters = java_safe_jstring_to_pb!(
@@ -153,7 +154,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyUnbounded
153154
VoteRequest
154155
);
155156
let public_key =
156-
java_safe_jstring_to_bytes!(_env, result_jobject, public_key_str);
157+
java_safe_jbytes_to_bytes!(_env, result_jobject, public_key_bytes);
157158
let verify_result = match wedpr_s_anonymous_ciphertext_voting::verifier::verify_unbounded_vote_request(&pb_poll_parameters,
158159
&pb_vote_request, &public_key)
159160
{
@@ -183,7 +184,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyCountRequ
183184
_class: JClass,
184185
poll_parameters: JString,
185186
encrypted_vote_sum: JString,
186-
counter_share: JString,
187+
counter_share: jbyteArray,
187188
partially_decrypted_result: JString,
188189
) -> jobject {
189190
let result_jobject = get_result_jobject(&_env);
@@ -206,7 +207,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyCountRequ
206207
DecryptedResultPartStorage
207208
);
208209
let counter_share_bytes =
209-
java_safe_jstring_to_bytes!(_env, result_jobject, counter_share);
210+
java_safe_jbytes_to_bytes!(_env, result_jobject, counter_share);
210211
let counter_share_point =
211212
match bytes_to_point(&counter_share_bytes.to_vec()) {
212213
Ok(v) => v,
@@ -251,7 +252,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyCountRequ
251252
_class: JClass,
252253
poll_parameters: JString,
253254
encrypted_vote_sum: JString,
254-
counter_share: JString,
255+
counter_share: jbyteArray,
255256
partially_decrypted_result: JString,
256257
) -> jobject {
257258
let result_jobject = get_result_jobject(&_env);
@@ -274,7 +275,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyCountRequ
274275
DecryptedResultPartStorage
275276
);
276277
let counter_share_bytes =
277-
java_safe_jstring_to_bytes!(_env, result_jobject, counter_share);
278+
java_safe_jbytes_to_bytes!(_env, result_jobject, counter_share);
278279
let counter_share_point =
279280
match bytes_to_point(&counter_share_bytes.to_vec()) {
280281
Ok(v) => v,

0 commit comments

Comments
 (0)