mirror of
https://github.com/Astatin3/unshell.git
synced 2026-06-08 22:38:01 -06:00
Make base62 project independent, more concise macro definitions.
This commit is contained in:
Michael Mikovsky
@@ -21,7 +21,7 @@ hex-literal = "1.1.0"
|
||||
regex = "1.12.2"
|
||||
sha2 = "0.10.9"
|
||||
|
||||
# unshell-crypt = {path = "../unshell-crypt"}
|
||||
base62 = {path = "../base62"}
|
||||
|
||||
# Common
|
||||
static_init = { workspace = true }
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
pub fn decrypt_aes(input: &str, key_str: &str, iv: [u8; 16]) -> Result<String, String> {
|
||||
// Hash the env key to get a 32-byte (256-bit) AES key
|
||||
let mut key = hash(key_str.as_bytes());
|
||||
|
||||
let mut cipher_bytes = Base62::decode_full(input, &key).unwrap();
|
||||
|
||||
let salt = cipher_bytes.remove(0);
|
||||
|
||||
// XOR the salt bytes with the key bytes
|
||||
// This replicates
|
||||
for i in 0..32 {
|
||||
key[i] ^= salt;
|
||||
}
|
||||
|
||||
// Create buffer for result
|
||||
let buf_len = cipher_bytes.len();
|
||||
let mut buf: Vec<u8> = vec![0; buf_len];
|
||||
buf[..cipher_bytes.len()].copy_from_slice(&cipher_bytes);
|
||||
|
||||
let pt = cbc::Decryptor::<aes::Aes256>::new(&key.into(), &iv.into())
|
||||
.decrypt_padded_mut::<Pkcs7>(&mut buf)
|
||||
.map_err(|_| "decryption failed".to_string())?;
|
||||
|
||||
Ok(String::from_utf8_lossy(pt).to_string())
|
||||
}
|
||||
|
||||
pub fn decrypt_aes_lines(input: &str, key_str: &str, iv: [u8; 16]) -> String {
|
||||
let mut decrypted_result = input.to_string();
|
||||
let mut total_offset = 0;
|
||||
|
||||
// Split input by segments of base62 chars, denoted by two _'s, and attempt to decode
|
||||
for aes_block in Regex::new(r"_([0-9a-zA-Z]*?)_").unwrap().find_iter(&input) {
|
||||
let range = aes_block.range();
|
||||
let aes_block = aes_block.as_str()[1..(aes_block.len() - 1)].to_string();
|
||||
|
||||
// If the decryption is successful, offset the current offset position
|
||||
if let Ok(decrypted_block) = decrypt_aes(&aes_block, key_str, iv) {
|
||||
let range = (range.start + total_offset as usize)..(range.end + total_offset as usize);
|
||||
|
||||
// Offset range by the difference between the decrypted block length and the original range length
|
||||
total_offset += decrypted_block.len().clone() - (range.end - range.start);
|
||||
|
||||
decrypted_result.replace_range(range, &decrypted_block);
|
||||
} else {
|
||||
// If the decode is unsuccessful, leave the underscore-denoted region as is
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
decrypted_result
|
||||
}
|
||||
@@ -1,53 +0,0 @@
|
||||
use crate::crypt::{base62::Base62, hash};
|
||||
use aes::cipher::{BlockEncryptMut, KeyIvInit};
|
||||
use cbc::cipher::block_padding::Pkcs7;
|
||||
|
||||
fn pkcs7_padded_length(input_len: usize) -> usize {
|
||||
let block_size = 16;
|
||||
((input_len / block_size) + 1) * block_size
|
||||
}
|
||||
|
||||
pub fn encrypt_aes(plaintext: &str, key_str: &str, iv: [u8; 16]) -> String {
|
||||
let plaintext = plaintext.as_bytes();
|
||||
|
||||
// Hash the env key to get a 32-byte (256-bit) AES key
|
||||
let key = hash(key_str.as_bytes());
|
||||
|
||||
// Generate a psudo-random salt byte based on the plaintext
|
||||
// I hope this does not break the encryption.
|
||||
let mut salt = 0;
|
||||
|
||||
for byte in plaintext {
|
||||
salt ^= byte;
|
||||
}
|
||||
|
||||
let mut key_salted = key.clone();
|
||||
|
||||
// Salt the key by XORing the salt byte with all the key bytes.
|
||||
// This ensures that the "hash" generated from the plaintext will
|
||||
// make the encrypted result extremely different.
|
||||
for i in 0..32 {
|
||||
key_salted[i] ^= salt;
|
||||
}
|
||||
|
||||
let buf_len = pkcs7_padded_length(plaintext.len());
|
||||
|
||||
let mut buf = vec![0u8; buf_len];
|
||||
let pt_len = plaintext.len();
|
||||
buf[..pt_len].copy_from_slice(&plaintext);
|
||||
|
||||
let mut ct = cbc::Encryptor::<aes::Aes256>::new(&key_salted.into(), &iv.into())
|
||||
.encrypt_padded_mut::<Pkcs7>(&mut buf, pt_len)
|
||||
.unwrap()
|
||||
.to_vec();
|
||||
|
||||
// Add the salt byte to the key byte,
|
||||
ct.insert(0, salt);
|
||||
|
||||
// Encode result in base62
|
||||
Base62::encode_full(&ct, &key)
|
||||
}
|
||||
|
||||
pub fn encrypt_aes_lines(plaintext: &str, key_str: &str, iv: [u8; 16]) -> String {
|
||||
format!("_{}_", encrypt_aes(plaintext, key_str, iv))
|
||||
}
|
||||
@@ -1,225 +0,0 @@
|
||||
use crate::crypt::{STATIC_BYTE_MAP, hash};
|
||||
|
||||
// Randomly mapped Base62 characters
|
||||
pub struct Base62 {
|
||||
charset: [char; 62],
|
||||
}
|
||||
|
||||
pub const BASE62_CHARS: [char; 62] = [
|
||||
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
|
||||
'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b',
|
||||
'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u',
|
||||
'v', 'w', 'x', 'y', 'z',
|
||||
];
|
||||
|
||||
// Const for ratio
|
||||
const ENCODING_RATIO: f64 = 8.0 / 5.954196310386875; // 8.0 / log2(62.0)
|
||||
|
||||
impl Base62 {
|
||||
pub fn new(key: &[u8], nonce: usize) -> Self {
|
||||
// Hash key again, for the chance that this random function can be used to derive the key
|
||||
let key = hash(key);
|
||||
|
||||
let mut charset: [char; 62] = [0 as char; 62];
|
||||
|
||||
// Create a vector of indices from 0 to 61
|
||||
let mut current_indicies = (0..62).map(|i| i as usize).collect::<Vec<usize>>();
|
||||
|
||||
// Loop through each byte in the key until all chars are filled
|
||||
for i in 0..62 as usize {
|
||||
let rand = STATIC_BYTE_MAP[(key[i as usize % key.len()] as usize + nonce) % 255];
|
||||
|
||||
let index_index = rand as usize % current_indicies.len();
|
||||
let put_index = current_indicies.remove(index_index);
|
||||
|
||||
charset[put_index] = BASE62_CHARS[i];
|
||||
}
|
||||
|
||||
return Self { charset };
|
||||
}
|
||||
|
||||
// Convert character to base-62 value using custom charset
|
||||
fn char_to_value(&self, ch: char) -> Result<u8, String> {
|
||||
self.charset
|
||||
.iter()
|
||||
.position(|&c| c == ch)
|
||||
.map(|pos| pos as u8)
|
||||
.ok_or_else(|| format!("Invalid character for this charset: '{}'", ch))
|
||||
}
|
||||
|
||||
/// Encodes a byte slice into a base-62 string using a custom character set
|
||||
/// Supports arbitrary length input by using big integer arithmetic
|
||||
pub fn encode(&self, data: &[u8]) -> String {
|
||||
if data.is_empty() {
|
||||
return String::new();
|
||||
}
|
||||
|
||||
// Count leading zeros
|
||||
let leading_zeros = data.iter().take_while(|&&b| b == 0).count();
|
||||
|
||||
// Skip leading zeros for conversion
|
||||
let data = &data[leading_zeros..];
|
||||
|
||||
if data.is_empty() {
|
||||
return self.charset[0].to_string().repeat(leading_zeros);
|
||||
}
|
||||
|
||||
let mut result = Vec::new();
|
||||
let mut num = data.to_vec();
|
||||
|
||||
// Convert to base-62 using division
|
||||
while !is_zero(&num) {
|
||||
let remainder = div_mod_62(&mut num);
|
||||
result.push(self.charset[remainder]);
|
||||
}
|
||||
|
||||
// Add leading zeros
|
||||
for _ in 0..leading_zeros {
|
||||
result.push(self.charset[0]);
|
||||
}
|
||||
|
||||
// Reverse since we built it backwards
|
||||
result.reverse();
|
||||
result.into_iter().collect()
|
||||
}
|
||||
|
||||
/// Decodes a base-62 string back into bytes using a custom character set
|
||||
/// Supports arbitrary length output
|
||||
pub fn decode(&self, encoded: &str) -> Result<Vec<u8>, String> {
|
||||
if encoded.is_empty() {
|
||||
return Ok(Vec::new());
|
||||
}
|
||||
|
||||
// Count leading zeros (first character in charset)
|
||||
let zero_char = self.charset[0];
|
||||
let leading_zeros = encoded.chars().take_while(|&c| c == zero_char).count();
|
||||
|
||||
// Skip leading zeros for conversion
|
||||
let encoded = &encoded[leading_zeros..];
|
||||
|
||||
if encoded.is_empty() {
|
||||
return Ok(vec![0; leading_zeros]);
|
||||
}
|
||||
|
||||
// Convert base-62 string to bytes using multiplication
|
||||
let mut num = vec![0u8];
|
||||
|
||||
for ch in encoded.chars() {
|
||||
let value = self.char_to_value(ch)?;
|
||||
mul_add(&mut num, 62, value);
|
||||
}
|
||||
|
||||
// Add leading zero bytes
|
||||
let mut result = vec![0u8; leading_zeros];
|
||||
result.append(&mut num);
|
||||
|
||||
Ok(result)
|
||||
}
|
||||
|
||||
pub fn encode_full(data: &[u8], key: &[u8]) -> String {
|
||||
// Predict the length of the encoded data
|
||||
let length = predict_base62_len(data);
|
||||
|
||||
let base = Base62::new(&key, length % 255);
|
||||
let encoded = base.encode(data);
|
||||
|
||||
// For the case that the encoded length is not equal to the predicted length
|
||||
// The nonce must be derived from this length, so this needs to be ensured
|
||||
//
|
||||
// Re-encode with the correct length
|
||||
if encoded.len() != length {
|
||||
let len = encoded.len();
|
||||
let base = Base62::new(&key, len % 255);
|
||||
let encoded = base.encode(data);
|
||||
|
||||
assert_eq!(encoded.len(), len);
|
||||
|
||||
encoded
|
||||
} else {
|
||||
encoded
|
||||
}
|
||||
}
|
||||
pub fn decode_full(data: &str, key: &[u8]) -> Result<Vec<u8>, String> {
|
||||
let base = Base62::new(&key, data.len() % 255);
|
||||
base.decode(data)
|
||||
}
|
||||
}
|
||||
|
||||
// Helper: Check if big integer (as bytes) is zero
|
||||
fn is_zero(num: &[u8]) -> bool {
|
||||
num.iter().all(|&b| b == 0)
|
||||
}
|
||||
|
||||
// Helper: Divide big integer by 62 and return remainder
|
||||
// Modifies num in place to be the quotient
|
||||
fn div_mod_62(num: &mut Vec<u8>) -> usize {
|
||||
let mut remainder = 0u16;
|
||||
let mut all_zero = true;
|
||||
|
||||
for byte in num.iter_mut() {
|
||||
let current = (remainder << 8) | (*byte as u16);
|
||||
*byte = (current / 62) as u8;
|
||||
remainder = current % 62;
|
||||
if *byte != 0 {
|
||||
all_zero = false;
|
||||
}
|
||||
}
|
||||
|
||||
// Remove leading zeros from quotient
|
||||
if all_zero {
|
||||
num.clear();
|
||||
num.push(0);
|
||||
} else {
|
||||
let first_nonzero = num.iter().position(|&b| b != 0).unwrap_or(0);
|
||||
if first_nonzero > 0 {
|
||||
num.drain(0..first_nonzero);
|
||||
}
|
||||
}
|
||||
|
||||
remainder as usize
|
||||
}
|
||||
|
||||
// Helper: Multiply big integer by 62 and add a value
|
||||
// Modifies num in place
|
||||
fn mul_add(num: &mut Vec<u8>, multiplier: u16, add: u8) {
|
||||
let mut carry = add as u16;
|
||||
|
||||
for byte in num.iter_mut().rev() {
|
||||
let product = (*byte as u16) * multiplier + carry;
|
||||
*byte = (product & 0xFF) as u8;
|
||||
carry = product >> 8;
|
||||
}
|
||||
|
||||
// Add remaining carry bytes
|
||||
while carry > 0 {
|
||||
num.insert(0, (carry & 0xFF) as u8);
|
||||
carry >>= 8;
|
||||
}
|
||||
}
|
||||
|
||||
/// Predicts the byte length of the decoded output given a base-62 encoded string
|
||||
/// This calculates the length without performing the full decoding
|
||||
pub fn predict_base62_len(input_bytes: &[u8]) -> usize {
|
||||
if input_bytes.is_empty() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
// 1. Count leading zero bytes.
|
||||
let num_leading_zeros = input_bytes.iter().take_while(|&&b| b == 0).count();
|
||||
|
||||
// 2. Calculate length of the rest of the bytes.
|
||||
let num_rest_bytes = input_bytes.len() - num_leading_zeros;
|
||||
|
||||
if num_rest_bytes == 0 {
|
||||
// If all bytes were zeros, the length is just the number of zeros.
|
||||
num_leading_zeros
|
||||
} else {
|
||||
// 3. Calculate the mathematical upper bound for the non-zero part.
|
||||
// This is ceil(num_rest_bytes * 8_bits / log2(62))
|
||||
// which is ceil(num_rest_bytes * log_62(256))
|
||||
let rest_len = (num_rest_bytes as f64 * ENCODING_RATIO).ceil();
|
||||
|
||||
// 4. Total length is zeros + rest_len
|
||||
num_leading_zeros + rest_len as usize
|
||||
}
|
||||
}
|
||||
@@ -1,34 +0,0 @@
|
||||
pub mod aes_encrypt;
|
||||
#[allow(dead_code)]
|
||||
pub mod base62;
|
||||
|
||||
pub const ENV_KEY_NAME: &str = "OBFUSCATION_KEY";
|
||||
pub const BACKUP_ENV_KEY: &str = "OBFUSCATION_KEY_DO_NOT_USE";
|
||||
|
||||
pub const STATIC_IV: [u8; 16] = [
|
||||
0x6d, 0x79, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x5f, 0x69, 0x76, 0x5f, 0x30, 0x31, 0x32,
|
||||
];
|
||||
|
||||
pub const STATIC_BYTE_MAP: [u8; 256] = [
|
||||
58, 177, 23, 16, 227, 134, 93, 239, 201, 3, 74, 162, 228, 195, 126, 157, 136, 57, 98, 86, 175,
|
||||
111, 71, 39, 205, 49, 139, 116, 143, 182, 250, 222, 59, 36, 18, 79, 37, 84, 190, 42, 7, 142,
|
||||
167, 168, 105, 54, 218, 230, 203, 83, 52, 129, 144, 184, 41, 73, 29, 72, 128, 75, 160, 149, 20,
|
||||
32, 207, 155, 131, 125, 199, 220, 56, 76, 94, 78, 247, 214, 165, 33, 19, 241, 69, 206, 172,
|
||||
113, 225, 90, 150, 242, 107, 232, 8, 77, 100, 187, 240, 104, 31, 180, 53, 253, 63, 192, 252,
|
||||
30, 140, 158, 1, 210, 24, 44, 243, 145, 197, 80, 202, 65, 196, 45, 51, 11, 55, 236, 186, 22,
|
||||
224, 118, 200, 204, 153, 114, 117, 229, 47, 159, 96, 219, 234, 183, 13, 70, 81, 137, 46, 211,
|
||||
254, 255, 127, 138, 246, 87, 61, 89, 189, 66, 208, 221, 85, 251, 188, 43, 248, 102, 146, 170,
|
||||
132, 213, 178, 103, 62, 92, 27, 6, 38, 122, 185, 181, 215, 12, 179, 4, 169, 226, 209, 0, 112,
|
||||
154, 120, 17, 101, 64, 194, 193, 212, 198, 121, 135, 99, 115, 244, 14, 133, 26, 156, 10, 5,
|
||||
238, 163, 164, 25, 88, 95, 152, 40, 108, 216, 21, 109, 2, 123, 233, 237, 235, 119, 60, 82, 191,
|
||||
68, 151, 161, 124, 48, 35, 249, 171, 50, 141, 166, 34, 15, 176, 97, 148, 147, 91, 9, 28, 223,
|
||||
67, 130, 217, 231, 106, 245, 110, 173, 174,
|
||||
];
|
||||
|
||||
use sha2::{Digest, Sha256};
|
||||
|
||||
pub fn hash(input: &[u8]) -> [u8; 32] {
|
||||
let mut hasher = Sha256::new();
|
||||
hasher.update(input);
|
||||
hasher.finalize().into()
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
const ENV_KEY_NAME: &str = "OBFUSCATION_KEY";
|
||||
const BACKUP_ENV_KEY: &str = "OBFUSCATION_KEY_DO_NOT_USE";
|
||||
|
||||
pub fn get_encryption_key() -> String {
|
||||
std::env::var(ENV_KEY_NAME).unwrap_or({
|
||||
println!("Using default encryption key!");
|
||||
BACKUP_ENV_KEY.to_owned()
|
||||
})
|
||||
}
|
||||
@@ -1,9 +1,72 @@
|
||||
use proc_macro::TokenStream;
|
||||
use quote::quote;
|
||||
use syn::parse::{Parse, ParseStream};
|
||||
use syn::{Expr, Lit, Token};
|
||||
use syn::{Expr, Lit, Token, parse_macro_input};
|
||||
|
||||
pub struct PrintlnArgs {
|
||||
pub format_str: String,
|
||||
pub args: Vec<Expr>,
|
||||
pub fn format_obs(input: TokenStream) -> TokenStream {
|
||||
let PrintlnArgs { format_str, args } = parse_macro_input!(input as PrintlnArgs);
|
||||
|
||||
let segments = parse_format_string(&format_str);
|
||||
|
||||
if segments.is_empty() {
|
||||
return quote! {
|
||||
print!("\n")
|
||||
}
|
||||
.into();
|
||||
}
|
||||
|
||||
let mut parts = Vec::new();
|
||||
|
||||
for segment in segments {
|
||||
match segment {
|
||||
FormatSegment::Static(text) => {
|
||||
parts.push(quote! {
|
||||
obfuscate::symbol!(#text).to_string()
|
||||
});
|
||||
}
|
||||
FormatSegment::Dynamic(spec, idx) => {
|
||||
if idx >= args.len() {
|
||||
return syn::Error::new(
|
||||
proc_macro2::Span::call_site(),
|
||||
format!("argument {} is missing", idx),
|
||||
)
|
||||
.to_compile_error()
|
||||
.into();
|
||||
}
|
||||
|
||||
let arg = &args[idx];
|
||||
let fmt_spec = if spec.is_empty() {
|
||||
quote! { "{}" }
|
||||
} else {
|
||||
let full_spec = format!("{{{}}}", spec);
|
||||
quote! { #full_spec }
|
||||
};
|
||||
|
||||
// quote! {
|
||||
// println!(#fmt_spec, #arg);
|
||||
// }
|
||||
parts.push(quote! {
|
||||
format!(#fmt_spec, #arg)
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
(quote! {
|
||||
{
|
||||
let mut string = String::new();
|
||||
#(
|
||||
string.push_str(&#parts);
|
||||
)*
|
||||
string
|
||||
}
|
||||
})
|
||||
.into()
|
||||
}
|
||||
|
||||
struct PrintlnArgs {
|
||||
format_str: String,
|
||||
args: Vec<Expr>,
|
||||
}
|
||||
|
||||
impl Parse for PrintlnArgs {
|
||||
@@ -40,12 +103,12 @@ impl Parse for PrintlnArgs {
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum FormatSegment {
|
||||
enum FormatSegment {
|
||||
Static(String),
|
||||
Dynamic(String, usize), // format spec, arg index
|
||||
}
|
||||
|
||||
pub fn parse_format_string(fmt: &str) -> Vec<FormatSegment> {
|
||||
fn parse_format_string(fmt: &str) -> Vec<FormatSegment> {
|
||||
let mut segments = Vec::new();
|
||||
let mut current_static = String::new();
|
||||
let mut chars = fmt.chars().peekable();
|
||||
|
||||
@@ -3,12 +3,9 @@
|
||||
|
||||
use proc_macro::TokenStream;
|
||||
use quote::quote;
|
||||
use syn::parse_macro_input;
|
||||
|
||||
mod env;
|
||||
mod format_helper;
|
||||
use format_helper::*;
|
||||
|
||||
mod crypt;
|
||||
|
||||
#[allow(dead_code, unused_imports)]
|
||||
mod no_obfuscate;
|
||||
@@ -43,8 +40,6 @@ pub fn junk_asm(input: TokenStream) -> TokenStream {
|
||||
obs::junk_asm(input)
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
#[proc_macro]
|
||||
pub fn file_symbol(_input: TokenStream) -> TokenStream {
|
||||
// Get the call site span to extract file information
|
||||
@@ -58,70 +53,10 @@ pub fn file_symbol(_input: TokenStream) -> TokenStream {
|
||||
let output = quote! {
|
||||
obfuscate::symbol!(#concatted)
|
||||
};
|
||||
// let output = quote! {
|
||||
// #concatted
|
||||
// };
|
||||
output.into()
|
||||
}
|
||||
|
||||
#[proc_macro]
|
||||
pub fn format_obs(input: TokenStream) -> TokenStream {
|
||||
let PrintlnArgs { format_str, args } = parse_macro_input!(input as PrintlnArgs);
|
||||
|
||||
let segments = parse_format_string(&format_str);
|
||||
|
||||
if segments.is_empty() {
|
||||
return quote! {
|
||||
print!("\n")
|
||||
}
|
||||
.into();
|
||||
}
|
||||
|
||||
let mut parts = Vec::new();
|
||||
|
||||
for segment in segments {
|
||||
match segment {
|
||||
FormatSegment::Static(text) => {
|
||||
parts.push(quote! {
|
||||
obfuscate::symbol!(#text).to_string()
|
||||
});
|
||||
}
|
||||
FormatSegment::Dynamic(spec, idx) => {
|
||||
if idx >= args.len() {
|
||||
return syn::Error::new(
|
||||
proc_macro2::Span::call_site(),
|
||||
format!("argument {} is missing", idx),
|
||||
)
|
||||
.to_compile_error()
|
||||
.into();
|
||||
}
|
||||
|
||||
let arg = &args[idx];
|
||||
let fmt_spec = if spec.is_empty() {
|
||||
quote! { "{}" }
|
||||
} else {
|
||||
let full_spec = format!("{{{}}}", spec);
|
||||
quote! { #full_spec }
|
||||
};
|
||||
|
||||
// quote! {
|
||||
// println!(#fmt_spec, #arg);
|
||||
// }
|
||||
parts.push(quote! {
|
||||
format!(#fmt_spec, #arg)
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
(quote! {
|
||||
{
|
||||
let mut string = String::new();
|
||||
#(
|
||||
string.push_str(&#parts);
|
||||
)*
|
||||
string
|
||||
}
|
||||
})
|
||||
.into()
|
||||
format_helper::format_obs(input)
|
||||
}
|
||||
|
||||
@@ -5,14 +5,3 @@ mod sym_aes_strings;
|
||||
pub use obs_junk_asm::junk_asm;
|
||||
pub use obs_xor::xor;
|
||||
pub use sym_aes_strings::*;
|
||||
|
||||
use crate::crypt::{BACKUP_ENV_KEY, ENV_KEY_NAME};
|
||||
|
||||
fn get_encryption_key() -> String {
|
||||
std::env::var(ENV_KEY_NAME).unwrap_or({
|
||||
println!("Using default encryption key!");
|
||||
BACKUP_ENV_KEY.to_owned()
|
||||
})
|
||||
}
|
||||
|
||||
// pub fn
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
use crate::crypt::{BACKUP_ENV_KEY, ENV_KEY_NAME, STATIC_IV, aes_encrypt::encrypt_aes_lines};
|
||||
use base62::{STATIC_IV, encrypt_aes_lines};
|
||||
use proc_macro::TokenStream;
|
||||
use quote::quote;
|
||||
use syn::{ItemFn, LitStr, parse_macro_input};
|
||||
|
||||
use crate::obfuscate::get_encryption_key;
|
||||
use crate::env::get_encryption_key;
|
||||
|
||||
/// Obfuscate function names by encrypting in AES
|
||||
pub fn aes_fn_name(_attr: TokenStream, item: TokenStream) -> TokenStream {
|
||||
|
||||
Reference in New Issue
Block a user