fix protos

Author: HaoXuan40404

bounty/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 colored = "1.8"
 curve25519-dalek = { version = "1", features = [ "serde" ] }
-protobuf = "2.20.0"
+protobuf = "2.22.1"
 sha3 = "0.8"
 rand = "0.3.17"
 wedpr_l_crypto_zkp_discrete_logarithm_proof = "1.0.0"

bounty/src/scd.rs

@@ -297,8 +297,7 @@ fn generate_predicate_proof(
     template_private_key: TemplatePrivateKey,
     value: u64,
     rule_set: &mut VerificationRuleSet,
-) -> Result<VerifyRequest, WedprError>
-{
+) -> Result<VerifyRequest, WedprError> {
     user_fill_certificate_attribute(certificate_attribute_dict, value);
     let (
         sign_certificate_request,
@@ -353,8 +352,7 @@ fn issuer_make_certificate_template(
 fn user_fill_certificate_attribute(
     certificate_attribute_dict: &mut AttributeDict,
     attribute: u64,
-)
-{
+) {
     let mut attribute_kv = StringToStringPair::new();
     attribute_kv.set_key(TARGET_ATTRIBUTE.to_string());
     attribute_kv.set_value(attribute.to_string());
@@ -367,8 +365,7 @@ fn user_prove_rule_set(
     certificate_template: &CertificateTemplate,
     user_private_key_str: &str,
     rule_set: &mut VerificationRuleSet,
-) -> Result<VerifyRequest, WedprError>
-{
+) -> Result<VerifyRequest, WedprError> {
     // In most cases, this nonce should be provided by the verifier to prevent
     // replaying attacks.
     let verification_nonce_str = verifier::get_verification_nonce().unwrap();
@@ -385,7 +382,6 @@ fn user_prove_rule_set(
 fn verifier_verify_rule_set(
     rule_set: &mut VerificationRuleSet,
     request: &VerifyRequest,
-) -> bool
-{
+) -> bool {
     verifier::verify_selective_disclosure(&rule_set, &request).unwrap()
 }

bounty/src/utils.rs

@@ -34,8 +34,7 @@ pub fn print_alert5(
     message3: &str,
     message4: &str,
     message5: &str,
-)
-{
+) {
     println!(
         "{}\n{}\n{}\n{}\n{}\n",
         message1.yellow(),

ffi/ffi_c/ffi_c_ktb/Cargo.toml

@@ -12,7 +12,7 @@ crate-type = [ "cdylib", "staticlib" ]
 
 [dependencies]
 libc = "0.2.60"
-protobuf = "2.20.0"
+protobuf = "2.22.1"
 wedpr_s_hierarchical_deterministic_key = "1.3.0"
 wedpr_ffi_common = "1.0.0"
 wedpr_ffi_macros = "1.0.0"

ffi/ffi_c/ffi_c_ktb/src/hdk.rs

@@ -42,8 +42,7 @@ pub extern "C" fn wedpr_hdk_create_mnemonic_en(
 pub extern "C" fn wedpr_hdk_create_master_key_en(
     password_cstring: *mut c_char,
     mnemonic_cstring: *mut c_char,
-) -> *mut c_char
-{
+) -> *mut c_char {
     let result = panic::catch_unwind(|| {
         let passwd = c_safe_c_char_pointer_to_string!(password_cstring);
         let mnemonic = c_safe_c_char_pointer_to_string!(mnemonic_cstring);
@@ -71,8 +70,7 @@ pub extern "C" fn wedpr_hdk_derive_extended_key(
     account: c_int,
     change: c_int,
     address_index: c_int,
-) -> *mut c_char
-{
+) -> *mut c_char {
     let result = panic::catch_unwind(|| {
         let master_key = c_safe_c_char_pointer_to_bytes!(master_key_cstring);
 

ffi/ffi_c/ffi_c_scd/Cargo.toml

@@ -12,7 +12,7 @@ crate-type = [ "cdylib", "staticlib" ]
 
 [dependencies]
 libc = "0.2.60"
-protobuf = "2.20.0"
+protobuf = "2.22.1"
 wedpr_s_selective_certificate_disclosure = "1.3.0"
 wedpr_ffi_common = "1.0.0"
 wedpr_ffi_macros = "1.0.0"

ffi/ffi_c/ffi_c_scd/src/issuer.rs

@@ -49,8 +49,7 @@ pub extern "C" fn wedpr_scd_sign_certificate(
     sign_request_cstring: *mut c_char,
     user_id_cstring: *mut c_char,
     user_nonce_cstring: *mut c_char,
-) -> *mut c_char
-{
+) -> *mut c_char {
     let result = panic::catch_unwind(|| {
         let certificate_template_pb = c_safe_c_char_pointer_to_proto!(
             certificate_template_cstring,

ffi/ffi_c/ffi_c_scd/src/user.rs

@@ -22,8 +22,7 @@ use wedpr_ffi_common::utils::{
 pub extern "C" fn wedpr_scd_fill_certificate(
     attribute_dict_cstring: *mut c_char,
     certificate_template_cstring: *mut c_char,
-) -> *mut c_char
-{
+) -> *mut c_char {
     let result = panic::catch_unwind(|| {
         let attribute_dict_pb = c_safe_c_char_pointer_to_proto!(
             attribute_dict_cstring,
@@ -67,8 +66,7 @@ pub extern "C" fn wedpr_scd_blind_certificate_signature(
     user_private_key_cstring: *mut c_char,
     certificate_secrets_blinding_factors_cstring: *mut c_char,
     issuer_nonce_cstring: *mut c_char,
-) -> *mut c_char
-{
+) -> *mut c_char {
     let result = panic::catch_unwind(|| {
         let certificate_signature_pb = c_safe_c_char_pointer_to_proto!(
             certificate_signature_cstring,
@@ -118,8 +116,7 @@ pub extern "C" fn wedpr_scd_prove_selective_disclosure(
     certificate_template_cstring: *mut c_char,
     user_private_key_cstring: *mut c_char,
     verification_nonce_cstring: *mut c_char,
-) -> *mut c_char
-{
+) -> *mut c_char {
     let result = panic::catch_unwind(|| {
         let certificate_signature_pb = c_safe_c_char_pointer_to_proto!(
             certificate_signature_cstring,

ffi/ffi_c/ffi_c_scd/src/verifier.rs

@@ -46,8 +46,7 @@ pub extern "C" fn wedpr_scd_get_revealed_attributes(
 pub extern "C" fn wedpr_scd_verify_selective_disclosure(
     rule_set_cstring: *mut c_char,
     verify_request_cstring: *mut c_char,
-) -> *mut c_char
-{
+) -> *mut c_char {
     let result = panic::catch_unwind(|| {
         let verify_request_pb = c_safe_c_char_pointer_to_proto!(
             verify_request_cstring,

ffi/ffi_c/ffi_c_vcl/Cargo.toml

@@ -12,10 +12,10 @@ crate-type = [ "cdylib", "staticlib" ]
 
 [dependencies]
 libc = "0.2.60"
-protobuf = "2.20.0"
+protobuf = "2.22.1"
 wedpr_s_verifiable_confidential_ledger = { path = "../../../solution/verifiable_confidential_ledger"}
 wedpr_ffi_common = "1.0.0"
-wedpr_ffi_macros = { path = "/Users/asher/WeDPR/WeDPR-Lab-Crypto/ffi/ffi_macros" }
+wedpr_ffi_macros = { git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto.git", branch = "v1.1.0" }
 wedpr_s_protos = { path = "../../../protos"}
 wedpr_l_protos =  { git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto.git", branch = "v1.1.0" }
 wedpr_l_macros = "1.0.0"