status-im
/
status-keycard
mirror of https://github.com/status-im/status-keycard.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

JCOP4 workaround

This commit is contained in:
Michele Balistreri 2020-04-16 13:35:15 +03:00
parent e110c64f83
commit 677c2347c6
No known key found for this signature in database
GPG Key ID: E9567DA33A4F791A
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -56,7 +56,7 @@ dependencies {
testCompile('org.web3j:core:2.3.1') testCompile('org.web3j:core:2.3.1')
testCompile('org.bitcoinj:bitcoinj-core:0.14.5') testCompile('org.bitcoinj:bitcoinj-core:0.14.5')
testCompile('com.github.status-im.status-keycard-java:desktop:3.0.0') testCompile('com.github.status-im.status-keycard-java:desktop:3.0.0')
testCompile('org.bouncycastle:bcprov-jdk15on:1.60') testCompile('org.bouncycastle:bcprov-jdk15on:1.65')
testCompile("org.junit.jupiter:junit-jupiter-api:5.1.1") testCompile("org.junit.jupiter:junit-jupiter-api:5.1.1")
testRuntime("org.junit.jupiter:junit-jupiter-engine:5.1.1") testRuntime("org.junit.jupiter:junit-jupiter-engine:5.1.1")
} }

5
src/main/java/im/status/keycard/SecureChannel.java
View File

@ -65,7 +65,7 @@ public class SecureChannel {
scKeypair.genKeyPair(); scKeypair.genKeyPair();
remainingSlots = pairingLimit; remainingSlots = pairingLimit;
pairingSecret = new byte[SC_SECRET_LENGTH];
} }
/** /**
@ -75,9 +75,6 @@ public class SecureChannel {
* @param off the offset in the buffer * @param off the offset in the buffer
*/ */
public void initSecureChannel(byte[] aPairingSecret, short off) { public void initSecureChannel(byte[] aPairingSecret, short off) {
if (pairingSecret != null) return;
pairingSecret = new byte[SC_SECRET_LENGTH];
Util.arrayCopy(aPairingSecret, off, pairingSecret, (short) 0, SC_SECRET_LENGTH); Util.arrayCopy(aPairingSecret, off, pairingSecret, (short) 0, SC_SECRET_LENGTH);
scKeypair.genKeyPair(); scKeypair.genKeyPair();
} }