use custom base45

Author: ubamrein

Diff for: Cargo.lock

@@ -19,7 +19,7 @@ p256 = "0.8.0"
 simple_asn1 = "0.5.2"
 # zip = { version = "0.5.12", default-features = false, features = ['deflate-zlib'] }
 # flate2 = "1.0.20"
-base45 = "2.0.1"
+# flate2 = "1.0.20"
 
 [[bench]]
 name = "benchmark"

Diff for: Cargo.toml

@@ -1,27 +1,29 @@
 use bencher::Bencher;
 use bencher::{benchmark_main, benchmark_group};
 use rust_dgc::base45::ALPHABET;
-fn benchmark_encoding(bench: &mut Bencher) {
+fn benchmark_encoding_custom(bench: &mut Bencher) {
     bench.iter(|| {
         let sample_3 = "base-45";
         rust_dgc::base45::encode(sample_3.as_bytes())
     })
 }
-fn benchmark_decoding(bench: &mut Bencher) {
+
+fn benchmark_decoding_custom(bench: &mut Bencher) {
     bench.iter(|| {
         let sample_3 = "UJCLQE7W581";
        rust_dgc::base45::decode(sample_3)
     })
 }
 
-fn benchmark_large_encoding(bench: &mut Bencher) {
-    let random_bytes: Vec<u8> = (0..1_000_000).map(|_| { rand::random::<u8>() }).collect();
+fn benchmark_large_encoding_custom(bench: &mut Bencher) {
+    
     bench.iter(|| {
+        let random_bytes: Vec<u8> = (0..1_000_000).map(|_| { rand::random::<u8>() }).collect();
         rust_dgc::base45::encode(&random_bytes)
     })
 }
 
-fn benchmark_large_decoding(bench: &mut Bencher) {
+fn benchmark_large_decoding_custom(bench: &mut Bencher) {
      use rand::Rng;
 
     let random_bytes: Vec<u8> = (0..1_500_000).map(|_| { 
@@ -35,5 +37,5 @@ fn benchmark_large_decoding(bench: &mut Bencher) {
     })
 }
 
-benchmark_group!(benches, benchmark_encoding, benchmark_decoding, benchmark_large_encoding, benchmark_large_decoding);
+benchmark_group!(benches, benchmark_encoding_custom, benchmark_decoding_custom, benchmark_large_encoding_custom, benchmark_large_decoding_custom);
 benchmark_main!(benches);

Diff for: benches/benchmark.rs

@@ -133,10 +133,10 @@ pub fn decode(base45_string: &str) -> Result<Vec<u8>, InvalidCharacter> {
                 _ => panic!(),
             };
             let bytes = val.to_be_bytes();
-            if val <= u8::MAX as u16 {
+            if c.len() < 3 {
                 vec![bytes[1]]
             } else {
-                bytes.to_vec()
+             bytes.to_vec()
             }
         })
         .collect::<Vec<u8>>())

Diff for: src/base45.rs

@@ -36,7 +36,6 @@ struct Jwk {
     pub crv : Option<String>
 }
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-
 
     let key_list = include_bytes!("list");
     let cwt = get_payload(key_list).unwrap();

Diff for: src/main.rs

@@ -32,7 +32,6 @@ wee_alloc = { version = "0.4.2", optional = true }
 serde_json = "1.0.64"
 base64 = "0.13.0"
 getrandom = {version = "0.2.2", features = ["js"]}
-base45 = "2.0.1"
 flate2 = {version = "1.0.20", default-features =false, features = ["rust_backend"]}
 # The `web-sys` crate allows you to interact with the various browser APIs,
 # like the DOM.
@@ -49,7 +48,7 @@ console_error_panic_hook = "0.1.5"
 
 # These crates are used for running unit tests.
 [dev-dependencies]
-wasm-bindgen-test = "0.2.45"
-futures = "0.1.27"
+wasm-bindgen-test = "0.3.23"
+# futures = "0.1.27"
 js-sys = "0.3.22"
-wasm-bindgen-futures = "0.3.22"
+# wasm-bindgen-futures = "0.4.23"

Diff for: web/dgc-web/Cargo.lock

@@ -1,14 +1,13 @@
 use std::io::Cursor;
 
-use base45::decode;
-use rust_dgc::{get_payload, from_byte_string, to_byte_string, VerificationKey};
+use rust_dgc::{VerificationKey, base45, from_byte_string, get_payload, to_byte_string};
 use wasm_bindgen::prelude::*;
 use std::io::Read;
 
 #[wasm_bindgen]
 pub fn parse_cwt_from_bytestring(cbor_cwt: String) -> String {
     let cbor_cwt = if cbor_cwt.starts_with("HC1:") {
-        let mut decoded = Cursor::new( base45::decode(&cbor_cwt.replace("HC1:", "")));
+        let mut decoded = Cursor::new( base45::decode(&cbor_cwt.replace("HC1:", "")).unwrap_or(vec![]));
         let mut decompressor = flate2::read::ZlibDecoder::new(&mut decoded);
         let mut decompressed = vec![];
         match decompressor.read_to_end(&mut decompressed) {
@@ -29,7 +28,7 @@ pub fn parse_cwt_from_bytestring(cbor_cwt: String) -> String {
 #[wasm_bindgen]
 pub fn get_hcert_from_cwt(cbor_cwt: String) -> String {
      let cbor_cwt = if cbor_cwt.starts_with("HC1:") {
-        let mut decoded = Cursor::new( base45::decode(&cbor_cwt.replace("HC1:", "")));
+        let mut decoded = Cursor::new( base45::decode(&cbor_cwt.replace("HC1:", "")).unwrap_or(vec![]));
         let mut decompressor = flate2::read::ZlibDecoder::new(&mut decoded);
         let mut decompressed = vec![];
         match decompressor.read_to_end(&mut decompressed) {
@@ -50,7 +49,7 @@ pub fn get_hcert_from_cwt(cbor_cwt: String) -> String {
 #[wasm_bindgen]
 pub fn verify_cwt_ec(cbor_cwt: String, x: String, y: String, encoding: String) -> bool {
     let cbor_cwt = if cbor_cwt.starts_with("HC1:") {
-        let mut decoded = Cursor::new( base45::decode(&cbor_cwt.replace("HC1:", "")));
+        let mut decoded = Cursor::new( base45::decode(&cbor_cwt.replace("HC1:", "")).unwrap_or(vec![]));
         let mut decompressor = flate2::read::ZlibDecoder::new(&mut decoded);
         let mut decompressed = vec![];
         match decompressor.read_to_end(&mut decompressed) {