Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.2.2 with some features #30

Merged
merged 1 commit into from
Jan 11, 2021
Merged

Release 0.2.2 with some features #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "obfstr"
version = "0.2.1"
version = "0.2.2"
edition = "2018"
license = "MIT"

Expand Down
49 changes: 41 additions & 8 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,31 +375,64 @@ pub fn unsafe_as_str(bytes: &[u8]) -> &str {
/// assert_eq!(s, "Hello 🌍");
/// ```
///
/// To return an obfuscated string from a function pass a buffer.
/// Panics if the buffer is too small:
///
/// ```
/// use obfstr::obfstr;
///
/// fn helper(buf: &mut [u8]) -> &str {
/// obfstr!(buf <- "hello")
/// }
///
/// let mut buf = [0u8; 16];
/// assert_eq!(helper(&mut buf), "hello");
/// ```
///
/// The string constants can be prefixed with `L` to get an UTF-16 equivalent obfuscated string as `&[u16; LEN]`.
#[macro_export]
macro_rules! obfstr {
($buf:ident <- $s:expr) => {{
const STRING: &str = $s;
const LEN: usize = STRING.len();
const KEYSTREAM: [u8; LEN] = $crate::bytes::keystream::<LEN>($crate::random!(u32));
static mut OBFSTRING: [u8; LEN] = $crate::bytes::obfuscate::<LEN>(STRING.as_bytes(), &KEYSTREAM);
let buf = &mut $buf[..LEN];
buf.copy_from_slice(&$crate::bytes::deobfuscate::<LEN>(unsafe { &OBFSTRING }, &KEYSTREAM));
$crate::unsafe_as_str(buf)
}};
($buf:ident <- L$s:expr) => {{
const STRING: &[u16] = $crate::wide!($s);
const LEN: usize = STRING.len();
const KEYSTREAM: [u16; LEN] = $crate::words::keystream::<LEN>($crate::random!(u32));
static mut OBFSTRING: [u16; LEN] = $crate::words::obfuscate::<LEN>(STRING, &KEYSTREAM);
let buf = &mut $buf[..LEN];
buf.copy_from_slice(&$crate::words::deobfuscate::<LEN>(unsafe { &OBFSTRING }, &KEYSTREAM));
buf
}};

($s:expr) => {{
const STRING: &str = $s;
const LEN: usize = STRING.len();
const KEYSTREAM: [u8; LEN] = $crate::bytes::keystream::<LEN>($crate::random!(u32));
const OBFSTRING: [u8; LEN] = $crate::bytes::obfuscate::<LEN>(STRING.as_bytes(), &KEYSTREAM);
$crate::unsafe_as_str(&$crate::bytes::deobfuscate::<LEN>(&OBFSTRING, &KEYSTREAM))
static mut OBFSTRING: [u8; LEN] = $crate::bytes::obfuscate::<LEN>(STRING.as_bytes(), &KEYSTREAM);
$crate::unsafe_as_str(&$crate::bytes::deobfuscate::<LEN>(unsafe { &OBFSTRING }, &KEYSTREAM))
}};
(L$s:expr) => {{
const STRING: &[u16] = $crate::wide!($s);
const LEN: usize = STRING.len();
const KEYSTREAM: [u16; LEN] = $crate::words::keystream::<LEN>($crate::random!(u32));
const OBFSTRING: [u16; LEN] = $crate::words::obfuscate::<LEN>(STRING, &KEYSTREAM);
&$crate::words::deobfuscate::<LEN>(&OBFSTRING, &KEYSTREAM)
static mut OBFSTRING: [u16; LEN] = $crate::words::obfuscate::<LEN>(STRING, &KEYSTREAM);
&$crate::words::deobfuscate::<LEN>(unsafe { &OBFSTRING }, &KEYSTREAM)
}};

($(let $name:ident = $s:expr;)*) => {$(
let $name = {
const STRING: &str = $s;
const LEN: usize = STRING.len();
const KEYSTREAM: [u8; LEN] = $crate::bytes::keystream::<LEN>($crate::random!(u32));
const OBFSTRING: [u8; LEN] = $crate::bytes::obfuscate::<LEN>(STRING.as_bytes(), &KEYSTREAM);
$crate::bytes::deobfuscate::<LEN>(&OBFSTRING, &KEYSTREAM)
static mut OBFSTRING: [u8; LEN] = $crate::bytes::obfuscate::<LEN>(STRING.as_bytes(), &KEYSTREAM);
$crate::bytes::deobfuscate::<LEN>(unsafe { &OBFSTRING }, &KEYSTREAM)
};
let $name = $crate::unsafe_as_str(&$name);
)*};
Expand All @@ -408,8 +441,8 @@ macro_rules! obfstr {
const STRING: &[u16] = $crate::wide!($s);
const LEN: usize = STRING.len();
const KEYSTREAM: [u16; LEN] = $crate::words::keystream::<LEN>($crate::random!(u32));
const OBFSTRING: [u16; LEN] = $crate::words::obfuscate::<LEN>(STRING, &KEYSTREAM);
$crate::words::deobfuscate::<LEN>(&OBFSTRING, &KEYSTREAM)
static mut OBFSTRING: [u16; LEN] = $crate::words::obfuscate::<LEN>(STRING, &KEYSTREAM);
$crate::words::deobfuscate::<LEN>(unsafe { &OBFSTRING }, &KEYSTREAM)
};
let $name = &$name;
)*};
Expand Down