aboutsummaryrefslogtreecommitdiff
path: root/azalea-crypto/src
diff options
context:
space:
mode:
authormat <27899617+mat-1@users.noreply.github.com>2024-11-27 19:31:40 -0600
committerGitHub <noreply@github.com>2024-11-27 19:31:40 -0600
commit08958c2278b15ebeac8a964f392ebb792e479b61 (patch)
tree4ae3664cea38d7fd1a8f1e95ed06fac04ffe519e /azalea-crypto/src
parent139d77d3c2b0922fba5e9d4fa2bd9819d78bd773 (diff)
downloadazalea-drasl-08958c2278b15ebeac8a964f392ebb792e479b61.tar.xz
Refactor azalea-protocol (#190)
* start updating to 1.21.4 * fix block codegen and stop using block data from burger * rename packet related modules and structs to be simpler * ItemSlot -> ItemStack for more consistency with mojmap * .get() -> .into_packet() * simplify declare_state_packets by removing packet ids * rename read_from and write_into to azalea_read and azalea_write * rename McBufReadable and McBufWritable to AzaleaRead and AzaleaWrite * McBuf -> AzBuf * remove most uses of into_variant * update codegen and use resourcelocation names for packets * implement #[limit(i)] attribute for AzBuf derive macro * fixes for 1.21.4 * fix examples * update some physics code and fix ChatType * remove unused imports in codegen * re-add some things to migrate.py and update +mc version numbers automatically * downgrade to 1.21.3 lol
Diffstat (limited to 'azalea-crypto/src')
-rwxr-xr-xazalea-crypto/src/signing.rs24
1 files changed, 12 insertions, 12 deletions
diff --git a/azalea-crypto/src/signing.rs b/azalea-crypto/src/signing.rs
index 5ecafa46..ba9cc305 100755
--- a/azalea-crypto/src/signing.rs
+++ b/azalea-crypto/src/signing.rs
@@ -1,6 +1,6 @@
use std::time::{SystemTime, UNIX_EPOCH};
-use azalea_buf::{McBuf, McBufWritable};
+use azalea_buf::{AzBuf, AzaleaWrite};
use rsa::{
signature::{RandomizedSigner, SignatureEncoding},
RsaPrivateKey,
@@ -8,18 +8,18 @@ use rsa::{
use sha2::Sha256;
use uuid::Uuid;
-#[derive(Debug, Clone, McBuf)]
+#[derive(Debug, Clone, AzBuf)]
pub struct SaltSignaturePair {
pub salt: u64,
pub signature: Vec<u8>,
}
-#[derive(Clone, Debug, PartialEq, McBuf)]
+#[derive(Clone, Debug, PartialEq, AzBuf)]
pub struct MessageSignature {
pub bytes: [u8; 256],
}
-#[derive(Clone, Debug, McBuf, PartialEq)]
+#[derive(Clone, Debug, AzBuf, PartialEq)]
pub struct SignedMessageHeader {
pub previous_signature: Option<MessageSignature>,
pub sender: Uuid,
@@ -51,17 +51,17 @@ pub struct SignChatMessageOptions {
pub fn sign_chat_message(opts: &SignChatMessageOptions) -> MessageSignature {
let mut data_to_sign = Vec::new();
// always 1 for some reason
- 1i32.write_into(&mut data_to_sign).unwrap();
+ 1i32.azalea_write(&mut data_to_sign).unwrap();
// player uuid
- opts.account_uuid.write_into(&mut data_to_sign).unwrap();
+ opts.account_uuid.azalea_write(&mut data_to_sign).unwrap();
// chat session uuid
opts.chat_session_uuid
- .write_into(&mut data_to_sign)
+ .azalea_write(&mut data_to_sign)
.unwrap();
// message index
- opts.message_index.write_into(&mut data_to_sign).unwrap();
+ opts.message_index.azalea_write(&mut data_to_sign).unwrap();
// salt
- opts.salt.write_into(&mut data_to_sign).unwrap();
+ opts.salt.azalea_write(&mut data_to_sign).unwrap();
// timestamp as seconds
let seconds_since_epoch = opts
@@ -69,16 +69,16 @@ pub fn sign_chat_message(opts: &SignChatMessageOptions) -> MessageSignature {
.duration_since(UNIX_EPOCH)
.expect("timestamp must be after epoch")
.as_secs();
- seconds_since_epoch.write_into(&mut data_to_sign).unwrap();
+ seconds_since_epoch.azalea_write(&mut data_to_sign).unwrap();
// message length as u32
let message_len: u32 = opts.message.len().try_into().unwrap();
- message_len.write_into(&mut data_to_sign).unwrap();
+ message_len.azalea_write(&mut data_to_sign).unwrap();
// message bytes
data_to_sign.extend_from_slice(opts.message.as_bytes());
// last seen messages length
- 0i32.write_into(&mut data_to_sign).unwrap();
+ 0i32.azalea_write(&mut data_to_sign).unwrap();
// signatures of last seen messages
// ... not implemented yet