@@ -8,9 +8,10 @@ use jni::{
8
8
JNIEnv ,
9
9
} ;
10
10
11
+ use jni:: sys:: jbyteArray;
11
12
use protobuf:: { self , Message } ;
12
13
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,
14
15
java_set_error_field_and_extract_jobject,
15
16
} ;
16
17
@@ -42,7 +43,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyVoteReque
42
43
_class : JClass ,
43
44
poll_parameters : JString ,
44
45
vote_request : JString ,
45
- public_key_str : JString ,
46
+ public_key_bytes : jbyteArray ,
46
47
) -> jobject {
47
48
let result_jobject = get_result_jobject ( & _env) ;
48
49
let pb_poll_parameters = java_safe_jstring_to_pb ! (
@@ -58,7 +59,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyVoteReque
58
59
VoteRequest
59
60
) ;
60
61
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 ) ;
62
63
let verify_result =
63
64
match wedpr_s_anonymous_ciphertext_voting:: verifier:: verify_vote_request (
64
65
& pb_poll_parameters,
@@ -91,7 +92,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyUnbounded
91
92
_class : JClass ,
92
93
poll_parameters : JString ,
93
94
vote_request : JString ,
94
- public_key_str : JString ,
95
+ public_key_bytes : jbyteArray ,
95
96
) -> jobject {
96
97
let result_jobject = get_result_jobject ( & _env) ;
97
98
let pb_poll_parameters = java_safe_jstring_to_pb ! (
@@ -107,7 +108,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyUnbounded
107
108
VoteRequest
108
109
) ;
109
110
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 ) ;
111
112
let verify_result = match wedpr_s_anonymous_ciphertext_voting:: verifier:: verify_unbounded_vote_request ( & pb_poll_parameters,
112
113
& pb_vote_request, & public_key)
113
114
{
@@ -137,7 +138,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyUnbounded
137
138
_class : JClass ,
138
139
poll_parameters : JString ,
139
140
vote_request : JString ,
140
- public_key_str : JString ,
141
+ public_key_bytes : jbyteArray ,
141
142
) -> jobject {
142
143
let result_jobject = get_result_jobject ( & _env) ;
143
144
let pb_poll_parameters = java_safe_jstring_to_pb ! (
@@ -153,7 +154,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyUnbounded
153
154
VoteRequest
154
155
) ;
155
156
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 ) ;
157
158
let verify_result = match wedpr_s_anonymous_ciphertext_voting:: verifier:: verify_unbounded_vote_request ( & pb_poll_parameters,
158
159
& pb_vote_request, & public_key)
159
160
{
@@ -183,7 +184,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyCountRequ
183
184
_class : JClass ,
184
185
poll_parameters : JString ,
185
186
encrypted_vote_sum : JString ,
186
- counter_share : JString ,
187
+ counter_share : jbyteArray ,
187
188
partially_decrypted_result : JString ,
188
189
) -> jobject {
189
190
let result_jobject = get_result_jobject ( & _env) ;
@@ -206,7 +207,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyCountRequ
206
207
DecryptedResultPartStorage
207
208
) ;
208
209
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) ;
210
211
let counter_share_point =
211
212
match bytes_to_point ( & counter_share_bytes. to_vec ( ) ) {
212
213
Ok ( v) => v,
@@ -251,7 +252,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyCountRequ
251
252
_class : JClass ,
252
253
poll_parameters : JString ,
253
254
encrypted_vote_sum : JString ,
254
- counter_share : JString ,
255
+ counter_share : jbyteArray ,
255
256
partially_decrypted_result : JString ,
256
257
) -> jobject {
257
258
let result_jobject = get_result_jobject ( & _env) ;
@@ -274,7 +275,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyCountRequ
274
275
DecryptedResultPartStorage
275
276
) ;
276
277
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) ;
278
279
let counter_share_point =
279
280
match bytes_to_point ( & counter_share_bytes. to_vec ( ) ) {
280
281
Ok ( v) => v,
0 commit comments