diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1e7caa9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +Cargo.lock +target/ diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..ef647e1 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,17 @@ +language: rust +rust: + - nightly + - stable + - beta +script: + - RUSTFLAGS='-F warnings' cargo build --verbose --all + - RUSTFLAGS='-F warnings' cargo test --verbose --all +stages: + - Format + - Test +jobs: + include: + - stage: Format + script: + - rustup component add rustfmt-preview + - cargo fmt --all -- --check diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 0000000..e69de29 diff --git a/src/lib.rs b/src/lib.rs index b4d4517..ca23db5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -19,12 +19,12 @@ pub mod sm2; pub mod sm3; pub mod sm4; -extern crate rand; extern crate byteorder; +extern crate rand; extern crate num_bigint; -extern crate num_traits; extern crate num_integer; +extern crate num_traits; extern crate yasna; #[macro_use] diff --git a/src/sm2/mod.rs b/src/sm2/mod.rs index 9394c20..4a5c34d 100644 --- a/src/sm2/mod.rs +++ b/src/sm2/mod.rs @@ -15,6 +15,6 @@ // You should have received a copy of the GNU General Public License // along with libsm. If not, see . -pub mod field; pub mod ecc; -pub mod signature; \ No newline at end of file +pub mod field; +pub mod signature; diff --git a/src/sm3/mod.rs b/src/sm3/mod.rs index 58e8a6a..fb721ac 100644 --- a/src/sm3/mod.rs +++ b/src/sm3/mod.rs @@ -16,4 +16,3 @@ // along with libsm. If not, see . pub mod hash; - diff --git a/src/sm4/cipher.rs b/src/sm4/cipher.rs index f2bd95f..7c43ac1 100644 --- a/src/sm4/cipher.rs +++ b/src/sm4/cipher.rs @@ -16,38 +16,22 @@ // along with libsm. If not, see . static SBOX: [u8; 256] = [ - 0xd6, 0x90, 0xe9, 0xfe, 0xcc, 0xe1, 0x3d, 0xb7, - 0x16, 0xb6, 0x14, 0xc2, 0x28, 0xfb, 0x2c, 0x05, - 0x2b, 0x67, 0x9a, 0x76, 0x2a, 0xbe, 0x04, 0xc3, - 0xaa, 0x44, 0x13, 0x26, 0x49, 0x86, 0x06, 0x99, - 0x9c, 0x42, 0x50, 0xf4, 0x91, 0xef, 0x98, 0x7a, - 0x33, 0x54, 0x0b, 0x43, 0xed, 0xcf, 0xac, 0x62, - 0xe4, 0xb3, 0x1c, 0xa9, 0xc9, 0x08, 0xe8, 0x95, - 0x80, 0xdf, 0x94, 0xfa, 0x75, 0x8f, 0x3f, 0xa6, - 0x47, 0x07, 0xa7, 0xfc, 0xf3, 0x73, 0x17, 0xba, - 0x83, 0x59, 0x3c, 0x19, 0xe6, 0x85, 0x4f, 0xa8, - 0x68, 0x6b, 0x81, 0xb2, 0x71, 0x64, 0xda, 0x8b, - 0xf8, 0xeb, 0x0f, 0x4b, 0x70, 0x56, 0x9d, 0x35, - 0x1e, 0x24, 0x0e, 0x5e, 0x63, 0x58, 0xd1, 0xa2, - 0x25, 0x22, 0x7c, 0x3b, 0x01, 0x21, 0x78, 0x87, - 0xd4, 0x00, 0x46, 0x57, 0x9f, 0xd3, 0x27, 0x52, - 0x4c, 0x36, 0x02, 0xe7, 0xa0, 0xc4, 0xc8, 0x9e, - 0xea, 0xbf, 0x8a, 0xd2, 0x40, 0xc7, 0x38, 0xb5, - 0xa3, 0xf7, 0xf2, 0xce, 0xf9, 0x61, 0x15, 0xa1, - 0xe0, 0xae, 0x5d, 0xa4, 0x9b, 0x34, 0x1a, 0x55, - 0xad, 0x93, 0x32, 0x30, 0xf5, 0x8c, 0xb1, 0xe3, - 0x1d, 0xf6, 0xe2, 0x2e, 0x82, 0x66, 0xca, 0x60, - 0xc0, 0x29, 0x23, 0xab, 0x0d, 0x53, 0x4e, 0x6f, - 0xd5, 0xdb, 0x37, 0x45, 0xde, 0xfd, 0x8e, 0x2f, - 0x03, 0xff, 0x6a, 0x72, 0x6d, 0x6c, 0x5b, 0x51, - 0x8d, 0x1b, 0xaf, 0x92, 0xbb, 0xdd, 0xbc, 0x7f, - 0x11, 0xd9, 0x5c, 0x41, 0x1f, 0x10, 0x5a, 0xd8, - 0x0a, 0xc1, 0x31, 0x88, 0xa5, 0xcd, 0x7b, 0xbd, - 0x2d, 0x74, 0xd0, 0x12, 0xb8, 0xe5, 0xb4, 0xb0, - 0x89, 0x69, 0x97, 0x4a, 0x0c, 0x96, 0x77, 0x7e, - 0x65, 0xb9, 0xf1, 0x09, 0xc5, 0x6e, 0xc6, 0x84, - 0x18, 0xf0, 0x7d, 0xec, 0x3a, 0xdc, 0x4d, 0x20, - 0x79, 0xee, 0x5f, 0x3e, 0xd7, 0xcb, 0x39, 0x48, + 0xd6, 0x90, 0xe9, 0xfe, 0xcc, 0xe1, 0x3d, 0xb7, 0x16, 0xb6, 0x14, 0xc2, 0x28, 0xfb, 0x2c, 0x05, + 0x2b, 0x67, 0x9a, 0x76, 0x2a, 0xbe, 0x04, 0xc3, 0xaa, 0x44, 0x13, 0x26, 0x49, 0x86, 0x06, 0x99, + 0x9c, 0x42, 0x50, 0xf4, 0x91, 0xef, 0x98, 0x7a, 0x33, 0x54, 0x0b, 0x43, 0xed, 0xcf, 0xac, 0x62, + 0xe4, 0xb3, 0x1c, 0xa9, 0xc9, 0x08, 0xe8, 0x95, 0x80, 0xdf, 0x94, 0xfa, 0x75, 0x8f, 0x3f, 0xa6, + 0x47, 0x07, 0xa7, 0xfc, 0xf3, 0x73, 0x17, 0xba, 0x83, 0x59, 0x3c, 0x19, 0xe6, 0x85, 0x4f, 0xa8, + 0x68, 0x6b, 0x81, 0xb2, 0x71, 0x64, 0xda, 0x8b, 0xf8, 0xeb, 0x0f, 0x4b, 0x70, 0x56, 0x9d, 0x35, + 0x1e, 0x24, 0x0e, 0x5e, 0x63, 0x58, 0xd1, 0xa2, 0x25, 0x22, 0x7c, 0x3b, 0x01, 0x21, 0x78, 0x87, + 0xd4, 0x00, 0x46, 0x57, 0x9f, 0xd3, 0x27, 0x52, 0x4c, 0x36, 0x02, 0xe7, 0xa0, 0xc4, 0xc8, 0x9e, + 0xea, 0xbf, 0x8a, 0xd2, 0x40, 0xc7, 0x38, 0xb5, 0xa3, 0xf7, 0xf2, 0xce, 0xf9, 0x61, 0x15, 0xa1, + 0xe0, 0xae, 0x5d, 0xa4, 0x9b, 0x34, 0x1a, 0x55, 0xad, 0x93, 0x32, 0x30, 0xf5, 0x8c, 0xb1, 0xe3, + 0x1d, 0xf6, 0xe2, 0x2e, 0x82, 0x66, 0xca, 0x60, 0xc0, 0x29, 0x23, 0xab, 0x0d, 0x53, 0x4e, 0x6f, + 0xd5, 0xdb, 0x37, 0x45, 0xde, 0xfd, 0x8e, 0x2f, 0x03, 0xff, 0x6a, 0x72, 0x6d, 0x6c, 0x5b, 0x51, + 0x8d, 0x1b, 0xaf, 0x92, 0xbb, 0xdd, 0xbc, 0x7f, 0x11, 0xd9, 0x5c, 0x41, 0x1f, 0x10, 0x5a, 0xd8, + 0x0a, 0xc1, 0x31, 0x88, 0xa5, 0xcd, 0x7b, 0xbd, 0x2d, 0x74, 0xd0, 0x12, 0xb8, 0xe5, 0xb4, 0xb0, + 0x89, 0x69, 0x97, 0x4a, 0x0c, 0x96, 0x77, 0x7e, 0x65, 0xb9, 0xf1, 0x09, 0xc5, 0x6e, 0xc6, 0x84, + 0x18, 0xf0, 0x7d, 0xec, 0x3a, 0xdc, 0x4d, 0x20, 0x79, 0xee, 0x5f, 0x3e, 0xd7, 0xcb, 0x39, 0x48, ]; fn split(input: u32) -> [u8; 4] { @@ -123,30 +107,22 @@ fn t_prime_trans(input: u32) -> u32 { pub struct Sm4Cipher { // round key - rk: Vec + rk: Vec, } -static FK: [u32; 4] = [ - 0xa3b1bac6, 0x56aa3350, 0x677d9197, 0xb27022dc -]; +static FK: [u32; 4] = [0xa3b1bac6, 0x56aa3350, 0x677d9197, 0xb27022dc]; static CK: [u32; 32] = [ - 0x00070e15, 0x1c232a31, 0x383f464d, 0x545b6269, - 0x70777e85, 0x8c939aa1, 0xa8afb6bd, 0xc4cbd2d9, - 0xe0e7eef5, 0xfc030a11, 0x181f262d, 0x343b4249, - 0x50575e65, 0x6c737a81, 0x888f969d, 0xa4abb2b9, - 0xc0c7ced5, 0xdce3eaf1, 0xf8ff060d, 0x141b2229, - 0x30373e45, 0x4c535a61, 0x686f767d, 0x848b9299, - 0xa0a7aeb5, 0xbcc3cad1, 0xd8dfe6ed, 0xf4fb0209, - 0x10171e25, 0x2c333a41, 0x484f565d, 0x646b7279 + 0x00070e15, 0x1c232a31, 0x383f464d, 0x545b6269, 0x70777e85, 0x8c939aa1, 0xa8afb6bd, 0xc4cbd2d9, + 0xe0e7eef5, 0xfc030a11, 0x181f262d, 0x343b4249, 0x50575e65, 0x6c737a81, 0x888f969d, 0xa4abb2b9, + 0xc0c7ced5, 0xdce3eaf1, 0xf8ff060d, 0x141b2229, 0x30373e45, 0x4c535a61, 0x686f767d, 0x848b9299, + 0xa0a7aeb5, 0xbcc3cad1, 0xd8dfe6ed, 0xf4fb0209, 0x10171e25, 0x2c333a41, 0x484f565d, 0x646b7279, ]; impl Sm4Cipher { pub fn new(key: &[u8]) -> Sm4Cipher { let mut k: [u32; 4] = split_block(&key); - let mut cipher = Sm4Cipher { - rk: Vec::new() - }; + let mut cipher = Sm4Cipher { rk: Vec::new() }; for i in 0..4 { k[i] = k[i] ^ FK[i]; } @@ -200,8 +176,8 @@ mod tests { #[test] fn setup_cipher() { let key: [u8; 16] = [ - 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, - 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 + 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, + 0x32, 0x10, ]; let cipher = Sm4Cipher::new(&key); let rk = &cipher.rk; @@ -212,19 +188,19 @@ mod tests { #[test] fn enc_and_dec() { let key: [u8; 16] = [ - 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, - 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 + 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, + 0x32, 0x10, ]; let cipher = Sm4Cipher::new(&key); let data: [u8; 16] = [ - 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, - 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 + 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, + 0x32, 0x10, ]; let ct = cipher.encrypt(&data); let standard_ct: [u8; 16] = [ - 0x68, 0x1e, 0xdf, 0x34, 0xd2, 0x06, 0x96, 0x5e, - 0x86, 0xb3, 0xe9, 0x4f, 0x53, 0x6e, 0x42, 0x46 + 0x68, 0x1e, 0xdf, 0x34, 0xd2, 0x06, 0x96, 0x5e, 0x86, 0xb3, 0xe9, 0x4f, 0x53, 0x6e, + 0x42, 0x46, ]; // Check the example cipher text diff --git a/src/sm4/cipher_mode.rs b/src/sm4/cipher_mode.rs index 55faea1..657173d 100644 --- a/src/sm4/cipher_mode.rs +++ b/src/sm4/cipher_mode.rs @@ -55,10 +55,7 @@ fn block_add_one(a: &mut [u8]) { impl SM4CipherMode { pub fn new(key: &[u8], mode: CipherMode) -> SM4CipherMode { let cipher = Sm4Cipher::new(key); - SM4CipherMode { - cipher, - mode, - } + SM4CipherMode { cipher, mode } } pub fn encrypt(&self, data: &[u8], iv: &[u8]) -> Vec { @@ -68,7 +65,7 @@ impl SM4CipherMode { match self.mode { CipherMode::Cfb => self.cfb_encrypt(data, iv), CipherMode::Ofb => self.ofb_encrypt(data, iv), - CipherMode::Ctr => self.ctr_encrypt(data, iv) + CipherMode::Ctr => self.ctr_encrypt(data, iv), } } @@ -79,7 +76,7 @@ impl SM4CipherMode { match self.mode { CipherMode::Cfb => self.cfb_decrypt(data, iv), CipherMode::Ofb => self.ofb_encrypt(data, iv), - CipherMode::Ctr => self.ctr_encrypt(data, iv) + CipherMode::Ctr => self.ctr_encrypt(data, iv), } } @@ -228,7 +225,6 @@ mod tests { test_ciphermode(CipherMode::Ofb); } - fn test_ciphermode(mode: CipherMode) { let key = rand_block(); let iv = rand_block(); diff --git a/src/sm4/mod.rs b/src/sm4/mod.rs index f43ffed..d678d7d 100644 --- a/src/sm4/mod.rs +++ b/src/sm4/mod.rs @@ -19,4 +19,4 @@ pub mod cipher; pub mod cipher_mode; pub type Mode = self::cipher_mode::CipherMode; -pub type Cipher = self::cipher_mode::SM4CipherMode; \ No newline at end of file +pub type Cipher = self::cipher_mode::SM4CipherMode;