Skip to content

Commit 19d0961

Browse files
ghbuttonghbutton
committed
Merge branch 'master' of github.com:ghbutton/react-native-simple-crypto
2 parents 39191c6 + 5096af1 commit 19d0961

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+133
-133
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ dependencies {
6161

6262
```java
6363
......
64-
import com.pedrouid.crypto.RCTCryptoPackage;
64+
import com.pedrouid.crypto.RNSCCryptoPackage;
6565

6666
......
6767

6868
@Override
6969
protected List<ReactPackage> getPackages() {
7070
......
71-
new RCTCryptoPackage(),
71+
new RNSCCryptoPackage(),
7272
......
7373
}
7474
```

android/src/main/java/com/pedrouid/crypto/RCTAes.java renamed to android/src/main/java/com/pedrouid/crypto/RNSCAes.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,18 @@
4646
import com.facebook.react.bridge.ReactMethod;
4747
import com.facebook.react.bridge.Callback;
4848

49-
public class RCTAes extends ReactContextBaseJavaModule {
49+
public class RNSCAes extends ReactContextBaseJavaModule {
5050

5151
private static final String CIPHER_ALGORITHM = "AES/CBC/PKCS7Padding";
5252
private static final String KEY_ALGORITHM = "AES";
5353

54-
public RCTAes(ReactApplicationContext reactContext) {
54+
public RNSCAes(ReactApplicationContext reactContext) {
5555
super(reactContext);
5656
}
5757

5858
@Override
5959
public String getName() {
60-
return "RCTAes";
60+
return "RNSCAes";
6161
}
6262

6363
@ReactMethod

android/src/main/java/com/pedrouid/crypto/RCTCryptoPackage.java renamed to android/src/main/java/com/pedrouid/crypto/RNSCCryptoPackage.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
import com.facebook.react.bridge.ReactApplicationContext;
1212
import com.facebook.react.uimanager.ViewManager;
1313

14-
public class RCTCryptoPackage implements ReactPackage {
14+
public class RNSCCryptoPackage implements ReactPackage {
1515
@Override
1616
public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
1717
return Arrays.<NativeModule>asList(
18-
new RCTAes(reactContext),
19-
new RCTSha(reactContext),
20-
new RCTHmac(reactContext),
21-
new RCTPbkdf2(reactContext),
22-
new RCTRsa(reactContext),
23-
new RandomBytesModule(reactContext)
18+
new RNSCAes(reactContext),
19+
new RNSCSha(reactContext),
20+
new RNSCHmac(reactContext),
21+
new RNSCPbkdf2(reactContext),
22+
new RNSCRsa(reactContext),
23+
new RNSCRandomBytes(reactContext)
2424
);
2525
}
2626

android/src/main/java/com/pedrouid/crypto/RCTHmac.java renamed to android/src/main/java/com/pedrouid/crypto/RNSCHmac.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@
4646
import com.facebook.react.bridge.ReactMethod;
4747
import com.facebook.react.bridge.Callback;
4848

49-
public class RCTHmac extends ReactContextBaseJavaModule {
49+
public class RNSCHmac extends ReactContextBaseJavaModule {
5050

5151
public static final String HMAC_SHA_256 = "HmacSHA256";
5252

53-
public RCTHmac(ReactApplicationContext reactContext) {
53+
public RNSCHmac(ReactApplicationContext reactContext) {
5454
super(reactContext);
5555
}
5656

5757
@Override
5858
public String getName() {
59-
return "RCTHmac";
59+
return "RNSCHmac";
6060
}
6161

6262
@ReactMethod

android/src/main/java/com/pedrouid/crypto/RCTPbkdf2.java renamed to android/src/main/java/com/pedrouid/crypto/RNSCPbkdf2.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
import java.util.HashMap;
2222
import java.util.Map;
2323

24-
public class RCTPbkdf2 extends ReactContextBaseJavaModule {
24+
public class RNSCPbkdf2 extends ReactContextBaseJavaModule {
2525

26-
public RCTPbkdf2(ReactApplicationContext reactContext) {
26+
public RNSCPbkdf2(ReactApplicationContext reactContext) {
2727
super(reactContext);
2828
}
2929

3030
@Override
3131
public String getName() {
32-
return "RCTPbkdf2";
32+
return "RNSCPbkdf2";
3333
}
3434

3535
@ReactMethod

android/src/main/java/com/pedrouid/crypto/RandomBytesModule.java renamed to android/src/main/java/com/pedrouid/crypto/RNSCRandomBytes.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313

1414
import android.util.Base64;
1515

16-
class RandomBytesModule extends ReactContextBaseJavaModule {
16+
class RNSCRandomBytes extends ReactContextBaseJavaModule {
1717
private static final String SEED_KEY = "seed";
1818

19-
public RandomBytesModule(ReactApplicationContext reactContext) {
19+
public RNSCRandomBytes(ReactApplicationContext reactContext) {
2020
super(reactContext);
2121
}
2222

2323
@Override
2424
public String getName() {
25-
return "RNRandomBytes";
25+
return "RNSCRandomBytes";
2626
}
2727

2828
@ReactMethod

android/src/main/java/com/pedrouid/crypto/RCTRsa.java renamed to android/src/main/java/com/pedrouid/crypto/RNSCRsa.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
import java.io.IOException;
1414
import java.security.NoSuchAlgorithmException;
1515

16-
public class RCTRsa extends ReactContextBaseJavaModule {
16+
public class RNSCRsa extends ReactContextBaseJavaModule {
1717

1818
private final ReactApplicationContext reactContext;
1919

20-
public RCTRsa(ReactApplicationContext reactContext) {
20+
public RNSCRsa(ReactApplicationContext reactContext) {
2121
super(reactContext);
2222
this.reactContext = reactContext;
2323
}
2424

2525
@Override
2626
public String getName() {
27-
return "RCTRsa";
27+
return "RNSCRsa";
2828
}
2929

3030
private String getAlgorithmFromHash(final String hash) {
@@ -215,4 +215,4 @@ public void run() {
215215
}
216216
});
217217
}
218-
}
218+
}

android/src/main/java/com/pedrouid/crypto/RCTSha.java renamed to android/src/main/java/com/pedrouid/crypto/RNSCSha.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
import com.facebook.react.bridge.ReactMethod;
4848
import com.facebook.react.bridge.Callback;
4949

50-
public class RCTSha extends ReactContextBaseJavaModule {
50+
public class RNSCSha extends ReactContextBaseJavaModule {
5151

52-
public RCTSha(ReactApplicationContext reactContext) {
52+
public RNSCSha(ReactApplicationContext reactContext) {
5353
super(reactContext);
5454
}
5555

@@ -60,7 +60,7 @@ public RCTSha(ReactApplicationContext reactContext) {
6060

6161
@Override
6262
public String getName() {
63-
return "RCTSha";
63+
return "RNSCSha";
6464
}
6565

6666
private byte[] sha(byte[] data, String algorithm) throws Exception {

‎index.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ const convertArrayBufferToHex = hexLite.fromBuffer;
6666
const convertHexToArrayBuffer = hexLite.toBuffer;
6767

6868
async function randomBytes(length) {
69-
return convertBase64ToArrayBuffer(await NativeModules.RNRandomBytes.randomBytes(length));
69+
return convertBase64ToArrayBuffer(await NativeModules.RNSCRandomBytes.randomBytes(length));
7070
}
7171

7272
async function SHAWrapper(data, algorithm) {
7373
if (typeof data === 'string') {
74-
return NativeModules.Sha.shaUtf8(data, algorithm);
74+
return NativeModules.RNSCSha.shaUtf8(data, algorithm);
7575
} else {
7676
const dataBase64 = convertArrayBufferToBase64(data);
77-
const result = await NativeModules.Sha.shaBase64(dataBase64, algorithm);
77+
const result = await NativeModules.RNSCSha.shaBase64(dataBase64, algorithm);
7878

7979
return convertBase64ToArrayBuffer(result);
8080
}
@@ -85,13 +85,13 @@ const AES = {
8585
const textBase64 = convertArrayBufferToBase64(textArrayBuffer);
8686
const keyHex = convertArrayBufferToHex(keyArrayBuffer);
8787
const ivHex = convertArrayBufferToHex(ivArrayBuffer);
88-
return convertBase64ToArrayBuffer(await NativeModules.Aes.encrypt(textBase64, keyHex, ivHex));
88+
return convertBase64ToArrayBuffer(await NativeModules.RNSCAes.encrypt(textBase64, keyHex, ivHex));
8989
},
9090
decrypt: async function (cipherTextArrayBuffer, keyArrayBuffer, ivArrayBuffer) {
9191
const cipherTextBase64 = convertArrayBufferToBase64(cipherTextArrayBuffer);
9292
const keyHex = convertArrayBufferToHex(keyArrayBuffer);
9393
const ivHex = convertArrayBufferToHex(ivArrayBuffer);
94-
return convertBase64ToArrayBuffer(await NativeModules.Aes.decrypt(cipherTextBase64, keyHex, ivHex));
94+
return convertBase64ToArrayBuffer(await NativeModules.RNSCAes.decrypt(cipherTextBase64, keyHex, ivHex));
9595
}
9696
};
9797

@@ -105,7 +105,7 @@ const HMAC = {
105105
hmac256: async function (textArrayBuffer, keyArrayBuffer) {
106106
const textHex = convertArrayBufferToHex(textArrayBuffer);
107107
const keyHex = convertArrayBufferToHex(keyArrayBuffer);
108-
const signatureHex = await NativeModules.Hmac.hmac256(textHex, keyHex);
108+
const signatureHex = await NativeModules.RNSCHmac.hmac256(textHex, keyHex);
109109
return convertHexToArrayBuffer(signatureHex);
110110
}
111111
};
@@ -123,7 +123,7 @@ const PBKDF2 = {
123123
saltToHash = convertUtf8ToArrayBuffer(salt);
124124
}
125125

126-
const digest = await NativeModules.Pbkdf2.hash(
126+
const digest = await NativeModules.RNSCPbkdf2.hash(
127127
convertArrayBufferToBase64(passwordToHash),
128128
convertArrayBufferToBase64(saltToHash),
129129
iterations,
@@ -135,7 +135,7 @@ const PBKDF2 = {
135135
}
136136
};
137137

138-
const RSA = NativeModules.Rsa;
138+
const RSA = NativeModules.RNSCRsa;
139139

140140
const utils = {
141141
randomBytes,

‎ios/RCTCrypto/RCTAes.h‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)