Set MMAP_THRESHOLD to a fixed value (128K)

[proxmox-backup.git] / pbs-tools / src / ticket.rs

diff --git a/pbs-tools/src/ticket.rs b/pbs-tools/src/ticket.rs
index b4e41619e175320c6af02f05991cd6bcbd1c4a47..9828d429a7a7c47095688a753ebd498404520163 100644 (file)
--- a/pbs-tools/src/ticket.rs
+++ b/pbs-tools/src/ticket.rs
@@ -66,7 +66,7 @@ where
         Ok(Self {
             prefix: Cow::Borrowed(prefix),
             data: data.to_string(),
-            time: proxmox::tools::time::epoch_i64(),
+            time: proxmox_time::epoch_i64(),
             signature: None,
             _type_marker: PhantomData,
         })
@@ -97,8 +97,8 @@ where
         write!(
             f,
             "{}:{}:{:08X}",
-            percent_encode(self.prefix.as_bytes(), &TICKET_ASCIISET),
-            percent_encode(self.data.as_bytes(), &TICKET_ASCIISET),
+            percent_encode(self.prefix.as_bytes(), TICKET_ASCIISET),
+            percent_encode(self.data.as_bytes(), TICKET_ASCIISET),
             self.time,
         )
         .map_err(Error::from)
@@ -107,7 +107,7 @@ where
     /// Write additional authentication data to the verifier.
     fn write_aad(f: &mut dyn io::Write, aad: Option<&str>) -> Result<(), Error> {
         if let Some(aad) = aad {
-            write!(f, ":{}", percent_encode(aad.as_bytes(), &TICKET_ASCIISET))?;
+            write!(f, ":{}", percent_encode(aad.as_bytes(), TICKET_ASCIISET))?;
         }
         Ok(())
     }
@@ -122,7 +122,7 @@ where
     /// Sign the ticket.
     pub fn sign(&mut self, keypair: &PKey<Private>, aad: Option<&str>) -> Result<String, Error> {
         let mut output = Vec::<u8>::new();
-        let mut signer = Signer::new(MessageDigest::sha256(), &keypair)
+        let mut signer = Signer::new(MessageDigest::sha256(), keypair)
             .map_err(|err| format_err!("openssl error creating signer for ticket: {}", err))?;
 
         self.write_data(&mut output)
@@ -171,7 +171,7 @@ where
             None => bail!("invalid ticket without signature"),
         };
 
-        let age = proxmox::tools::time::epoch_i64() - self.time;
+        let age = proxmox_time::epoch_i64() - self.time;
         if age < time_frame.start {
             bail!("invalid ticket - timestamp newer than expected");
         }
@@ -179,14 +179,14 @@ where
             bail!("invalid ticket - expired");
         }
 
-        let mut verifier = Verifier::new(MessageDigest::sha256(), &keypair)?;
+        let mut verifier = Verifier::new(MessageDigest::sha256(), keypair)?;
 
         self.write_data(&mut verifier)
             .and_then(|()| Self::write_aad(&mut verifier, aad))
             .map_err(|err| format_err!("error verifying ticket: {}", err))?;
 
         let is_valid: bool = verifier
-            .verify(&signature)
+            .verify(signature)
             .map_err(|err| format_err!("openssl error verifying ticket: {}", err))?;
 
         if !is_valid {
@@ -325,7 +325,7 @@ mod test {
             false
         });
         simple_test(&key, None, |t| {
-            t.change_time(proxmox::tools::time::epoch_i64() + 0x1000_0000);
+            t.change_time(proxmox_time::epoch_i64() + 0x1000_0000);
             false
         });
     }