diff --git a/cocos/platform/ios/CCApplication-ios.mm b/cocos/platform/ios/CCApplication-ios.mm index f831314..c5492cf 100644 --- a/cocos/platform/ios/CCApplication-ios.mm +++ b/cocos/platform/ios/CCApplication-ios.mm @@ -331,17 +331,6 @@ void Application::copyTextToClipboard(const std::string &text) pasteboard.string = [NSString stringWithCString:text.c_str() encoding:NSUTF8StringEncoding]; } -void Application::showQRCode(const std::string &content, const std::string &title, const std::string &val) { - NSString *ntitle = [NSString stringWithCString:title.c_str() encoding:NSUTF8StringEncoding]; - NSString *ncontent = [NSString stringWithCString:content.c_str() encoding:NSUTF8StringEncoding]; - NSString *noid = [NSString stringWithCString:val.c_str() encoding:NSUTF8StringEncoding]; - dispatch_async(dispatch_get_main_queue(), ^{ - UIWindow* window = [[[UIApplication sharedApplication] delegate] window]; - [window.rootViewController showRestoreQR:ncontent title:ntitle oid: noid]; - }); - -} - void Application::saveKeyLocal(const std::string &account, const std::string &key) { NSString *naccount = [NSString stringWithCString:account.c_str() encoding:NSUTF8StringEncoding]; NSString *nkey = [NSString stringWithCString:key.c_str() encoding:NSUTF8StringEncoding]; diff --git a/external/ios/include/rustwallet/rustwallet.h b/external/ios/include/rustwallet/rustwallet.h index b4f35b2..596038f 100644 --- a/external/ios/include/rustwallet/rustwallet.h +++ b/external/ios/include/rustwallet/rustwallet.h @@ -3,47 +3,17 @@ #include #include -typedef struct CWallet { - char *msg_key; - char *master_key; - char *second_key; - char *backup_key; -} CWallet; +char *get_address(const char *msg_key, const char *master_key, const char *second_key); -struct CWallet new_wallet(const char *msg); +char *get_public_key(const char *msg_key, const char *master_key, const char *second_key); -struct CWallet reset_wallet(const char *msg_key, - const char *master_key, - const char *second_key, - const char *backup_key); +char *generate_sec_key(const char *msg_key, const char *master_key, const char *second_key); -void free_cwallet(struct CWallet cw); - -char *get_address(const char *msg_key, - const char *master_key, - const char *second_key, - const char *backup_key); - -char *get_public_key(const char *msg_key, - const char *master_key, - const char *second_key, - const char *backup_key); - -char *generate_sec_key(const char *msg_key, - const char *master_key, - const char *second_key, - const char *backup_key); - -char *sign(const char *msg_key, - const char *master_key, - const char *second_key, - const char *backup_key, - const char *msg); +char *sign(const char *msg_key, const char *master_key, const char *second_key, const char *msg); char *sign_for_tran(const char *msg_key, const char *master_key, const char *second_key, - const char *backup_key, const char *msg); char *rencrypt(const char *pk, const char *msg); @@ -51,15 +21,27 @@ char *rencrypt(const char *pk, const char *msg); char *wallet_encrypt(const char *msg_key, const char *master_key, const char *second_key, - const char *backup_key, const char *msg); char *wallet_decrypt(const char *msg_key, const char *master_key, const char *second_key, - const char *backup_key, const char *msg); char *hex_deflate(const char *content); char *hex_inflate(const char *content); + +char *hash_pass_svr(const char *content); + +char *keccak256_hash(const char *content); + +char *aes_encrypt(const char *content, const char *key); + +char *aes_decrypt(const char *content, const char *key); + +char *local_pass_hasher(const char *password); + +bool verify_local_pass(const char *password, const char *pass_hash); + +char *generate_client_key(const char *password, const char *openid, const char *salt); diff --git a/external/ios/libs/librustwallet.a b/external/ios/libs/librustwallet.a index 92b20c9..6dad2c7 100644 Binary files a/external/ios/libs/librustwallet.a and b/external/ios/libs/librustwallet.a differ