diff options
| -rw-r--r-- | base32/.gitignore | 2 | ||||
| -rw-r--r-- | base32/.travis.yml | 1 | ||||
| -rw-r--r-- | base32/Cargo.toml | 16 | ||||
| -rw-r--r-- | base32/LICENSE-APACHE | 202 | ||||
| -rw-r--r-- | base32/LICENSE-MIT | 19 | ||||
| -rw-r--r-- | base32/README.md | 35 | ||||
| -rw-r--r-- | base32/src/lib.rs | 221 | ||||
| -rw-r--r-- | nitrocli/Cargo.lock | 5 | ||||
| -rw-r--r-- | nitrocli/Cargo.toml | 5 |
9 files changed, 506 insertions, 0 deletions
diff --git a/base32/.gitignore b/base32/.gitignore new file mode 100644 index 0000000..fa8d85a --- /dev/null +++ b/base32/.gitignore @@ -0,0 +1,2 @@ +Cargo.lock +target diff --git a/base32/.travis.yml b/base32/.travis.yml new file mode 100644 index 0000000..22761ba --- /dev/null +++ b/base32/.travis.yml @@ -0,0 +1 @@ +language: rust diff --git a/base32/Cargo.toml b/base32/Cargo.toml new file mode 100644 index 0000000..ff63bbe --- /dev/null +++ b/base32/Cargo.toml @@ -0,0 +1,16 @@ +[package] + +name = "base32" +version = "0.4.0" +authors = [ "Andreas Ots <qrpth@qrpth.eu>", "Tim Dumol <tim@timdumol.com>" ] +license = "MIT OR Apache-2.0" +repository = "https://github.com/andreasots/base32" +description = "Base32 encoder/decoder for Rust" + +[lib] + +name = "base32" + +[dev-dependencies] +quickcheck = "0.7.1" +rand = "0.5.5" diff --git a/base32/LICENSE-APACHE b/base32/LICENSE-APACHE new file mode 100644 index 0000000..8f71f43 --- /dev/null +++ b/base32/LICENSE-APACHE @@ -0,0 +1,202 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/base32/LICENSE-MIT b/base32/LICENSE-MIT new file mode 100644 index 0000000..2a55a47 --- /dev/null +++ b/base32/LICENSE-MIT @@ -0,0 +1,19 @@ +Copyright (c) 2015 The base32 Developers + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/base32/README.md b/base32/README.md new file mode 100644 index 0000000..86d9ad9 --- /dev/null +++ b/base32/README.md @@ -0,0 +1,35 @@ +# base32 [](https://travis-ci.org/andreasots/base32) + +This library lets you encode and decode in either [RFC4648 Base32](http://en.wikipedia.org/wiki/Base32#RFC_4648_Base32_alphabet) or in [Crockford Base32](http://en.wikipedia.org/wiki/Base32#Crockford.27s_Base32). + +# Usage + +```rust +// crockford base32 +assert_eq!(encode(CrockfordBase32, [0xF8, 0x3E, 0x0F, 0x83, 0xE0]), Vec::from_slice("Z0Z0Z0Z0".to_ascii())); +assert_eq!(decode(CrockfordBase32, "Z0Z0Z0Z0".to_ascii()).unwrap(), vec![0xF8, 0x3E, 0x0F, 0x83, 0xE0]); + +// rfc4648 base32 +assert_eq!(encode(RFC4648Base32, [0xF8, 0x3E, 0x7F, 0x83, 0xE7]), Vec::from_slice("7A7H7A7H".to_ascii())); +assert_eq!(decode(RFC4648Base32, "7A7H7A7H".to_ascii()).unwrap(), vec![0xF8, 0x3E, 0x7F, 0x83, 0xE7]); + +// rfc4648 base32 without padding characters (=) +assert_eq!(encode(UnpaddedRFC4648Base32, [0xF8, 0x3E, 0x7F, 0x83, 0xE7]), Vec::from_slice("7A7H7A7H".to_ascii())); +assert_eq!(decode(UnpaddedRFC4648Base32, "7A7H7A7H".to_ascii()).unwrap(), vec![0xF8, 0x3E, 0x7F, 0x83, 0xE7]); +``` + +## License + +Licensed under either of + + * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) + * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally +submitted for inclusion in the work by you, as defined in the Apache-2.0 +license, shall be dual licensed as above, without any additional terms or +conditions. diff --git a/base32/src/lib.rs b/base32/src/lib.rs new file mode 100644 index 0000000..e21cf97 --- /dev/null +++ b/base32/src/lib.rs @@ -0,0 +1,221 @@ +#[cfg(test)] +extern crate quickcheck; +#[cfg(test)] +extern crate rand; + +use std::cmp::min; + +#[derive(Copy,Clone)] +pub enum Alphabet { + RFC4648 { padding: bool }, + Crockford, +} + +const RFC4648_ALPHABET: &'static [u8] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"; +const CROCKFORD_ALPHABET: &'static [u8] = b"0123456789ABCDEFGHJKMNPQRSTVWXYZ"; + +pub fn encode(alphabet: Alphabet, data: &[u8]) -> String { + let (alphabet, padding) = match alphabet { + Alphabet::RFC4648 { padding } => (RFC4648_ALPHABET, padding), + Alphabet::Crockford => (CROCKFORD_ALPHABET, false), + }; + let mut ret = Vec::with_capacity((data.len()+3)/4*5); + + for chunk in data.chunks(5) { + let buf = { + let mut buf = [0u8; 5]; + for (i, &b) in chunk.iter().enumerate() { + buf[i] = b; + } + buf + }; + ret.push(alphabet[((buf[0] & 0xF8) >> 3) as usize]); + ret.push(alphabet[(((buf[0] & 0x07) << 2) | ((buf[1] & 0xC0) >> 6)) as usize]); + ret.push(alphabet[((buf[1] & 0x3E) >> 1) as usize]); + ret.push(alphabet[(((buf[1] & 0x01) << 4) | ((buf[2] & 0xF0) >> 4)) as usize]); + ret.push(alphabet[(((buf[2] & 0x0F) << 1) | (buf[3] >> 7)) as usize]); + ret.push(alphabet[((buf[3] & 0x7C) >> 2) as usize]); + ret.push(alphabet[(((buf[3] & 0x03) << 3) | ((buf[4] & 0xE0) >> 5)) as usize]); + ret.push(alphabet[(buf[4] & 0x1F) as usize]); + } + + if data.len() % 5 != 0 { + let len = ret.len(); + let num_extra = 8-(data.len()%5*8+4)/5; + if padding { + for i in 1..num_extra+1 { + ret[len-i] = b'='; + } + } else { + ret.truncate(len-num_extra); + } + } + + String::from_utf8(ret).unwrap() +} + +const RFC4648_INV_ALPHABET: [i8; 43] = [-1, -1, 26, 27, 28, 29, 30, 31, -1, -1, -1, -1, -1, 0, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25]; +const CROCKFORD_INV_ALPHABET: [i8; 43] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, 16, 17, 1, 18, 19, 1, 20, 21, 0, 22, 23, 24, 25, 26, -1, 27, 28, 29, 30, 31]; + +pub fn decode(alphabet: Alphabet, data: &str) -> Option<Vec<u8>> { + if !data.is_ascii() { + return None; + } + let data = data.as_bytes(); + let alphabet = match alphabet { + Alphabet::RFC4648 {..} => RFC4648_INV_ALPHABET, + Alphabet::Crockford => CROCKFORD_INV_ALPHABET + }; + let mut unpadded_data_length = data.len(); + for i in 1..min(6, data.len())+1 { + if data[data.len() - i] != b'=' { + break; + } + unpadded_data_length -= 1; + } + let output_length = unpadded_data_length*5/8; + let mut ret = Vec::with_capacity((output_length+4)/5*5); + for chunk in data.chunks(8) { + let buf = { + let mut buf = [0u8; 8]; + for (i, &c) in chunk.iter().enumerate() { + match alphabet.get(c.to_ascii_uppercase().wrapping_sub(b'0') as usize) { + Some(&-1) | None => return None, + Some(&value) => buf[i] = value as u8, + }; + } + buf + }; + ret.push((buf[0] << 3) | (buf[1] >> 2)); + ret.push((buf[1] << 6) | (buf[2] << 1) | (buf[3] >> 4)); + ret.push((buf[3] << 4) | (buf[4] >> 1)); + ret.push((buf[4] << 7) | (buf[5] << 2) | (buf[6] >> 3)); + ret.push((buf[6] << 5) | buf[7]); + } + ret.truncate(output_length); + Some(ret) +} + +#[cfg(test)] +#[allow(dead_code, unused_attributes)] +mod test { + use super::{encode, decode}; + use super::Alphabet::{Crockford, RFC4648}; + use quickcheck; + use std; + use rand::Rng; + + #[derive(Clone)] + struct B32 { + c: u8 + } + + impl quickcheck::Arbitrary for B32 { + fn arbitrary<G: quickcheck::Gen>(g: &mut G) -> B32 { + let alphabet = b"0123456789ABCDEFGHJKMNPQRSTVWXYZ"; + B32 { + c: alphabet[g.gen_range(0, alphabet.len())] + } + } + } + + impl std::fmt::Debug for B32 { + fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> { + (self.c as char).fmt(f) + } + } + + #[test] + fn masks_crockford() { + assert_eq!(encode(Crockford, &[0xF8, 0x3E, 0x0F, 0x83, 0xE0]), "Z0Z0Z0Z0"); + assert_eq!(encode(Crockford, &[0x07, 0xC1, 0xF0, 0x7C, 0x1F]), "0Z0Z0Z0Z"); + assert_eq!(decode(Crockford, "Z0Z0Z0Z0").unwrap(), [0xF8, 0x3E, 0x0F, 0x83, 0xE0]); + assert_eq!(decode(Crockford, "0Z0Z0Z0Z").unwrap(), [0x07, 0xC1, 0xF0, 0x7C, 0x1F]); + } + + #[test] + fn masks_rfc4648() { + assert_eq!(encode(RFC4648 { padding: true }, &[0xF8, 0x3E, 0x7F, 0x83, 0xE7]), "7A7H7A7H"); + assert_eq!(encode(RFC4648 { padding: true }, &[0x77, 0xC1, 0xF7, 0x7C, 0x1F]), "O7A7O7A7"); + assert_eq!(decode(RFC4648 { padding: true }, "7A7H7A7H").unwrap(), [0xF8, 0x3E, 0x7F, 0x83, 0xE7]); + assert_eq!(decode(RFC4648 { padding: true }, "O7A7O7A7").unwrap(), [0x77, 0xC1, 0xF7, 0x7C, 0x1F]); + assert_eq!(encode(RFC4648 { padding: true }, &[0xF8, 0x3E, 0x7F, 0x83]), "7A7H7AY="); + } + + #[test] + fn masks_unpadded_rfc4648() { + assert_eq!(encode(RFC4648 { padding: false }, &[0xF8, 0x3E, 0x7F, 0x83, 0xE7]), "7A7H7A7H"); + assert_eq!(encode(RFC4648 { padding: false }, &[0x77, 0xC1, 0xF7, 0x7C, 0x1F]), "O7A7O7A7"); + assert_eq!(decode(RFC4648 { padding: false }, "7A7H7A7H").unwrap(), [0xF8, 0x3E, 0x7F, 0x83, 0xE7]); + assert_eq!(decode(RFC4648 { padding: false }, "O7A7O7A7").unwrap(), [0x77, 0xC1, 0xF7, 0x7C, 0x1F]); + assert_eq!(encode(RFC4648 { padding: false }, &[0xF8, 0x3E, 0x7F, 0x83]), "7A7H7AY"); + } + + #[test] + fn padding() { + let num_padding = [0, 6, 4, 3, 1]; + for i in 1..6 { + let encoded = encode(RFC4648 { padding: true }, (0..(i as u8)).collect::<Vec<u8>>().as_ref()); + assert_eq!(encoded.len(), 8); + for j in 0..(num_padding[i % 5]) { + assert_eq!(encoded.as_bytes()[encoded.len()-j-1], b'='); + } + for j in 0..(8 - num_padding[i % 5]) { + assert!(encoded.as_bytes()[j] != b'='); + } + } + } + + #[test] + fn invertible_crockford() { + fn test(data: Vec<u8>) -> bool { + decode(Crockford, encode(Crockford, data.as_ref()).as_ref()).unwrap() == data + } + quickcheck::quickcheck(test as fn(Vec<u8>) -> bool) + } + + #[test] + fn invertible_rfc4648() { + fn test(data: Vec<u8>) -> bool { + decode(RFC4648 { padding: true }, encode(RFC4648 { padding: true }, data.as_ref()).as_ref()).unwrap() == data + } + quickcheck::quickcheck(test as fn(Vec<u8>) -> bool) + } + #[test] + fn invertible_unpadded_rfc4648() { + fn test(data: Vec<u8>) -> bool { + decode(RFC4648 { padding: false }, encode(RFC4648 { padding: false }, data.as_ref()).as_ref()).unwrap() == data + } + quickcheck::quickcheck(test as fn(Vec<u8>) -> bool) + } + + #[test] + fn lower_case() { + fn test(data: Vec<B32>) -> bool { + let data: String = data.iter().map(|e| e.c as char).collect(); + decode(Crockford, data.as_ref()) == decode(Crockford, data.to_ascii_lowercase().as_ref()) + } + quickcheck::quickcheck(test as fn(Vec<B32>) -> bool) + } + + #[test] + #[allow(non_snake_case)] + fn iIlL1_oO0() { + assert_eq!(decode(Crockford, "IiLlOo"), decode(Crockford, "111100")); + } + + #[test] + fn invalid_chars_crockford() { + assert_eq!(decode(Crockford, ","), None) + } + + #[test] + fn invalid_chars_rfc4648() { + assert_eq!(decode(RFC4648 { padding: true }, ","), None) + } + + #[test] + fn invalid_chars_unpadded_rfc4648() { + assert_eq!(decode(RFC4648 { padding: false }, ","), None) + } +} diff --git a/nitrocli/Cargo.lock b/nitrocli/Cargo.lock index 5308712..e4ff98f 100644 --- a/nitrocli/Cargo.lock +++ b/nitrocli/Cargo.lock @@ -3,6 +3,10 @@ name = "argparse" version = "0.2.2" [[package]] +name = "base32" +version = "0.4.0" + +[[package]] name = "bitflags" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -54,6 +58,7 @@ name = "nitrocli" version = "0.2.1" dependencies = [ "argparse 0.2.2", + "base32 0.4.0", "libc 0.2.45", "nitrokey 0.3.0", ] diff --git a/nitrocli/Cargo.toml b/nitrocli/Cargo.toml index 0fc6482..8440460 100644 --- a/nitrocli/Cargo.toml +++ b/nitrocli/Cargo.toml @@ -45,6 +45,10 @@ incremental = false version = "0.2.2" path = "../argparse" +[dependencies.base32] +version = "0.4.0" +path = "../base32" + [dependencies.libc] version = "0.2" path = "../libc" @@ -55,6 +59,7 @@ path = "../nitrokey" [replace] +"base32:0.4.0" = { path = "../base32" } "cc:1.0.28" = { path = "../cc" } "libc:0.2.45" = { path = "../libc" } "nitrokey-sys:3.4.1" = { path = "../nitrokey-sys" } |