clang-format

.gitignore

@@ -19,3 +19,6 @@ build/*
 tests/bin
 tests/.crates.toml
 tests/.crates2.json
+
+.vscode
+

Makefile

@@ -100,7 +100,8 @@ ALL_C_SOURCE := c/always_success.c \
 				c/auth_libecc.c \
 				c/ckb_hex.h \
 				c/ripple.h \
-				c/elf_setup.h
+				c/elf_setup.h \
+				tests/auth-c-lock/auth_c_lock.c
 
 fmt:
 	clang-format -i $(ALL_C_SOURCE)

c/auth.c

@@ -16,22 +16,14 @@
 #define __builtin_ctzl secp256k1_ctz64_var_debruijn
 
 #include "ckb_consts.h"
-#if defined(CKB_USE_SIM)
-// exclude ckb_dlfcn.h
-#define CKB_C_STDLIB_CKB_DLFCN_H_
-#include "ckb_syscall_auth_sim.h"
-#else
 #include "ckb_syscalls.h"
-#endif
-
 #include "ckb_keccak256.h"
 #include "secp256k1_helper_20210801.h"
 #include "include/secp256k1_schnorrsig.h"
 // Must be the last to include, as secp256k1 and this header file both define
 // the macros CHECK and CHECK2.
 
 #include "ckb_auth.h"
-#undef CKB_SUCCESS
 #include "ckb_hex.h"
 #include "blake2b.h"
 #include "elf_setup.h"

c/auth_libecc.c

@@ -1,19 +1,9 @@
-#include "ckb_auth.h"
-
 // clang-format off
+#include "ckb_auth.h"
 #include "secp256r1.h"
-
 #include "ckb_consts.h"
-#if defined(CKB_USE_SIM)
-// exclude ckb_dlfcn.h
-#define CKB_C_STDLIB_CKB_DLFCN_H_
-#include "ckb_syscall_auth_sim.h"
-#else
 #include "ckb_syscalls.h"
-#endif
-
 #include "blake2b.h"
-#undef CKB_SUCCESS
 #include "elf_setup.h"
 // clang-format on
 

c/cardano/cardano_lock_inc.h

@@ -1,14 +1,5 @@
 #include "ckb_consts.h"
-#if defined(CKB_USE_SIM)
-// exclude ckb_dlfcn.h
-#define CKB_C_STDLIB_CKB_DLFCN_H_
-#include "ckb_syscall_auth_sim.h"
-#else
-
 #include "ckb_syscalls.h"
-#endif
-
-//
 #include "blake2b.h"
 #include "nanocbor.h"
 

c/ckb_auth.h

@@ -11,20 +11,22 @@
 // secp256k1 also defines this macros
 #undef CHECK2
 #undef CHECK
-#define CHECK2(cond, code) \
-    do {                   \
-        if (!(cond)) {     \
-            err = code;    \
-            goto exit;     \
-        }                  \
+#define CHECK2(cond, code)                                              \
+    do {                                                                \
+        if (!(cond)) {                                                  \
+            printf("%s:%d, error code = %d", __FILE__, __LINE__, code); \
+            err = code;                                                 \
+            goto exit;                                                  \
+        }                                                               \
     } while (0)
 
-#define CHECK(code)      \
-    do {                 \
-        if (code != 0) { \
-            err = code;  \
-            goto exit;   \
-        }                \
+#define CHECK(code)                                                     \
+    do {                                                                \
+        if (code != 0) {                                                \
+            printf("%s:%d, error code = %d", __FILE__, __LINE__, code); \
+            err = code;                                                 \
+            goto exit;                                                  \
+        }                                                               \
     } while (0)
 
 #define CKB_AUTH_LEN 21

ckb-auth-rs/src/ckb_auth_dl.rs

@@ -25,11 +25,11 @@ type CkbAuthValidate = unsafe extern "C" fn(
     prefilled_data: *const u8,
     auth_algorithm_id: u8,
     signature: *const u8,
-    signature_size: u32,
+    signature_size: usize,
     message: *const u8,
-    message_size: u32,
+    message_size: usize,
     pubkey_hash: *mut u8,
-    pubkey_hash_size: u32,
+    pubkey_hash_size: usize,
 ) -> i32;
 
 const EXPORTED_FUNC_NAME: &str = "ckb_auth_validate";
@@ -130,14 +130,14 @@ pub fn ckb_auth_dl(
     // TODO:
     let rc_code = unsafe {
         func(
-            signature.as_ptr(),
+            0 as *const u8,
             id.algorithm_id.clone().into(),
             signature.as_ptr(),
-            signature.len() as u32,
+            signature.len() as usize,
             message.as_ptr(),
-            message.len() as u32,
+            message.len() as usize,
             pub_key.as_mut_ptr(),
-            pub_key.len() as u32,
+            pub_key.len() as usize,
         )
     };