Bump dependencies

This commit is contained in:
games647 committed 2022-07-06 17:08:57 +02:00
1 parent 339156be18
commit 7c8de84a34
9 files changed
+16 -27

No files matched your search

@@ -91,7 +91,6 @@ class EncryptionUtil {
* @return The RSA key pair.
*/
public static KeyPair generateKeyPair() {
// KeyPair b()
try {
KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(KEY_PAIR_ALGORITHM);
@@ -111,7 +110,6 @@ class EncryptionUtil {
* @return an error with 4 bytes long
*/
public static byte[] generateVerifyToken(RandomGenerator random) {
// extracted from LoginListener
byte[] token = new byte[VERIFY_TOKEN_LENGTH];
random.nextBytes(token);
return token;
@@ -126,7 +124,6 @@ class EncryptionUtil {
* @return the server id formatted as a hexadecimal string.
*/
public static String getServerIdHashString(String serverId, SecretKey sharedSecret, PublicKey publicKey) {
// found in LoginListener
byte[] serverHash = getServerIdHash(serverId, publicKey, sharedSecret);
return (new BigInteger(serverHash)).toString(16);
}
@@ -142,7 +139,6 @@ class EncryptionUtil {
public static SecretKey decryptSharedKey(PrivateKey privateKey, byte[] sharedKey)
throws NoSuchPaddingException, IllegalBlockSizeException, NoSuchAlgorithmException,
BadPaddingException, InvalidKeyException {
// SecretKey a(PrivateKey var0, byte[] var1)
return new SecretKeySpec(decrypt(privateKey, sharedKey), "AES");
}
@@ -188,17 +184,14 @@ class EncryptionUtil {
private static byte[] decrypt(PrivateKey key, byte[] data)
throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException,
IllegalBlockSizeException, BadPaddingException {
// b(Key var0, byte[] var1)
Cipher cipher = Cipher.getInstance(key.getAlgorithm());
cipher.init(Cipher.DECRYPT_MODE, key);
return cipher.doFinal(data);
}
private static byte[] getServerIdHash(String sessionId, PublicKey publicKey, SecretKey sharedSecret) {
// byte[] a(String var0, PublicKey var1, SecretKey var2)
Hasher hasher = Hashing.sha1().newHasher();
// inlined from byte[] a(String var0, byte[]... var1)
hasher.putBytes(sessionId.getBytes(StandardCharsets.ISO_8859_1));
hasher.putBytes(sharedSecret.getEncoded());
hasher.putBytes(publicKey.getEncoded());
@@ -15,10 +15,10 @@ stripped before including it.**
## Directory structure
* `valid_public_key.json`: Extracted from the actual file
* `invalid_wrong_expiration.json`: Changed the expiration date
* `invalid_wrong_key.json`: Modified public key while keeping the RSA structure valid
* `invalid_wrong_signature.json`: Changed a character in the public key signature
* `valid_public_key.json`: Extracted from actual file
## File content
@@ -4,7 +4,7 @@ This contains test resources for the unit tests. Files in this folder include pr
## Directory structure
* `valid_signature.json`: Extracted using packet extract from actual authentication
* `valid_signature.json`: Extracted using packet extract from an actual authentication
* `incorrect_nonce.json`: Different nonce token simulating that the server expected a different token than signed
* `incorrect_salt.json`: Salt sent is different to the content signed by the signature (changed salt field)
* `incorrect_signature.json`: Changed signature
@@ -12,5 +12,5 @@ This contains test resources for the unit tests. Files in this folder include pr
## File content
* `nonce`: Server generated nonce token
* `salt`: Client generated random token
* `salt`: Client generated random token that will be signed
* `signature`: Nonce and salt signed using the client key from `valid_public_key.json`