mirror of
https://github.com/MatsuriDayo/NekoBoxForAndroid.git
synced 2025-12-18 22:20:06 +08:00
remove warp generator
This commit is contained in:
armv9
parent
5b74ded6da
commit
46771b07d1
@ -1,497 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright © 2016 Southern Storm Software, Pty Ltd.
|
|
||||||
* Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
|
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.wireguard.crypto;
|
|
||||||
|
|
||||||
import androidx.annotation.Nullable;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Implementation of Curve25519 ECDH.
|
|
||||||
* <p>
|
|
||||||
* This implementation was imported to WireGuard from noise-java:
|
|
||||||
* https://github.com/rweather/noise-java
|
|
||||||
* <p>
|
|
||||||
* This implementation is based on that from arduinolibs:
|
|
||||||
* https://github.com/rweather/arduinolibs
|
|
||||||
* <p>
|
|
||||||
* Differences in this version are due to using 26-bit limbs for the
|
|
||||||
* representation instead of the 8/16/32-bit limbs in the original.
|
|
||||||
* <p>
|
|
||||||
* References: http://cr.yp.to/ecdh.html, RFC 7748
|
|
||||||
*/
|
|
||||||
@SuppressWarnings({"MagicNumber", "NonConstantFieldWithUpperCaseName", "SuspiciousNameCombination"})
|
|
||||||
public final class Curve25519 {
|
|
||||||
// Numbers modulo 2^255 - 19 are broken up into ten 26-bit words.
|
|
||||||
private static final int NUM_LIMBS_255BIT = 10;
|
|
||||||
private static final int NUM_LIMBS_510BIT = 20;
|
|
||||||
|
|
||||||
private final int[] A;
|
|
||||||
private final int[] AA;
|
|
||||||
private final int[] B;
|
|
||||||
private final int[] BB;
|
|
||||||
private final int[] C;
|
|
||||||
private final int[] CB;
|
|
||||||
private final int[] D;
|
|
||||||
private final int[] DA;
|
|
||||||
private final int[] E;
|
|
||||||
private final long[] t1;
|
|
||||||
private final int[] t2;
|
|
||||||
private final int[] x_1;
|
|
||||||
private final int[] x_2;
|
|
||||||
private final int[] x_3;
|
|
||||||
private final int[] z_2;
|
|
||||||
private final int[] z_3;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructs the temporary state holder for Curve25519 evaluation.
|
|
||||||
*/
|
|
||||||
private Curve25519() {
|
|
||||||
// Allocate memory for all of the temporary variables we will need.
|
|
||||||
x_1 = new int[NUM_LIMBS_255BIT];
|
|
||||||
x_2 = new int[NUM_LIMBS_255BIT];
|
|
||||||
x_3 = new int[NUM_LIMBS_255BIT];
|
|
||||||
z_2 = new int[NUM_LIMBS_255BIT];
|
|
||||||
z_3 = new int[NUM_LIMBS_255BIT];
|
|
||||||
A = new int[NUM_LIMBS_255BIT];
|
|
||||||
B = new int[NUM_LIMBS_255BIT];
|
|
||||||
C = new int[NUM_LIMBS_255BIT];
|
|
||||||
D = new int[NUM_LIMBS_255BIT];
|
|
||||||
E = new int[NUM_LIMBS_255BIT];
|
|
||||||
AA = new int[NUM_LIMBS_255BIT];
|
|
||||||
BB = new int[NUM_LIMBS_255BIT];
|
|
||||||
DA = new int[NUM_LIMBS_255BIT];
|
|
||||||
CB = new int[NUM_LIMBS_255BIT];
|
|
||||||
t1 = new long[NUM_LIMBS_510BIT];
|
|
||||||
t2 = new int[NUM_LIMBS_510BIT];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Conditional swap of two values.
|
|
||||||
*
|
|
||||||
* @param select Set to 1 to swap, 0 to leave as-is.
|
|
||||||
* @param x The first value.
|
|
||||||
* @param y The second value.
|
|
||||||
*/
|
|
||||||
private static void cswap(int select, final int[] x, final int[] y) {
|
|
||||||
select = -select;
|
|
||||||
for (int index = 0; index < NUM_LIMBS_255BIT; ++index) {
|
|
||||||
final int dummy = select & (x[index] ^ y[index]);
|
|
||||||
x[index] ^= dummy;
|
|
||||||
y[index] ^= dummy;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Evaluates the Curve25519 curve.
|
|
||||||
*
|
|
||||||
* @param result Buffer to place the result of the evaluation into.
|
|
||||||
* @param offset Offset into the result buffer.
|
|
||||||
* @param privateKey The private key to use in the evaluation.
|
|
||||||
* @param publicKey The public key to use in the evaluation, or null
|
|
||||||
* if the base point of the curve should be used.
|
|
||||||
*/
|
|
||||||
public static void eval(final byte[] result, final int offset,
|
|
||||||
final byte[] privateKey, @Nullable final byte[] publicKey) {
|
|
||||||
final Curve25519 state = new Curve25519();
|
|
||||||
try {
|
|
||||||
// Unpack the public key value. If null, use 9 as the base point.
|
|
||||||
Arrays.fill(state.x_1, 0);
|
|
||||||
if (publicKey != null) {
|
|
||||||
// Convert the input value from little-endian into 26-bit limbs.
|
|
||||||
for (int index = 0; index < 32; ++index) {
|
|
||||||
final int bit = (index * 8) % 26;
|
|
||||||
final int word = (index * 8) / 26;
|
|
||||||
final int value = publicKey[index] & 0xFF;
|
|
||||||
if (bit <= (26 - 8)) {
|
|
||||||
state.x_1[word] |= value << bit;
|
|
||||||
} else {
|
|
||||||
state.x_1[word] |= value << bit;
|
|
||||||
state.x_1[word] &= 0x03FFFFFF;
|
|
||||||
state.x_1[word + 1] |= value >> (26 - bit);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Just in case, we reduce the number modulo 2^255 - 19 to
|
|
||||||
// make sure that it is in range of the field before we start.
|
|
||||||
// This eliminates values between 2^255 - 19 and 2^256 - 1.
|
|
||||||
state.reduceQuick(state.x_1);
|
|
||||||
state.reduceQuick(state.x_1);
|
|
||||||
} else {
|
|
||||||
state.x_1[0] = 9;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize the other temporary variables.
|
|
||||||
Arrays.fill(state.x_2, 0); // x_2 = 1
|
|
||||||
state.x_2[0] = 1;
|
|
||||||
Arrays.fill(state.z_2, 0); // z_2 = 0
|
|
||||||
System.arraycopy(state.x_1, 0, state.x_3, 0, state.x_1.length); // x_3 = x_1
|
|
||||||
Arrays.fill(state.z_3, 0); // z_3 = 1
|
|
||||||
state.z_3[0] = 1;
|
|
||||||
|
|
||||||
// Evaluate the curve for every bit of the private key.
|
|
||||||
state.evalCurve(privateKey);
|
|
||||||
|
|
||||||
// Compute x_2 * (z_2 ^ (p - 2)) where p = 2^255 - 19.
|
|
||||||
state.recip(state.z_3, state.z_2);
|
|
||||||
state.mul(state.x_2, state.x_2, state.z_3);
|
|
||||||
|
|
||||||
// Convert x_2 into little-endian in the result buffer.
|
|
||||||
for (int index = 0; index < 32; ++index) {
|
|
||||||
final int bit = (index * 8) % 26;
|
|
||||||
final int word = (index * 8) / 26;
|
|
||||||
if (bit <= (26 - 8))
|
|
||||||
result[offset + index] = (byte) (state.x_2[word] >> bit);
|
|
||||||
else
|
|
||||||
result[offset + index] = (byte) ((state.x_2[word] >> bit) | (state.x_2[word + 1] << (26 - bit)));
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
// Clean up all temporary state before we exit.
|
|
||||||
state.destroy();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Subtracts two numbers modulo 2^255 - 19.
|
|
||||||
*
|
|
||||||
* @param result The result.
|
|
||||||
* @param x The first number to subtract.
|
|
||||||
* @param y The second number to subtract.
|
|
||||||
*/
|
|
||||||
private static void sub(final int[] result, final int[] x, final int[] y) {
|
|
||||||
int index;
|
|
||||||
int borrow;
|
|
||||||
|
|
||||||
// Subtract y from x to generate the intermediate result.
|
|
||||||
borrow = 0;
|
|
||||||
for (index = 0; index < NUM_LIMBS_255BIT; ++index) {
|
|
||||||
borrow = x[index] - y[index] - ((borrow >> 26) & 0x01);
|
|
||||||
result[index] = borrow & 0x03FFFFFF;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If we had a borrow, then the result has gone negative and we
|
|
||||||
// have to add 2^255 - 19 to the result to make it positive again.
|
|
||||||
// The top bits of "borrow" will be all 1's if there is a borrow
|
|
||||||
// or it will be all 0's if there was no borrow. Easiest is to
|
|
||||||
// conditionally subtract 19 and then mask off the high bits.
|
|
||||||
borrow = result[0] - ((-((borrow >> 26) & 0x01)) & 19);
|
|
||||||
result[0] = borrow & 0x03FFFFFF;
|
|
||||||
for (index = 1; index < NUM_LIMBS_255BIT; ++index) {
|
|
||||||
borrow = result[index] - ((borrow >> 26) & 0x01);
|
|
||||||
result[index] = borrow & 0x03FFFFFF;
|
|
||||||
}
|
|
||||||
result[NUM_LIMBS_255BIT - 1] &= 0x001FFFFF;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds two numbers modulo 2^255 - 19.
|
|
||||||
*
|
|
||||||
* @param result The result.
|
|
||||||
* @param x The first number to add.
|
|
||||||
* @param y The second number to add.
|
|
||||||
*/
|
|
||||||
private void add(final int[] result, final int[] x, final int[] y) {
|
|
||||||
int carry = x[0] + y[0];
|
|
||||||
result[0] = carry & 0x03FFFFFF;
|
|
||||||
for (int index = 1; index < NUM_LIMBS_255BIT; ++index) {
|
|
||||||
carry = (carry >> 26) + x[index] + y[index];
|
|
||||||
result[index] = carry & 0x03FFFFFF;
|
|
||||||
}
|
|
||||||
reduceQuick(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Destroy all sensitive data in this object.
|
|
||||||
*/
|
|
||||||
private void destroy() {
|
|
||||||
// Destroy all temporary variables.
|
|
||||||
Arrays.fill(x_1, 0);
|
|
||||||
Arrays.fill(x_2, 0);
|
|
||||||
Arrays.fill(x_3, 0);
|
|
||||||
Arrays.fill(z_2, 0);
|
|
||||||
Arrays.fill(z_3, 0);
|
|
||||||
Arrays.fill(A, 0);
|
|
||||||
Arrays.fill(B, 0);
|
|
||||||
Arrays.fill(C, 0);
|
|
||||||
Arrays.fill(D, 0);
|
|
||||||
Arrays.fill(E, 0);
|
|
||||||
Arrays.fill(AA, 0);
|
|
||||||
Arrays.fill(BB, 0);
|
|
||||||
Arrays.fill(DA, 0);
|
|
||||||
Arrays.fill(CB, 0);
|
|
||||||
Arrays.fill(t1, 0L);
|
|
||||||
Arrays.fill(t2, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Evaluates the curve for every bit in a secret key.
|
|
||||||
*
|
|
||||||
* @param s The 32-byte secret key.
|
|
||||||
*/
|
|
||||||
private void evalCurve(final byte[] s) {
|
|
||||||
int sposn = 31;
|
|
||||||
int sbit = 6;
|
|
||||||
int svalue = s[sposn] | 0x40;
|
|
||||||
int swap = 0;
|
|
||||||
|
|
||||||
// Iterate over all 255 bits of "s" from the highest to the lowest.
|
|
||||||
// We ignore the high bit of the 256-bit representation of "s".
|
|
||||||
while (true) {
|
|
||||||
// Conditional swaps on entry to this bit but only if we
|
|
||||||
// didn't swap on the previous bit.
|
|
||||||
final int select = (svalue >> sbit) & 0x01;
|
|
||||||
swap ^= select;
|
|
||||||
cswap(swap, x_2, x_3);
|
|
||||||
cswap(swap, z_2, z_3);
|
|
||||||
swap = select;
|
|
||||||
|
|
||||||
// Evaluate the curve.
|
|
||||||
add(A, x_2, z_2); // A = x_2 + z_2
|
|
||||||
square(AA, A); // AA = A^2
|
|
||||||
sub(B, x_2, z_2); // B = x_2 - z_2
|
|
||||||
square(BB, B); // BB = B^2
|
|
||||||
sub(E, AA, BB); // E = AA - BB
|
|
||||||
add(C, x_3, z_3); // C = x_3 + z_3
|
|
||||||
sub(D, x_3, z_3); // D = x_3 - z_3
|
|
||||||
mul(DA, D, A); // DA = D * A
|
|
||||||
mul(CB, C, B); // CB = C * B
|
|
||||||
add(x_3, DA, CB); // x_3 = (DA + CB)^2
|
|
||||||
square(x_3, x_3);
|
|
||||||
sub(z_3, DA, CB); // z_3 = x_1 * (DA - CB)^2
|
|
||||||
square(z_3, z_3);
|
|
||||||
mul(z_3, z_3, x_1);
|
|
||||||
mul(x_2, AA, BB); // x_2 = AA * BB
|
|
||||||
mulA24(z_2, E); // z_2 = E * (AA + a24 * E)
|
|
||||||
add(z_2, z_2, AA);
|
|
||||||
mul(z_2, z_2, E);
|
|
||||||
|
|
||||||
// Move onto the next lower bit of "s".
|
|
||||||
if (sbit > 0) {
|
|
||||||
--sbit;
|
|
||||||
} else if (sposn == 0) {
|
|
||||||
break;
|
|
||||||
} else if (sposn == 1) {
|
|
||||||
--sposn;
|
|
||||||
svalue = s[sposn] & 0xF8;
|
|
||||||
sbit = 7;
|
|
||||||
} else {
|
|
||||||
--sposn;
|
|
||||||
svalue = s[sposn];
|
|
||||||
sbit = 7;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Final conditional swaps.
|
|
||||||
cswap(swap, x_2, x_3);
|
|
||||||
cswap(swap, z_2, z_3);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Multiplies two numbers modulo 2^255 - 19.
|
|
||||||
*
|
|
||||||
* @param result The result.
|
|
||||||
* @param x The first number to multiply.
|
|
||||||
* @param y The second number to multiply.
|
|
||||||
*/
|
|
||||||
private void mul(final int[] result, final int[] x, final int[] y) {
|
|
||||||
// Multiply the two numbers to create the intermediate result.
|
|
||||||
long v = x[0];
|
|
||||||
for (int i = 0; i < NUM_LIMBS_255BIT; ++i) {
|
|
||||||
t1[i] = v * y[i];
|
|
||||||
}
|
|
||||||
for (int i = 1; i < NUM_LIMBS_255BIT; ++i) {
|
|
||||||
v = x[i];
|
|
||||||
for (int j = 0; j < (NUM_LIMBS_255BIT - 1); ++j) {
|
|
||||||
t1[i + j] += v * y[j];
|
|
||||||
}
|
|
||||||
t1[i + NUM_LIMBS_255BIT - 1] = v * y[NUM_LIMBS_255BIT - 1];
|
|
||||||
}
|
|
||||||
|
|
||||||
// Propagate carries and convert back into 26-bit words.
|
|
||||||
v = t1[0];
|
|
||||||
t2[0] = ((int) v) & 0x03FFFFFF;
|
|
||||||
for (int i = 1; i < NUM_LIMBS_510BIT; ++i) {
|
|
||||||
v = (v >> 26) + t1[i];
|
|
||||||
t2[i] = ((int) v) & 0x03FFFFFF;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reduce the result modulo 2^255 - 19.
|
|
||||||
reduce(result, t2, NUM_LIMBS_255BIT);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Multiplies a number by the a24 constant, modulo 2^255 - 19.
|
|
||||||
*
|
|
||||||
* @param result The result.
|
|
||||||
* @param x The number to multiply by a24.
|
|
||||||
*/
|
|
||||||
private void mulA24(final int[] result, final int[] x) {
|
|
||||||
final long a24 = 121665;
|
|
||||||
long carry = 0;
|
|
||||||
for (int index = 0; index < NUM_LIMBS_255BIT; ++index) {
|
|
||||||
carry += a24 * x[index];
|
|
||||||
t2[index] = ((int) carry) & 0x03FFFFFF;
|
|
||||||
carry >>= 26;
|
|
||||||
}
|
|
||||||
t2[NUM_LIMBS_255BIT] = ((int) carry) & 0x03FFFFFF;
|
|
||||||
reduce(result, t2, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Raise x to the power of (2^250 - 1).
|
|
||||||
*
|
|
||||||
* @param result The result. Must not overlap with x.
|
|
||||||
* @param x The argument.
|
|
||||||
*/
|
|
||||||
private void pow250(final int[] result, final int[] x) {
|
|
||||||
// The big-endian hexadecimal expansion of (2^250 - 1) is:
|
|
||||||
// 03FFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF
|
|
||||||
//
|
|
||||||
// The naive implementation needs to do 2 multiplications per 1 bit and
|
|
||||||
// 1 multiplication per 0 bit. We can improve upon this by creating a
|
|
||||||
// pattern 0000000001 ... 0000000001. If we square and multiply the
|
|
||||||
// pattern by itself we can turn the pattern into the partial results
|
|
||||||
// 0000000011 ... 0000000011, 0000000111 ... 0000000111, etc.
|
|
||||||
// This averages out to about 1.1 multiplications per 1 bit instead of 2.
|
|
||||||
|
|
||||||
// Build a pattern of 250 bits in length of repeated copies of 0000000001.
|
|
||||||
square(A, x);
|
|
||||||
for (int j = 0; j < 9; ++j)
|
|
||||||
square(A, A);
|
|
||||||
mul(result, A, x);
|
|
||||||
for (int i = 0; i < 23; ++i) {
|
|
||||||
for (int j = 0; j < 10; ++j)
|
|
||||||
square(A, A);
|
|
||||||
mul(result, result, A);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Multiply bit-shifted versions of the 0000000001 pattern into
|
|
||||||
// the result to "fill in" the gaps in the pattern.
|
|
||||||
square(A, result);
|
|
||||||
mul(result, result, A);
|
|
||||||
for (int j = 0; j < 8; ++j) {
|
|
||||||
square(A, A);
|
|
||||||
mul(result, result, A);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Computes the reciprocal of a number modulo 2^255 - 19.
|
|
||||||
*
|
|
||||||
* @param result The result. Must not overlap with x.
|
|
||||||
* @param x The argument.
|
|
||||||
*/
|
|
||||||
private void recip(final int[] result, final int[] x) {
|
|
||||||
// The reciprocal is the same as x ^ (p - 2) where p = 2^255 - 19.
|
|
||||||
// The big-endian hexadecimal expansion of (p - 2) is:
|
|
||||||
// 7FFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFEB
|
|
||||||
// Start with the 250 upper bits of the expansion of (p - 2).
|
|
||||||
pow250(result, x);
|
|
||||||
|
|
||||||
// Deal with the 5 lowest bits of (p - 2), 01011, from highest to lowest.
|
|
||||||
square(result, result);
|
|
||||||
square(result, result);
|
|
||||||
mul(result, result, x);
|
|
||||||
square(result, result);
|
|
||||||
square(result, result);
|
|
||||||
mul(result, result, x);
|
|
||||||
square(result, result);
|
|
||||||
mul(result, result, x);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reduce a number modulo 2^255 - 19.
|
|
||||||
*
|
|
||||||
* @param result The result.
|
|
||||||
* @param x The value to be reduced. This array will be
|
|
||||||
* modified during the reduction.
|
|
||||||
* @param size The number of limbs in the high order half of x.
|
|
||||||
*/
|
|
||||||
private void reduce(final int[] result, final int[] x, final int size) {
|
|
||||||
// Calculate (x mod 2^255) + ((x / 2^255) * 19) which will
|
|
||||||
// either produce the answer we want or it will produce a
|
|
||||||
// value of the form "answer + j * (2^255 - 19)". There are
|
|
||||||
// 5 left-over bits in the top-most limb of the bottom half.
|
|
||||||
int carry = 0;
|
|
||||||
int limb = x[NUM_LIMBS_255BIT - 1] >> 21;
|
|
||||||
x[NUM_LIMBS_255BIT - 1] &= 0x001FFFFF;
|
|
||||||
for (int index = 0; index < size; ++index) {
|
|
||||||
limb += x[NUM_LIMBS_255BIT + index] << 5;
|
|
||||||
carry += (limb & 0x03FFFFFF) * 19 + x[index];
|
|
||||||
x[index] = carry & 0x03FFFFFF;
|
|
||||||
limb >>= 26;
|
|
||||||
carry >>= 26;
|
|
||||||
}
|
|
||||||
if (size < NUM_LIMBS_255BIT) {
|
|
||||||
// The high order half of the number is short; e.g. for mulA24().
|
|
||||||
// Propagate the carry through the rest of the low order part.
|
|
||||||
for (int index = size; index < NUM_LIMBS_255BIT; ++index) {
|
|
||||||
carry += x[index];
|
|
||||||
x[index] = carry & 0x03FFFFFF;
|
|
||||||
carry >>= 26;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// The "j" value may still be too large due to the final carry-out.
|
|
||||||
// We must repeat the reduction. If we already have the answer,
|
|
||||||
// then this won't do any harm but we must still do the calculation
|
|
||||||
// to preserve the overall timing. The "j" value will be between
|
|
||||||
// 0 and 19, which means that the carry we care about is in the
|
|
||||||
// top 5 bits of the highest limb of the bottom half.
|
|
||||||
carry = (x[NUM_LIMBS_255BIT - 1] >> 21) * 19;
|
|
||||||
x[NUM_LIMBS_255BIT - 1] &= 0x001FFFFF;
|
|
||||||
for (int index = 0; index < NUM_LIMBS_255BIT; ++index) {
|
|
||||||
carry += x[index];
|
|
||||||
result[index] = carry & 0x03FFFFFF;
|
|
||||||
carry >>= 26;
|
|
||||||
}
|
|
||||||
|
|
||||||
// At this point "x" will either be the answer or it will be the
|
|
||||||
// answer plus (2^255 - 19). Perform a trial subtraction to
|
|
||||||
// complete the reduction process.
|
|
||||||
reduceQuick(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reduces a number modulo 2^255 - 19 where it is known that the
|
|
||||||
* number can be reduced with only 1 trial subtraction.
|
|
||||||
*
|
|
||||||
* @param x The number to reduce, and the result.
|
|
||||||
*/
|
|
||||||
private void reduceQuick(final int[] x) {
|
|
||||||
// Perform a trial subtraction of (2^255 - 19) from "x" which is
|
|
||||||
// equivalent to adding 19 and subtracting 2^255. We add 19 here;
|
|
||||||
// the subtraction of 2^255 occurs in the next step.
|
|
||||||
int carry = 19;
|
|
||||||
for (int index = 0; index < NUM_LIMBS_255BIT; ++index) {
|
|
||||||
carry += x[index];
|
|
||||||
t2[index] = carry & 0x03FFFFFF;
|
|
||||||
carry >>= 26;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If there was a borrow, then the original "x" is the correct answer.
|
|
||||||
// If there was no borrow, then "t2" is the correct answer. Select the
|
|
||||||
// correct answer but do it in a way that instruction timing will not
|
|
||||||
// reveal which value was selected. Borrow will occur if bit 21 of
|
|
||||||
// "t2" is zero. Turn the bit into a selection mask.
|
|
||||||
final int mask = -((t2[NUM_LIMBS_255BIT - 1] >> 21) & 0x01);
|
|
||||||
final int nmask = ~mask;
|
|
||||||
t2[NUM_LIMBS_255BIT - 1] &= 0x001FFFFF;
|
|
||||||
for (int index = 0; index < NUM_LIMBS_255BIT; ++index)
|
|
||||||
x[index] = (x[index] & nmask) | (t2[index] & mask);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Squares a number modulo 2^255 - 19.
|
|
||||||
*
|
|
||||||
* @param result The result.
|
|
||||||
* @param x The number to square.
|
|
||||||
*/
|
|
||||||
private void square(final int[] result, final int[] x) {
|
|
||||||
mul(result, x, x);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,288 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
|
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.wireguard.crypto;
|
|
||||||
|
|
||||||
import com.wireguard.crypto.KeyFormatException.Type;
|
|
||||||
|
|
||||||
import java.security.MessageDigest;
|
|
||||||
import java.security.SecureRandom;
|
|
||||||
import java.util.Arrays;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents a WireGuard public or private key. This class uses specialized constant-time base64
|
|
||||||
* and hexadecimal codec implementations that resist side-channel attacks.
|
|
||||||
* <p>
|
|
||||||
* Instances of this class are immutable.
|
|
||||||
*/
|
|
||||||
@SuppressWarnings("MagicNumber")
|
|
||||||
public final class Key {
|
|
||||||
private final byte[] key;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructs an object encapsulating the supplied key.
|
|
||||||
*
|
|
||||||
* @param key an array of bytes containing a binary key. Callers of this constructor are
|
|
||||||
* responsible for ensuring that the array is of the correct length.
|
|
||||||
*/
|
|
||||||
private Key(final byte[] key) {
|
|
||||||
// Defensively copy to ensure immutability.
|
|
||||||
this.key = Arrays.copyOf(key, key.length);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Decodes a single 4-character base64 chunk to an integer in constant time.
|
|
||||||
*
|
|
||||||
* @param src an array of at least 4 characters in base64 format
|
|
||||||
* @param srcOffset the offset of the beginning of the chunk in {@code src}
|
|
||||||
* @return the decoded 3-byte integer, or some arbitrary integer value if the input was not
|
|
||||||
* valid base64
|
|
||||||
*/
|
|
||||||
private static int decodeBase64(final char[] src, final int srcOffset) {
|
|
||||||
int val = 0;
|
|
||||||
for (int i = 0; i < 4; ++i) {
|
|
||||||
final char c = src[i + srcOffset];
|
|
||||||
val |= (-1
|
|
||||||
+ ((((('A' - 1) - c) & (c - ('Z' + 1))) >>> 8) & (c - 64))
|
|
||||||
+ ((((('a' - 1) - c) & (c - ('z' + 1))) >>> 8) & (c - 70))
|
|
||||||
+ ((((('0' - 1) - c) & (c - ('9' + 1))) >>> 8) & (c + 5))
|
|
||||||
+ ((((('+' - 1) - c) & (c - ('+' + 1))) >>> 8) & 63)
|
|
||||||
+ ((((('/' - 1) - c) & (c - ('/' + 1))) >>> 8) & 64)
|
|
||||||
) << (18 - 6 * i);
|
|
||||||
}
|
|
||||||
return val;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Encodes a single 4-character base64 chunk from 3 consecutive bytes in constant time.
|
|
||||||
*
|
|
||||||
* @param src an array of at least 3 bytes
|
|
||||||
* @param srcOffset the offset of the beginning of the chunk in {@code src}
|
|
||||||
* @param dest an array of at least 4 characters
|
|
||||||
* @param destOffset the offset of the beginning of the chunk in {@code dest}
|
|
||||||
*/
|
|
||||||
private static void encodeBase64(final byte[] src, final int srcOffset,
|
|
||||||
final char[] dest, final int destOffset) {
|
|
||||||
final byte[] input = {
|
|
||||||
(byte) ((src[srcOffset] >>> 2) & 63),
|
|
||||||
(byte) ((src[srcOffset] << 4 | ((src[1 + srcOffset] & 0xff) >>> 4)) & 63),
|
|
||||||
(byte) ((src[1 + srcOffset] << 2 | ((src[2 + srcOffset] & 0xff) >>> 6)) & 63),
|
|
||||||
(byte) ((src[2 + srcOffset]) & 63),
|
|
||||||
};
|
|
||||||
for (int i = 0; i < 4; ++i) {
|
|
||||||
dest[i + destOffset] = (char) (input[i] + 'A'
|
|
||||||
+ (((25 - input[i]) >>> 8) & 6)
|
|
||||||
- (((51 - input[i]) >>> 8) & 75)
|
|
||||||
- (((61 - input[i]) >>> 8) & 15)
|
|
||||||
+ (((62 - input[i]) >>> 8) & 3));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Decodes a WireGuard public or private key from its base64 string representation. This
|
|
||||||
* function throws a {@link KeyFormatException} if the source string is not well-formed.
|
|
||||||
*
|
|
||||||
* @param str the base64 string representation of a WireGuard key
|
|
||||||
* @return the decoded key encapsulated in an immutable container
|
|
||||||
*/
|
|
||||||
public static Key fromBase64(final String str) throws KeyFormatException {
|
|
||||||
final char[] input = str.toCharArray();
|
|
||||||
if (input.length != Format.BASE64.length || input[Format.BASE64.length - 1] != '=')
|
|
||||||
throw new KeyFormatException(Format.BASE64, Type.LENGTH);
|
|
||||||
final byte[] key = new byte[Format.BINARY.length];
|
|
||||||
int i;
|
|
||||||
int ret = 0;
|
|
||||||
for (i = 0; i < key.length / 3; ++i) {
|
|
||||||
final int val = decodeBase64(input, i * 4);
|
|
||||||
ret |= val >>> 31;
|
|
||||||
key[i * 3] = (byte) ((val >>> 16) & 0xff);
|
|
||||||
key[i * 3 + 1] = (byte) ((val >>> 8) & 0xff);
|
|
||||||
key[i * 3 + 2] = (byte) (val & 0xff);
|
|
||||||
}
|
|
||||||
final char[] endSegment = {
|
|
||||||
input[i * 4],
|
|
||||||
input[i * 4 + 1],
|
|
||||||
input[i * 4 + 2],
|
|
||||||
'A',
|
|
||||||
};
|
|
||||||
final int val = decodeBase64(endSegment, 0);
|
|
||||||
ret |= (val >>> 31) | (val & 0xff);
|
|
||||||
key[i * 3] = (byte) ((val >>> 16) & 0xff);
|
|
||||||
key[i * 3 + 1] = (byte) ((val >>> 8) & 0xff);
|
|
||||||
|
|
||||||
if (ret != 0)
|
|
||||||
throw new KeyFormatException(Format.BASE64, Type.CONTENTS);
|
|
||||||
return new Key(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Wraps a WireGuard public or private key in an immutable container. This function throws a
|
|
||||||
* {@link KeyFormatException} if the source data is not the correct length.
|
|
||||||
*
|
|
||||||
* @param bytes an array of bytes containing a WireGuard key in binary format
|
|
||||||
* @return the key encapsulated in an immutable container
|
|
||||||
*/
|
|
||||||
public static Key fromBytes(final byte[] bytes) throws KeyFormatException {
|
|
||||||
if (bytes.length != Format.BINARY.length)
|
|
||||||
throw new KeyFormatException(Format.BINARY, Type.LENGTH);
|
|
||||||
return new Key(bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Decodes a WireGuard public or private key from its hexadecimal string representation. This
|
|
||||||
* function throws a {@link KeyFormatException} if the source string is not well-formed.
|
|
||||||
*
|
|
||||||
* @param str the hexadecimal string representation of a WireGuard key
|
|
||||||
* @return the decoded key encapsulated in an immutable container
|
|
||||||
*/
|
|
||||||
public static Key fromHex(final String str) throws KeyFormatException {
|
|
||||||
final char[] input = str.toCharArray();
|
|
||||||
if (input.length != Format.HEX.length)
|
|
||||||
throw new KeyFormatException(Format.HEX, Type.LENGTH);
|
|
||||||
final byte[] key = new byte[Format.BINARY.length];
|
|
||||||
int ret = 0;
|
|
||||||
for (int i = 0; i < key.length; ++i) {
|
|
||||||
int c;
|
|
||||||
int cNum;
|
|
||||||
int cNum0;
|
|
||||||
int cAlpha;
|
|
||||||
int cAlpha0;
|
|
||||||
int cVal;
|
|
||||||
final int cAcc;
|
|
||||||
|
|
||||||
c = input[i * 2];
|
|
||||||
cNum = c ^ 48;
|
|
||||||
cNum0 = ((cNum - 10) >>> 8) & 0xff;
|
|
||||||
cAlpha = (c & ~32) - 55;
|
|
||||||
cAlpha0 = (((cAlpha - 10) ^ (cAlpha - 16)) >>> 8) & 0xff;
|
|
||||||
ret |= ((cNum0 | cAlpha0) - 1) >>> 8;
|
|
||||||
cVal = (cNum0 & cNum) | (cAlpha0 & cAlpha);
|
|
||||||
cAcc = cVal * 16;
|
|
||||||
|
|
||||||
c = input[i * 2 + 1];
|
|
||||||
cNum = c ^ 48;
|
|
||||||
cNum0 = ((cNum - 10) >>> 8) & 0xff;
|
|
||||||
cAlpha = (c & ~32) - 55;
|
|
||||||
cAlpha0 = (((cAlpha - 10) ^ (cAlpha - 16)) >>> 8) & 0xff;
|
|
||||||
ret |= ((cNum0 | cAlpha0) - 1) >>> 8;
|
|
||||||
cVal = (cNum0 & cNum) | (cAlpha0 & cAlpha);
|
|
||||||
key[i] = (byte) (cAcc | cVal);
|
|
||||||
}
|
|
||||||
if (ret != 0)
|
|
||||||
throw new KeyFormatException(Format.HEX, Type.CONTENTS);
|
|
||||||
return new Key(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generates a private key using the system's {@link SecureRandom} number generator.
|
|
||||||
*
|
|
||||||
* @return a well-formed random private key
|
|
||||||
*/
|
|
||||||
static Key generatePrivateKey() {
|
|
||||||
final SecureRandom secureRandom = new SecureRandom();
|
|
||||||
final byte[] privateKey = new byte[Format.BINARY.getLength()];
|
|
||||||
secureRandom.nextBytes(privateKey);
|
|
||||||
privateKey[0] &= 248;
|
|
||||||
privateKey[31] &= 127;
|
|
||||||
privateKey[31] |= 64;
|
|
||||||
return new Key(privateKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generates a public key from an existing private key.
|
|
||||||
*
|
|
||||||
* @param privateKey a private key
|
|
||||||
* @return a well-formed public key that corresponds to the supplied private key
|
|
||||||
*/
|
|
||||||
static Key generatePublicKey(final Key privateKey) {
|
|
||||||
final byte[] publicKey = new byte[Format.BINARY.getLength()];
|
|
||||||
Curve25519.eval(publicKey, 0, privateKey.getBytes(), null);
|
|
||||||
return new Key(publicKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals(final Object obj) {
|
|
||||||
if (obj == this)
|
|
||||||
return true;
|
|
||||||
if (obj == null || obj.getClass() != getClass())
|
|
||||||
return false;
|
|
||||||
final Key other = (Key) obj;
|
|
||||||
return MessageDigest.isEqual(key, other.key);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the key as an array of bytes.
|
|
||||||
*
|
|
||||||
* @return an array of bytes containing the raw binary key
|
|
||||||
*/
|
|
||||||
public byte[] getBytes() {
|
|
||||||
// Defensively copy to ensure immutability.
|
|
||||||
return Arrays.copyOf(key, key.length);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int hashCode() {
|
|
||||||
int ret = 0;
|
|
||||||
for (int i = 0; i < key.length / 4; ++i)
|
|
||||||
ret ^= (key[i * 4 + 0] >> 0) + (key[i * 4 + 1] >> 8) + (key[i * 4 + 2] >> 16) + (key[i * 4 + 3] >> 24);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Encodes the key to base64.
|
|
||||||
*
|
|
||||||
* @return a string containing the encoded key
|
|
||||||
*/
|
|
||||||
public String toBase64() {
|
|
||||||
final char[] output = new char[Format.BASE64.length];
|
|
||||||
int i;
|
|
||||||
for (i = 0; i < key.length / 3; ++i)
|
|
||||||
encodeBase64(key, i * 3, output, i * 4);
|
|
||||||
final byte[] endSegment = {
|
|
||||||
key[i * 3],
|
|
||||||
key[i * 3 + 1],
|
|
||||||
0,
|
|
||||||
};
|
|
||||||
encodeBase64(endSegment, 0, output, i * 4);
|
|
||||||
output[Format.BASE64.length - 1] = '=';
|
|
||||||
return new String(output);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Encodes the key to hexadecimal ASCII characters.
|
|
||||||
*
|
|
||||||
* @return a string containing the encoded key
|
|
||||||
*/
|
|
||||||
public String toHex() {
|
|
||||||
final char[] output = new char[Format.HEX.length];
|
|
||||||
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 + 1] = (char) (87 + (key[i] & 0xf)
|
|
||||||
+ ((((key[i] & 0xf) - 10) >> 8) & ~38));
|
|
||||||
}
|
|
||||||
return new String(output);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The supported formats for encoding a WireGuard key.
|
|
||||||
*/
|
|
||||||
public enum Format {
|
|
||||||
BASE64(44),
|
|
||||||
BINARY(32),
|
|
||||||
HEX(64);
|
|
||||||
|
|
||||||
private final int length;
|
|
||||||
|
|
||||||
Format(final int length) {
|
|
||||||
this.length = length;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getLength() {
|
|
||||||
return length;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
|
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.wireguard.crypto;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An exception thrown when attempting to parse an invalid key (too short, too long, or byte
|
|
||||||
* data inappropriate for the format). The format being parsed can be accessed with the
|
|
||||||
* {@link #getFormat} method.
|
|
||||||
*/
|
|
||||||
public final class KeyFormatException extends Exception {
|
|
||||||
private final Key.Format format;
|
|
||||||
private final Type type;
|
|
||||||
|
|
||||||
KeyFormatException(final Key.Format format, final Type type) {
|
|
||||||
this.format = format;
|
|
||||||
this.type = type;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Key.Format getFormat() {
|
|
||||||
return format;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Type getType() {
|
|
||||||
return type;
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum Type {
|
|
||||||
CONTENTS,
|
|
||||||
LENGTH
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
|
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.wireguard.crypto;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents a Curve25519 key pair as used by WireGuard.
|
|
||||||
* <p>
|
|
||||||
* Instances of this class are immutable.
|
|
||||||
*/
|
|
||||||
public class KeyPair {
|
|
||||||
private final Key privateKey;
|
|
||||||
private final Key publicKey;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a key pair using a newly-generated private key.
|
|
||||||
*/
|
|
||||||
public KeyPair() {
|
|
||||||
this(Key.generatePrivateKey());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a key pair using an existing private key.
|
|
||||||
*
|
|
||||||
* @param privateKey a private key, used to derive the public key
|
|
||||||
*/
|
|
||||||
public KeyPair(final Key privateKey) {
|
|
||||||
this.privateKey = privateKey;
|
|
||||||
publicKey = Key.generatePublicKey(privateKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the private key from the key pair.
|
|
||||||
*
|
|
||||||
* @return the private key
|
|
||||||
*/
|
|
||||||
public Key getPrivateKey() {
|
|
||||||
return privateKey;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the public key from the key pair.
|
|
||||||
*
|
|
||||||
* @return the public key
|
|
||||||
*/
|
|
||||||
public Key getPublicKey() {
|
|
||||||
return publicKey;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -3,18 +3,9 @@ package io.nekohasekai.sagernet.ui
|
|||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import androidx.appcompat.app.AlertDialog
|
|
||||||
import io.nekohasekai.sagernet.R
|
import io.nekohasekai.sagernet.R
|
||||||
import io.nekohasekai.sagernet.database.DataStore
|
|
||||||
import io.nekohasekai.sagernet.database.ProfileManager
|
|
||||||
import io.nekohasekai.sagernet.databinding.LayoutNetworkBinding
|
import io.nekohasekai.sagernet.databinding.LayoutNetworkBinding
|
||||||
import io.nekohasekai.sagernet.databinding.LayoutProgressBinding
|
import io.nekohasekai.sagernet.ktx.app
|
||||||
import io.nekohasekai.sagernet.ktx.*
|
|
||||||
import io.nekohasekai.sagernet.utils.Cloudflare
|
|
||||||
import kotlinx.coroutines.Job
|
|
||||||
import kotlinx.coroutines.delay
|
|
||||||
import kotlinx.coroutines.isActive
|
|
||||||
import kotlinx.coroutines.runBlocking
|
|
||||||
|
|
||||||
class NetworkFragment : NamedFragment(R.layout.layout_network) {
|
class NetworkFragment : NamedFragment(R.layout.layout_network) {
|
||||||
|
|
||||||
@ -27,58 +18,6 @@ class NetworkFragment : NamedFragment(R.layout.layout_network) {
|
|||||||
binding.stunTest.setOnClickListener {
|
binding.stunTest.setOnClickListener {
|
||||||
startActivity(Intent(requireContext(), StunActivity::class.java))
|
startActivity(Intent(requireContext(), StunActivity::class.java))
|
||||||
}
|
}
|
||||||
|
|
||||||
//Markwon.create(requireContext())
|
|
||||||
// .setMarkdown(binding.wrapLicense, getString(R.string.warp_license))
|
|
||||||
|
|
||||||
binding.warpGenerate.setOnClickListener {
|
|
||||||
runBlocking {
|
|
||||||
generateWarpConfiguration()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun generateWarpConfiguration() {
|
|
||||||
val activity = requireActivity() as MainActivity
|
|
||||||
val binding = LayoutProgressBinding.inflate(layoutInflater).apply {
|
|
||||||
content.setText(R.string.generating)
|
|
||||||
}
|
|
||||||
var job: Job? = null
|
|
||||||
val dialog = AlertDialog.Builder(requireContext())
|
|
||||||
.setView(binding.root)
|
|
||||||
.setCancelable(false)
|
|
||||||
.setNegativeButton(android.R.string.cancel) { _, _ ->
|
|
||||||
job?.cancel()
|
|
||||||
}
|
|
||||||
.show()
|
|
||||||
job = runOnDefaultDispatcher {
|
|
||||||
try {
|
|
||||||
val bean = Cloudflare.makeWireGuardConfiguration()
|
|
||||||
if (isActive) {
|
|
||||||
val groupId = DataStore.selectedGroupForImport()
|
|
||||||
if (DataStore.selectedGroup != groupId) {
|
|
||||||
DataStore.selectedGroup = groupId
|
|
||||||
}
|
|
||||||
onMainDispatcher {
|
|
||||||
activity.displayFragmentWithId(R.id.nav_configuration)
|
|
||||||
}
|
|
||||||
delay(1000L)
|
|
||||||
onMainDispatcher {
|
|
||||||
dialog.dismiss()
|
|
||||||
}
|
|
||||||
ProfileManager.createProfile(groupId, bean)
|
|
||||||
}
|
|
||||||
} catch (e: Exception) {
|
|
||||||
Logs.w(e)
|
|
||||||
onMainDispatcher {
|
|
||||||
if (isActive) {
|
|
||||||
dialog.dismiss()
|
|
||||||
activity.snackbar(e.readableMessage).show()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -1,74 +0,0 @@
|
|||||||
package io.nekohasekai.sagernet.utils
|
|
||||||
|
|
||||||
import com.wireguard.crypto.KeyPair
|
|
||||||
import io.nekohasekai.sagernet.database.DataStore
|
|
||||||
import io.nekohasekai.sagernet.fmt.wireguard.WireGuardBean
|
|
||||||
import io.nekohasekai.sagernet.ktx.Logs
|
|
||||||
import io.nekohasekai.sagernet.utils.cf.DeviceResponse
|
|
||||||
import io.nekohasekai.sagernet.utils.cf.RegisterRequest
|
|
||||||
import io.nekohasekai.sagernet.utils.cf.UpdateDeviceRequest
|
|
||||||
import libcore.Libcore
|
|
||||||
import moe.matsuri.nb4a.utils.JavaUtil.gson
|
|
||||||
import moe.matsuri.nb4a.utils.Util
|
|
||||||
|
|
||||||
// kang from wgcf
|
|
||||||
object Cloudflare {
|
|
||||||
|
|
||||||
private const val API_URL = "https://api.cloudflareclient.com"
|
|
||||||
private const val API_VERSION = "v0a1922"
|
|
||||||
|
|
||||||
private const val CLIENT_VERSION_KEY = "CF-Client-Version"
|
|
||||||
private const val CLIENT_VERSION = "a-6.3-1922"
|
|
||||||
|
|
||||||
fun makeWireGuardConfiguration(): WireGuardBean {
|
|
||||||
val keyPair = KeyPair()
|
|
||||||
val client = Libcore.newHttpClient().apply {
|
|
||||||
pinnedTLS12()
|
|
||||||
trySocks5(DataStore.mixedPort)
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
val response = client.newRequest().apply {
|
|
||||||
setMethod("POST")
|
|
||||||
setURL("$API_URL/$API_VERSION/reg")
|
|
||||||
setHeader(CLIENT_VERSION_KEY, CLIENT_VERSION)
|
|
||||||
setHeader("Accept", "application/json")
|
|
||||||
setHeader("Content-Type", "application/json")
|
|
||||||
setContentString(RegisterRequest.newRequest(keyPair.publicKey))
|
|
||||||
setUserAgent("okhttp/3.12.1")
|
|
||||||
}.execute()
|
|
||||||
|
|
||||||
Logs.d(Util.getStringBox(response.contentString))
|
|
||||||
val device =
|
|
||||||
gson.fromJson(Util.getStringBox(response.contentString), DeviceResponse::class.java)
|
|
||||||
val accessToken = device.token
|
|
||||||
|
|
||||||
client.newRequest().apply {
|
|
||||||
setMethod("PATCH")
|
|
||||||
setURL(API_URL + "/" + API_VERSION + "/reg/" + device.id + "/account/reg/" + device.id)
|
|
||||||
setHeader("Accept", "application/json")
|
|
||||||
setHeader("Content-Type", "application/json")
|
|
||||||
setHeader("Authorization", "Bearer $accessToken")
|
|
||||||
setHeader(CLIENT_VERSION_KEY, CLIENT_VERSION)
|
|
||||||
setContentString(UpdateDeviceRequest.newRequest())
|
|
||||||
setUserAgent("okhttp/3.12.1")
|
|
||||||
}.execute()
|
|
||||||
|
|
||||||
val peer = device.config.peers[0]
|
|
||||||
val localAddresses = device.config.interfaceX.addresses
|
|
||||||
return WireGuardBean().apply {
|
|
||||||
name = "CloudFlare Warp ${device.account.id}"
|
|
||||||
privateKey = keyPair.privateKey.toBase64()
|
|
||||||
peerPublicKey = peer.publicKey
|
|
||||||
serverAddress = peer.endpoint.host.substringBeforeLast(":")
|
|
||||||
serverPort = peer.endpoint.host.substringAfterLast(":").toInt()
|
|
||||||
localAddress = localAddresses.v4 + "/32" + "\n" + localAddresses.v6 + "/128"
|
|
||||||
mtu = 1280
|
|
||||||
reserved = device.config.clientId
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
client.close()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,114 +0,0 @@
|
|||||||
package io.nekohasekai.sagernet.utils.cf
|
|
||||||
|
|
||||||
|
|
||||||
import com.google.gson.annotations.SerializedName
|
|
||||||
|
|
||||||
data class DeviceResponse(
|
|
||||||
@SerializedName("created")
|
|
||||||
var created: String = "",
|
|
||||||
@SerializedName("type")
|
|
||||||
var type: String = "",
|
|
||||||
@SerializedName("locale")
|
|
||||||
var locale: String = "",
|
|
||||||
@SerializedName("enabled")
|
|
||||||
var enabled: Boolean = false,
|
|
||||||
@SerializedName("token")
|
|
||||||
var token: String = "",
|
|
||||||
@SerializedName("waitlist_enabled")
|
|
||||||
var waitlistEnabled: Boolean = false,
|
|
||||||
@SerializedName("install_id")
|
|
||||||
var installId: String = "",
|
|
||||||
@SerializedName("warp_enabled")
|
|
||||||
var warpEnabled: Boolean = false,
|
|
||||||
@SerializedName("name")
|
|
||||||
var name: String = "",
|
|
||||||
@SerializedName("fcm_token")
|
|
||||||
var fcmToken: String = "",
|
|
||||||
@SerializedName("tos")
|
|
||||||
var tos: String = "",
|
|
||||||
@SerializedName("model")
|
|
||||||
var model: String = "",
|
|
||||||
@SerializedName("id")
|
|
||||||
var id: String = "",
|
|
||||||
@SerializedName("place")
|
|
||||||
var place: Int = 0,
|
|
||||||
@SerializedName("config")
|
|
||||||
var config: Config = Config(),
|
|
||||||
@SerializedName("updated")
|
|
||||||
var updated: String = "",
|
|
||||||
@SerializedName("key")
|
|
||||||
var key: String = "",
|
|
||||||
@SerializedName("account")
|
|
||||||
var account: Account = Account()
|
|
||||||
) {
|
|
||||||
data class Config(
|
|
||||||
@SerializedName("peers")
|
|
||||||
var peers: List<Peer> = listOf(),
|
|
||||||
@SerializedName("services")
|
|
||||||
var services: Services = Services(),
|
|
||||||
@SerializedName("interface")
|
|
||||||
var interfaceX: Interface = Interface(),
|
|
||||||
@SerializedName("client_id")
|
|
||||||
var clientId: String = ""
|
|
||||||
) {
|
|
||||||
data class Peer(
|
|
||||||
@SerializedName("public_key")
|
|
||||||
var publicKey: String = "",
|
|
||||||
@SerializedName("endpoint")
|
|
||||||
var endpoint: Endpoint = Endpoint()
|
|
||||||
) {
|
|
||||||
data class Endpoint(
|
|
||||||
@SerializedName("v6")
|
|
||||||
var v6: String = "",
|
|
||||||
@SerializedName("host")
|
|
||||||
var host: String = "",
|
|
||||||
@SerializedName("v4")
|
|
||||||
var v4: String = ""
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
data class Services(
|
|
||||||
@SerializedName("http_proxy")
|
|
||||||
var httpProxy: String = ""
|
|
||||||
)
|
|
||||||
|
|
||||||
data class Interface(
|
|
||||||
@SerializedName("addresses")
|
|
||||||
var addresses: Addresses = Addresses()
|
|
||||||
) {
|
|
||||||
data class Addresses(
|
|
||||||
@SerializedName("v6")
|
|
||||||
var v6: String = "",
|
|
||||||
@SerializedName("v4")
|
|
||||||
var v4: String = ""
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
data class Account(
|
|
||||||
@SerializedName("account_type")
|
|
||||||
var accountType: String = "",
|
|
||||||
@SerializedName("role")
|
|
||||||
var role: String = "",
|
|
||||||
@SerializedName("referral_renewal_countdown")
|
|
||||||
var referralRenewalCountdown: Int = 0,
|
|
||||||
@SerializedName("created")
|
|
||||||
var created: String = "",
|
|
||||||
@SerializedName("usage")
|
|
||||||
var usage: Int = 0,
|
|
||||||
@SerializedName("warp_plus")
|
|
||||||
var warpPlus: Boolean = false,
|
|
||||||
@SerializedName("referral_count")
|
|
||||||
var referralCount: Int = 0,
|
|
||||||
@SerializedName("license")
|
|
||||||
var license: String = "",
|
|
||||||
@SerializedName("quota")
|
|
||||||
var quota: Int = 0,
|
|
||||||
@SerializedName("premium_data")
|
|
||||||
var premiumData: Int = 0,
|
|
||||||
@SerializedName("id")
|
|
||||||
var id: String = "",
|
|
||||||
@SerializedName("updated")
|
|
||||||
var updated: String = ""
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
package io.nekohasekai.sagernet.utils.cf
|
|
||||||
|
|
||||||
import com.google.gson.Gson
|
|
||||||
import com.google.gson.annotations.SerializedName
|
|
||||||
import com.wireguard.crypto.Key
|
|
||||||
import java.text.SimpleDateFormat
|
|
||||||
import java.util.*
|
|
||||||
|
|
||||||
data class RegisterRequest(
|
|
||||||
@SerializedName("fcm_token") var fcmToken: String = "",
|
|
||||||
@SerializedName("install_id") var installedId: String = "",
|
|
||||||
var key: String = "",
|
|
||||||
var locale: String = "",
|
|
||||||
var model: String = "",
|
|
||||||
var tos: String = "",
|
|
||||||
var type: String = ""
|
|
||||||
) {
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
fun newRequest(publicKey: Key): String {
|
|
||||||
val request = RegisterRequest()
|
|
||||||
request.fcmToken = ""
|
|
||||||
request.installedId = ""
|
|
||||||
request.key = publicKey.toBase64()
|
|
||||||
request.locale = "en_US"
|
|
||||||
request.model = "PC"
|
|
||||||
val format = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'000000'+08:00", Locale.US)
|
|
||||||
request.tos = format.format(Date())
|
|
||||||
request.type = "Android"
|
|
||||||
return Gson().toJson(request)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
package io.nekohasekai.sagernet.utils.cf
|
|
||||||
|
|
||||||
import com.google.gson.Gson
|
|
||||||
|
|
||||||
data class UpdateDeviceRequest(
|
|
||||||
var name: String, var active: Boolean
|
|
||||||
) {
|
|
||||||
companion object {
|
|
||||||
fun newRequest(name: String = "SagerNet Client", active: Boolean = true) =
|
|
||||||
Gson().toJson(UpdateDeviceRequest(name, active))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -60,61 +60,4 @@
|
|||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</com.google.android.material.card.MaterialCardView>
|
</com.google.android.material.card.MaterialCardView>
|
||||||
|
|
||||||
<com.google.android.material.card.MaterialCardView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_margin="8dp"
|
|
||||||
android:clickable="true"
|
|
||||||
android:focusable="true"
|
|
||||||
app:cardElevation="2dp">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:padding="16dp">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/cloudflare_wrap"
|
|
||||||
android:textAppearance="?attr/textAppearanceHeadline6" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/wrap_license"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="16dp"
|
|
||||||
android:text="@string/warp_license"
|
|
||||||
android:textAppearance="?attr/textAppearanceBody2"
|
|
||||||
android:textColor="?android:attr/textColorSecondary" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_margin="8dp"
|
|
||||||
android:gravity="end"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/warpGenerate"
|
|
||||||
style="@style/Widget.AppCompat.Button.Borderless"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginEnd="8dp"
|
|
||||||
android:text="@string/warp_generate"
|
|
||||||
android:textColor="?primaryOrTextPrimary" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
</com.google.android.material.card.MaterialCardView>
|
|
||||||
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
Loading…
Reference in New Issue
Block a user