Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KeyEncoding: Address lints/warnings and match line length

Browse Source 
Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland 2018-05-02 10:30:36 -05:00
parent aa92c4a9d5
commit 3e8d457501
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/wireguard/crypto/KeyEncoding.java
View File

@ -91,17 +91,18 @@ public final class KeyEncoding {
if (input.length != KEY_LENGTH_HEX) if (input.length != KEY_LENGTH_HEX)
throw new IllegalArgumentException(KEY_LENGTH_HEX_EXCEPTION_MESSAGE); throw new IllegalArgumentException(KEY_LENGTH_HEX_EXCEPTION_MESSAGE);
int c, c_acc = 0, c_alpha0, c_alpha, c_num0, c_num, c_val, state = 0; int c_acc = 0;
int state = 0;
for (int i = 0; i < KEY_LENGTH_HEX; ++i) { for (int i = 0; i < KEY_LENGTH_HEX; ++i) {
c = input[i]; final int c = input[i];
c_num = c ^ 48; final int c_num = c ^ 48;
c_num0 = (c_num - 10) >> 8; final int c_num0 = (c_num - 10) >> 8;
c_alpha = (c & ~32) - 55; final int c_alpha = (c & ~32) - 55;
c_alpha0 = ((c_alpha - 10) ^ (c_alpha - 16)) >> 8; final int c_alpha0 = ((c_alpha - 10) ^ (c_alpha - 16)) >> 8;
if ((c_num0 | c_alpha0) == 0) if ((c_num0 | c_alpha0) == 0)
throw new IllegalArgumentException(KEY_LENGTH_HEX_EXCEPTION_MESSAGE); throw new IllegalArgumentException(KEY_LENGTH_HEX_EXCEPTION_MESSAGE);
c_val = (c_num0 & c_num) | (c_alpha0 & c_alpha); final int c_val = (c_num0 & c_num) | (c_alpha0 & c_alpha);
if (state == 0) if (state == 0)
c_acc = c_val * 16; c_acc = c_val * 16;
else else
@ -133,8 +134,10 @@ public final class KeyEncoding {
if (key.length != KEY_LENGTH) if (key.length != KEY_LENGTH)
throw new IllegalArgumentException(KEY_LENGTH_EXCEPTION_MESSAGE); throw new IllegalArgumentException(KEY_LENGTH_EXCEPTION_MESSAGE);
for (int i = 0; i < KEY_LENGTH; ++i) { for (int i = 0; i < KEY_LENGTH; ++i) {
output[i * 2] = (char) (87 + (key[i] >> 4 & 0xf) + ((((key[i] >> 4 & 0xf) - 10) >> 8) & ~38)); output[i * 2] = (char) (87 + (key[i] >> 4 & 0xf)
output[i * 2 + 1] = (char) (87 + (key[i] & 0xf) + ((((key[i] & 0xf) - 10) >> 8) & ~38)); + ((((key[i] >> 4 & 0xf) - 10) >> 8) & ~38));
output[i * 2 + 1] = (char) (87 + (key[i] & 0xf)
+ ((((key[i] & 0xf) - 10) >> 8) & ~38));
} }
return new String(output); return new String(output);
} }