Skip to content

Commit

Permalink
Merge pull request #91 from advancedSTORE/dependabot/cargo/base64-0.21.0
Browse files Browse the repository at this point in the history
Bump base64 from 0.13.1 to 0.21.0
  • Loading branch information
friedemannsommer committed Jan 9, 2023
2 parents 1fc3e32 + e10edf6 commit b13860b
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ criterion = "0.4.0"
version-sync = "0.9.4"

[dependencies]
base64 = "0.13"
base64 = "0.21"
serde = { version = "1.0", features = ["derive"], optional = true }

[badges]
Expand Down
20 changes: 14 additions & 6 deletions src/decode/tcf_2.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
use std::convert::TryFrom;

use base64::Engine;

use crate::decode::{
error::TcsError,
model::{
Expand All @@ -17,6 +19,14 @@ const VENDOR_RANGE_SECTION_TYPES: &[fn(Vec<u16>) -> RangeSectionType; 2] = &[
RangeSectionType::VendorLegitimateInterest,
];

const BASE64_ENGINE: base64::engine::general_purpose::GeneralPurpose =
base64::engine::general_purpose::GeneralPurpose::new(
&base64::alphabet::URL_SAFE,
base64::engine::general_purpose::GeneralPurposeConfig::new()
.with_encode_padding(false)
.with_decode_padding_mode(base64::engine::DecodePaddingMode::RequireNone),
);

fn parse_publisher_restrictions_from_bytes(
val: &[u8],
bit_start: usize,
Expand Down Expand Up @@ -179,12 +189,10 @@ impl TryFrom<&str> for TcModelV2 {
return Err(TcsError::InsufficientLength);
}

tcs_segments.push(
match base64::decode_config(base64_str, base64::URL_SAFE_NO_PAD) {
Ok(decoded_bytes) => decoded_bytes,
Err(err) => return Err(TcsError::InvalidUrlSafeBase64(err)),
},
);
tcs_segments.push(match BASE64_ENGINE.decode(base64_str) {
Ok(decoded_bytes) => decoded_bytes,
Err(err) => return Err(TcsError::InvalidUrlSafeBase64(err)),
});
}

Self::try_from_vec(tcs_segments)
Expand Down

0 comments on commit b13860b

Please sign in to comment.