@onekeyfe/react-native-aes-crypto 3.0.8 → 3.0.10

package/android/src/main/java/com/aescrypto/AesCryptoModule.kt

@@ -148,7 +148,7 @@ class AesCryptoModule(reactContext: ReactApplicationContext) :
 
     private fun shaX(data: String, algorithm: String): String {
         val md = MessageDigest.getInstance(algorithm)
-        md.update(data.toByteArray())
+        md.update(Hex.decode(data))
         return bytesToHex(md.digest())
     }
 
@@ -160,13 +160,13 @@ class AesCryptoModule(reactContext: ReactApplicationContext) :
             else -> SHA512Digest()
         }
         val gen = PKCS5S2ParametersGenerator(algorithmDigest)
-        gen.init(pwd.toByteArray(Charsets.UTF_8), salt.toByteArray(Charsets.UTF_8), cost)
+        gen.init(Hex.decode(pwd), Hex.decode(salt), cost)
         val key = (gen.generateDerivedParameters(length) as KeyParameter).key
         return bytesToHex(key)
     }
 
     private fun hmacX(text: String, key: String, algorithm: String): String {
-        val contentData = text.toByteArray(Charsets.UTF_8)
+        val contentData = Hex.decode(text)
         val akHexData = Hex.decode(key)
         val mac = Mac.getInstance(algorithm)
         val secretKey = SecretKeySpec(akHexData, algorithm)
@@ -182,8 +182,8 @@ class AesCryptoModule(reactContext: ReactApplicationContext) :
         val cipher = Cipher.getInstance(algorithm)
         val ivSpec = if (hexIv == null || hexIv.isEmpty()) emptyIvSpec else IvParameterSpec(Hex.decode(hexIv))
         cipher.init(Cipher.ENCRYPT_MODE, secretKey, ivSpec)
-        val encrypted = cipher.doFinal(text.toByteArray(Charsets.UTF_8))
-        return Base64.encodeToString(encrypted, Base64.NO_WRAP)
+        val encrypted = cipher.doFinal(Hex.decode(text))
+        return bytesToHex(encrypted)
     }
 
     private fun decryptImpl(ciphertext: String, hexKey: String, hexIv: String?, algorithm: String): String? {
@@ -194,7 +194,7 @@ class AesCryptoModule(reactContext: ReactApplicationContext) :
         val cipher = Cipher.getInstance(algorithm)
         val ivSpec = if (hexIv == null || hexIv.isEmpty()) emptyIvSpec else IvParameterSpec(Hex.decode(hexIv))
         cipher.init(Cipher.DECRYPT_MODE, secretKey, ivSpec)
-        val decrypted = cipher.doFinal(Base64.decode(ciphertext, Base64.NO_WRAP))
-        return String(decrypted, Charsets.UTF_8)
+        val decrypted = cipher.doFinal(Hex.decode(ciphertext))
+        return bytesToHex(decrypted)
     }
 }

package/ios/AesCrypto.mm

