Merge pull request #37 from rust-ammonia/release-0.5.1

Release 0.5.1

Author: notriddle

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "content-security-policy"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Michael Howell <[email protected]>"]
 description = "Will parse and validate Content-Security-Policy level 3"
 keywords = ["http", "csp", "security"]
@@ -20,7 +20,7 @@ exclude = [
 url = "2"
 percent-encoding = "2.1"
 regex = { version = "1.1", default-features = false, features = ["std"] }
-bitflags = "1.3"
+bitflags = "2.3"
 version-sync = { version = "0.9", optional = true }
 serde = { version = "1.0", features = ["derive"], optional = true }
 sha2 = "0.10"

README.md

@@ -15,7 +15,7 @@ To use `content-security-policy`, add it to your project's `Cargo.toml` file:
 
 ```toml
 [dependencies]
-content-security-policy = "0.5.0"
+content-security-policy = "0.5.1"
 ```
 
 # Example

src/lib.rs

@@ -1510,11 +1510,13 @@ impl HashAlgorithm {
         }
     }
     pub fn apply(self, value: &str) -> String {
+        use base64::Engine as _;
         let bytes = value.as_bytes();
+        let standard = base64::engine::general_purpose::STANDARD;
         match self {
-            HashAlgorithm::Sha256 => base64::encode(sha2::Sha256::digest(bytes)),
-            HashAlgorithm::Sha384 => base64::encode(sha2::Sha384::digest(bytes)),
-            HashAlgorithm::Sha512 => base64::encode(sha2::Sha512::digest(bytes)),
+            HashAlgorithm::Sha256 => standard.encode(sha2::Sha256::digest(bytes)),
+            HashAlgorithm::Sha384 => standard.encode(sha2::Sha384::digest(bytes)),
+            HashAlgorithm::Sha512 => standard.encode(sha2::Sha512::digest(bytes)),
         }
     }
 }

src/sandboxing_directive.rs

@@ -1,6 +1,7 @@
 use bitflags::bitflags;
 
 bitflags!{
+    #[derive(Clone, Copy, Debug, PartialEq, Eq)]
     pub struct SandboxingFlagSet: u32 {
         const SANDBOXED_NAVIGATION_BROWSING_CONTEXT_FLAG = 0x00000001;
         const SANDBOXED_AUXILIARY_NAVIGATION_BROWSING_CONTEXT_FLAG = 0x00000002;