From 1d80f531b74bc3b31023753acb81b35efcdadd73 Mon Sep 17 00:00:00 2001 From: mat <27899617+mat-1@users.noreply.github.com> Date: Tue, 23 Apr 2024 10:34:50 -0500 Subject: 1.20.5 (#127) * 23w51b * make recalculate_near_end_of_path public so other plugins can do .after(recalculate_near_end_of_path) * update to 24w03a i think * start implementing 24w13a * registries work (but a lot of packets are still broken) * fix recipes and commands packets * i love codecs :D i am not going insane :D mojang's java is very readable :D * item components are "implemented" meowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeow * update to 1.20.5-pre3 * fix all the broken packets and clippy (mojang please don't do an update like this again or i will murder someone) * 1.20.5-rc1 * fix failing tests * 1.20.5 --- azalea-crypto/src/lib.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'azalea-crypto/src') diff --git a/azalea-crypto/src/lib.rs b/azalea-crypto/src/lib.rs index cefc9adc..90e248a2 100755 --- a/azalea-crypto/src/lib.rs +++ b/azalea-crypto/src/lib.rs @@ -39,10 +39,10 @@ pub fn hex_digest(digest: &[u8]) -> String { pub struct EncryptResult { pub secret_key: [u8; 16], pub encrypted_public_key: Vec, - pub encrypted_nonce: Vec, + pub encrypted_challenge: Vec, } -pub fn encrypt(public_key: &[u8], nonce: &[u8]) -> Result { +pub fn encrypt(public_key: &[u8], challenge: &[u8]) -> Result { // On receipt of a Encryption Request from the server, the client will // generate a random 16-byte shared secret, to be used with the AES/CFB8 // stream cipher. @@ -51,14 +51,14 @@ pub fn encrypt(public_key: &[u8], nonce: &[u8]) -> Result // &secret_key)); // this.keybytes = Crypt.encryptUsingKey(publicKey, secretKey.getEncoded()); - // this.nonce = Crypt.encryptUsingKey(publicKey, arrby); + // this.challenge = Crypt.encryptUsingKey(publicKey, arrby); let encrypted_public_key: Vec = rsa_public_encrypt_pkcs1::encrypt(public_key, &secret_key)?; - let encrypted_nonce: Vec = rsa_public_encrypt_pkcs1::encrypt(public_key, nonce)?; + let encrypted_challenge: Vec = rsa_public_encrypt_pkcs1::encrypt(public_key, challenge)?; Ok(EncryptResult { secret_key, encrypted_public_key, - encrypted_nonce, + encrypted_challenge, }) } -- cgit v1.2.3