@@ -234,11 +234,11 @@ static NSData *aesCTR(NSString *operation, NSData *inputData, NSString *key, NSS
 
             int status = CCKeyDerivationPBKDF(
                 kCCPBKDF2,
-                passwordData.bytes, passwordData.length,
-                saltData.bytes, saltData.length,
+                (const char *)passwordData.bytes, passwordData.length,
+                (const uint8_t *)saltData.bytes, saltData.length,
                 prf,
                 (unsigned int)cost,
-                hashKeyData.mutableBytes, hashKeyData.length);
+                (uint8_t *)hashKeyData.mutableBytes, hashKeyData.length);
 
             if (status == kCCParamError) {
                 reject(@"keygen_fail", @"Key derivation parameter error", nil);
@@ -321,7 +321,7 @@ static NSData *aesCTR(NSString *operation, NSData *inputData, NSString *key, NSS
         @try {
             NSData *inputData = fromHex(text);
             NSMutableData *result = [[NSMutableData alloc] initWithLength:CC_SHA1_DIGEST_LENGTH];
-            CC_SHA1(inputData.bytes, (CC_LONG)inputData.length, result.mutableBytes);
+            CC_SHA1((const void *)inputData.bytes, (CC_LONG)inputData.length, (unsigned char *)result.mutableBytes);
             resolve(toHex(result));
         } @catch (NSException *exception) {
             reject(@"sha1_fail", exception.reason, nil);
@@ -343,7 +343,7 @@ static NSData *aesCTR(NSString *operation, NSData *inputData, NSString *key, NSS
                 reject(@"sha256_fail", @"Memory allocation error", nil);
                 return;
             }
-            CC_SHA256(inputData.bytes, (CC_LONG)inputData.length, buffer);
+            CC_SHA256((const void *)inputData.bytes, (CC_LONG)inputData.length, buffer);
             NSData *result = [NSData dataWithBytesNoCopy:buffer
                                                   length:CC_SHA256_DIGEST_LENGTH
                                             freeWhenDone:YES];
@@ -368,7 +368,7 @@ static NSData *aesCTR(NSString *operation, NSData *inputData, NSString *key, NSS
                 reject(@"sha512_fail", @"Memory allocation error", nil);
                 return;
             }
-            CC_SHA512(inputData.bytes, (CC_LONG)inputData.length, buffer);
+            CC_SHA512((const void *)inputData.bytes, (CC_LONG)inputData.length, buffer);
             NSData *result = [NSData dataWithBytesNoCopy:buffer
                                                   length:CC_SHA512_DIGEST_LENGTH
                                             freeWhenDone:YES];

package/lib/module/index.js

@@ -1,5 +1,15 @@
 "use strict";
 
 import NativeAesCrypto from "./NativeAesCrypto.js";
+export const encrypt = NativeAesCrypto.encrypt.bind(NativeAesCrypto);
+export const decrypt = NativeAesCrypto.decrypt.bind(NativeAesCrypto);
+export const pbkdf2 = NativeAesCrypto.pbkdf2.bind(NativeAesCrypto);
+export const hmac256 = NativeAesCrypto.hmac256.bind(NativeAesCrypto);
+export const hmac512 = NativeAesCrypto.hmac512.bind(NativeAesCrypto);
+export const sha1 = NativeAesCrypto.sha1.bind(NativeAesCrypto);
+export const sha256 = NativeAesCrypto.sha256.bind(NativeAesCrypto);
+export const sha512 = NativeAesCrypto.sha512.bind(NativeAesCrypto);
+export const randomUuid = NativeAesCrypto.randomUuid.bind(NativeAesCrypto);
+export const randomKey = NativeAesCrypto.randomKey.bind(NativeAesCrypto);
 export default NativeAesCrypto;
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeAesCrypto"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,OAAOA,eAAe,MAAM,sBAAmB;AAE/C,eAAeA,eAAe","ignoreList":[]}
+{"version":3,"names":["NativeAesCrypto","encrypt","bind","decrypt","pbkdf2","hmac256","hmac512","sha1","sha256","sha512","randomUuid","randomKey"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,OAAOA,eAAe,MAAM,sBAAmB;AAE/C,OAAO,MAAMC,OAAO,GAAGD,eAAe,CAACC,OAAO,CAACC,IAAI,CAACF,eAAe,CAAC;AACpE,OAAO,MAAMG,OAAO,GAAGH,eAAe,CAACG,OAAO,CAACD,IAAI,CAACF,eAAe,CAAC;AACpE,OAAO,MAAMI,MAAM,GAAGJ,eAAe,CAACI,MAAM,CAACF,IAAI,CAACF,eAAe,CAAC;AAClE,OAAO,MAAMK,OAAO,GAAGL,eAAe,CAACK,OAAO,CAACH,IAAI,CAACF,eAAe,CAAC;AACpE,OAAO,MAAMM,OAAO,GAAGN,eAAe,CAACM,OAAO,CAACJ,IAAI,CAACF,eAAe,CAAC;AACpE,OAAO,MAAMO,IAAI,GAAGP,eAAe,CAACO,IAAI,CAACL,IAAI,CAACF,eAAe,CAAC;AAC9D,OAAO,MAAMQ,MAAM,GAAGR,eAAe,CAACQ,MAAM,CAACN,IAAI,CAACF,eAAe,CAAC;AAClE,OAAO,MAAMS,MAAM,GAAGT,eAAe,CAACS,MAAM,CAACP,IAAI,CAACF,eAAe,CAAC;AAClE,OAAO,MAAMU,UAAU,GAAGV,eAAe,CAACU,UAAU,CAACR,IAAI,CAACF,eAAe,CAAC;AAC1E,OAAO,MAAMW,SAAS,GAAGX,eAAe,CAACW,SAAS,CAACT,IAAI,CAACF,eAAe,CAAC;AAExE,eAAeA,eAAe","ignoreList":[]}

package/lib/typescript/src/index.d.ts

@@ -1,4 +1,14 @@
 import NativeAesCrypto from './NativeAesCrypto';
+export declare const encrypt: (data: string, key: string, iv: string, algorithm: string) => Promise<string>;
+export declare const decrypt: (base64: string, key: string, iv: string, algorithm: string) => Promise<string>;
+export declare const pbkdf2: (password: string, salt: string, cost: number, length: number, algorithm: string) => Promise<string>;
+export declare const hmac256: (base64: string, key: string) => Promise<string>;
+export declare const hmac512: (base64: string, key: string) => Promise<string>;
+export declare const sha1: (text: string) => Promise<string>;
+export declare const sha256: (text: string) => Promise<string>;
+export declare const sha512: (text: string) => Promise<string>;
+export declare const randomUuid: () => Promise<string>;
+export declare const randomKey: (length: number) => Promise<string>;
 export default NativeAesCrypto;
 export type { Spec as AesCryptoSpec } from './NativeAesCrypto';
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAEhD,eAAe,eAAe,CAAC;AAC/B,YAAY,EAAE,IAAI,IAAI,aAAa,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAEhD,eAAO,MAAM,OAAO,+EAAgD,CAAC;AACrE,eAAO,MAAM,OAAO,iFAAgD,CAAC;AACrE,eAAO,MAAM,MAAM,sGAA+C,CAAC;AACnE,eAAO,MAAM,OAAO,kDAAgD,CAAC;AACrE,eAAO,MAAM,OAAO,kDAAgD,CAAC;AACrE,eAAO,MAAM,IAAI,mCAA6C,CAAC;AAC/D,eAAO,MAAM,MAAM,mCAA+C,CAAC;AACnE,eAAO,MAAM,MAAM,mCAA+C,CAAC;AACnE,eAAO,MAAM,UAAU,uBAAmD,CAAC;AAC3E,eAAO,MAAM,SAAS,qCAAkD,CAAC;AAEzE,eAAe,eAAe,CAAC;AAC/B,YAAY,EAAE,IAAI,IAAI,aAAa,EAAE,MAAM,mBAAmB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-aes-crypto",
-  "version": "3.0.8",
+  "version": "3.0.10",
   "description": "react-native-aes-crypto",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/index.tsx

@@ -1,4 +1,15 @@
 import NativeAesCrypto from './NativeAesCrypto';
 
+export const encrypt = NativeAesCrypto.encrypt.bind(NativeAesCrypto);
+export const decrypt = NativeAesCrypto.decrypt.bind(NativeAesCrypto);
+export const pbkdf2 = NativeAesCrypto.pbkdf2.bind(NativeAesCrypto);
+export const hmac256 = NativeAesCrypto.hmac256.bind(NativeAesCrypto);
+export const hmac512 = NativeAesCrypto.hmac512.bind(NativeAesCrypto);
+export const sha1 = NativeAesCrypto.sha1.bind(NativeAesCrypto);
+export const sha256 = NativeAesCrypto.sha256.bind(NativeAesCrypto);
+export const sha512 = NativeAesCrypto.sha512.bind(NativeAesCrypto);
+export const randomUuid = NativeAesCrypto.randomUuid.bind(NativeAesCrypto);
+export const randomKey = NativeAesCrypto.randomKey.bind(NativeAesCrypto);
+
 export default NativeAesCrypto;
 export type { Spec as AesCryptoSpec } from './NativeAesCrypto';