mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-18 22:16:18 -05:00
Update dependencies and improve crypto handling
- Updated macOS-specific dependencies in `Cargo.toml` to their latest versions for better compatibility and performance. - Refactored nonce handling in `crypto.rs` to improve clarity and correctness in the decryption process. - Modified `gh-release.sh` to streamline asset uploads for snapshot releases and ensure stability for tagged releases by limiting uploaded components.
This commit is contained in:
15 files changed
+2724
-2552
No files matched your search
@@ -32,10 +32,10 @@ html-escape = { version = "0.2.13", optional = true }
|
||||
webkit2gtk = { version = "2", optional = true }
|
||||
|
||||
[target.'cfg(target_os = "macos")'.dependencies]
|
||||
block2 = { version = "0.5", optional = true }
|
||||
objc2 = { version = "0.5", optional = true }
|
||||
objc2-foundation = { version = "0.2", optional = true }
|
||||
objc2-web-kit = { version = "0.2", optional = true }
|
||||
block2 = { version = "0.6", optional = true }
|
||||
objc2 = { version = "0.6", optional = true }
|
||||
objc2-foundation = { version = "0.3", optional = true }
|
||||
objc2-web-kit = { version = "0.3", optional = true }
|
||||
|
||||
[features]
|
||||
browser-auth = [
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use chacha20poly1305::{
|
||||
aead::{Aead, OsRng},
|
||||
AeadCore, ChaCha20Poly1305, Key, KeyInit, Nonce,
|
||||
AeadCore, ChaCha20Poly1305, Key, KeyInit,
|
||||
};
|
||||
use serde::{de::DeserializeOwned, Serialize};
|
||||
|
||||
@@ -31,10 +31,10 @@ where
|
||||
{
|
||||
let cipher = ChaCha20Poly1305::new(key);
|
||||
|
||||
let nonce = Nonce::from_slice(&encrypted[..12]);
|
||||
let nonce = &encrypted[..12];
|
||||
let cipher_text = &encrypted[12..];
|
||||
|
||||
let plaintext = cipher.decrypt(nonce, cipher_text)?;
|
||||
let plaintext = cipher.decrypt(nonce.into(), cipher_text)?;
|
||||
|
||||
let value = serde_json::from_slice(&plaintext)?;
|
||||
|
||||
|
||||
Reference in new issue
Block a user