aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-02 20:40:37 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-02 20:40:37 +0100
commite059b5550ca895fbd816dae2176abf41bda28711 (patch)
treedefedbfa2728332448b55a37fe0a8b147cfae4b1 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
parent8bec183eda38e423706001b9f030600f47a5761e (diff)
downloadopen-keychain-e059b5550ca895fbd816dae2176abf41bda28711.tar.gz
open-keychain-e059b5550ca895fbd816dae2176abf41bda28711.tar.bz2
open-keychain-e059b5550ca895fbd816dae2176abf41bda28711.zip
nonce is 4 bytes
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedIdentity.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedIdentity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedIdentity.java
index 3f7501adc..c46d0aa0a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedIdentity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedIdentity.java
@@ -79,14 +79,14 @@ public class LinkedIdentity {
b.append(mSubUri);
byte[] nonceBytes = Hex.decode(mNonce);
- if (nonceBytes.length != 12) {
- throw new AssertionError("nonce must be 12 bytes");
+ if (nonceBytes.length != 4) {
+ throw new AssertionError("nonce must be 4 bytes");
}
byte[] data = Strings.toUTF8ByteArray(b.toString());
- byte[] result = new byte[data.length+12];
- System.arraycopy(nonceBytes, 0, result, 0, 12);
- System.arraycopy(data, 0, result, 12, data.length);
+ byte[] result = new byte[data.length+4];
+ System.arraycopy(nonceBytes, 0, result, 0, 4);
+ System.arraycopy(data, 0, result, 4, data.length);
return result;
}
@@ -100,10 +100,10 @@ public class LinkedIdentity {
}
byte[] data = subpacket.getData();
- String nonce = Hex.toHexString(data, 0, 12);
+ String nonce = Hex.toHexString(data, 0, 4);
try {
- return parseUri(nonce, Strings.fromUTF8ByteArray(Arrays.copyOfRange(data, 12, data.length)));
+ return parseUri(nonce, Strings.fromUTF8ByteArray(Arrays.copyOfRange(data, 4, data.length)));
} catch (IllegalArgumentException e) {
Log.e(Constants.TAG, "error parsing uri in (suspected) linked id packet");
@@ -161,12 +161,12 @@ public class LinkedIdentity {
public static String generateNonce() {
// TODO make this actually random
- // byte[] data = new byte[96];
+ // byte[] data = new byte[4];
// new SecureRandom().nextBytes(data);
// return Hex.toHexString(data);
// debug for now
- return "0123456789abcdef01234567";
+ return "01234567";
}
}