Skip to content

Commit 16565cb

Browse files
committed
Patch mobile crypto lib with pnpm
1 parent 14f32ee commit 16565cb

File tree

4 files changed

+73
-54
lines changed

4 files changed

+73
-54
lines changed

apps/mobile-wallet/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"ios": "expo run:ios --device",
1111
"lint": "eslint . --ext .ts,.tsx --max-warnings=0",
1212
"lint:fix": "eslint . --fix --ext .ts,.tsx",
13-
"postinstall": "patch-package && cd ../.. && turbo compile"
13+
"postinstall": "cd ../.. && turbo compile"
1414
},
1515
"dependencies": {
1616
"@alephium/shared": "workspace:*",
@@ -118,7 +118,6 @@
118118
"eslint-plugin-simple-import-sort": "^10.0.0",
119119
"eslint-plugin-unused-imports": "^3.0.0",
120120
"jest": "^29.4.3",
121-
"patch-package": "^7.0.0",
122121
"react-native-flipper": "^0.212.0",
123122
"redux-flipper": "^2.0.2",
124123
"ts-node": "^10.9.1",

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
},
2727
"pnpm": {
2828
"patchedDependencies": {
29-
29+
30+
3031
}
3132
}
3233
}

patches/[email protected]

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
diff --git a/android/src/main/java/com/tectiv3/aes/RCTAes.java b/android/src/main/java/com/tectiv3/aes/RCTAes.java
2+
index 5871b6f0cc0b01754f2265e13e804c8b5ecc8c19..b07988fe3a72c5c0ecc8d15552259630b976458e 100755
3+
--- a/android/src/main/java/com/tectiv3/aes/RCTAes.java
4+
+++ b/android/src/main/java/com/tectiv3/aes/RCTAes.java
5+
@@ -179,7 +179,7 @@ public class RCTAes extends ReactContextBaseJavaModule {
6+
throws NoSuchAlgorithmException, InvalidKeySpecException, UnsupportedEncodingException
7+
{
8+
PKCS5S2ParametersGenerator gen = new PKCS5S2ParametersGenerator(new SHA512Digest());
9+
- gen.init(pwd.getBytes("UTF_8"), salt.getBytes("UTF_8"), cost);
10+
+ gen.init(pwd.getBytes("UTF_8"), Base64.decode(salt, Base64.NO_WRAP), cost);
11+
byte[] key = ((KeyParameter) gen.generateDerivedParameters(length)).getKey();
12+
return bytesToHex(key);
13+
}
14+
diff --git a/ios/RCTAes/lib/AesCrypt.m b/ios/RCTAes/lib/AesCrypt.m
15+
index 4f20b49ee0c70e0858a442b5e0c733adc3fb8cfd..3cb594e3a75dea8999b226d6aa789f7528bd3ff7 100755
16+
--- a/ios/RCTAes/lib/AesCrypt.m
17+
+++ b/ios/RCTAes/lib/AesCrypt.m
18+
@@ -38,8 +38,7 @@
19+
+ (NSString *) pbkdf2:(NSString *)password salt: (NSString *)salt cost: (NSInteger)cost length: (NSInteger)length {
20+
// Data of String to generate Hash key(hexa decimal string).
21+
NSData *passwordData = [password dataUsingEncoding:NSUTF8StringEncoding];
22+
- NSData *saltData = [salt dataUsingEncoding:NSUTF8StringEncoding];
23+
-
24+
+ NSData *saltData = [[NSData alloc] initWithBase64EncodedString:salt options:NSDataBase64DecodingIgnoreUnknownCharacters];
25+
// Hash key (hexa decimal) string data length.
26+
NSMutableData *hashKeyData = [NSMutableData dataWithLength:length/8];
27+

pnpm-lock.yaml

Lines changed: 43 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)