Skip to content

Commit

Permalink
Update cookie-factory to 0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
chifflier committed Mar 19, 2021
1 parent 681a5a1 commit 27badb4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ serialize = ["cookie-factory"]
nom = "6.0"
rusticata-macros = "3.0"

cookie-factory = { version = "0.2", optional = true }
cookie-factory = { version = "0.3", optional = true }
num-bigint = { version = "0.4", optional = true }
num-traits = { version = "0.2", optional = true }
5 changes: 3 additions & 2 deletions src/serialize.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
use crate::ssh::{
SshPacket, SshPacketDebug, SshPacketDhReply, SshPacketDisconnect, SshPacketKeyExchange,
};
use cookie_factory::gen::{set_be_u32, set_be_u8};
use cookie_factory::*;
use std::iter::repeat;

fn gen_string<'a, 'b>(
x: (&'a mut [u8], usize),
s: &'b [u8],
) -> Result<(&'a mut [u8], usize), GenError> {
do_gen!(x, gen_be_u32!(s.len()) >> gen_slice!(s))
do_gen!(x, gen_be_u32!(s.len() as u32) >> gen_slice!(s))
}

fn gen_packet_key_exchange<'a, 'b>(
Expand Down Expand Up @@ -121,6 +122,6 @@ pub fn gen_ssh_packet<'a, 'b>(
>> gen_packet_payload(p)
>> pad: gen_many!(repeat(0).take(padding_len(pad - len)), set_be_u8)
>> end: gen_at_offset!(padlen, gen_be_u8!((end - pad) as u8))
>> gen_at_offset!(len, gen_be_u32!(end - padlen))
>> gen_at_offset!(len, gen_be_u32!((end - padlen) as u32))
)
}

0 comments on commit 27badb4

Please sign in to comment.