feat: v1.1.0, add static x25519 support
This commit is contained in:
@@ -1,11 +1,16 @@
|
||||
use clap::Args;
|
||||
use rust_util::XResult;
|
||||
use rust_util::{debugging, information, opt_result, simple_error, success, XResult};
|
||||
use security_framework::os::macos::keychain::SecKeychain;
|
||||
|
||||
use crate::config::TinyEncryptConfigEnvelop;
|
||||
use crate::spec::TinyEncryptEnvelopType;
|
||||
use crate::util_keychainpasskey;
|
||||
|
||||
#[derive(Debug, Args)]
|
||||
pub struct CmdKeychainKey {
|
||||
/// Keychain name, or default
|
||||
#[arg(long, short = 'c')]
|
||||
pub keychain_name: Option<String>,
|
||||
// /// Keychain name, or default
|
||||
// #[arg(long, short = 'c')]
|
||||
// pub keychain_name: Option<String>,
|
||||
/// Service name, or tiny-encrypt
|
||||
#[arg(long, short = 's')]
|
||||
pub server_name: Option<String>,
|
||||
@@ -20,21 +25,38 @@ pub struct CmdKeychainKey {
|
||||
#[allow(dead_code)]
|
||||
const DEFAULT_SERVICE_NAME: &str = "tiny-encrypt";
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub enum KeyType {
|
||||
P256,
|
||||
P384,
|
||||
X25519,
|
||||
}
|
||||
pub fn keychain_key(cmd_keychain_key: CmdKeychainKey) -> XResult<()> {
|
||||
let service_name = cmd_keychain_key.server_name.as_deref().unwrap_or(DEFAULT_SERVICE_NAME);
|
||||
let sec_keychain = opt_result!(SecKeychain::default(), "Get keychain failed: {}");
|
||||
if sec_keychain.find_generic_password(service_name, &cmd_keychain_key.key_name).is_ok() {
|
||||
return simple_error!("Static x25519 exists: {}.{}", service_name, &cmd_keychain_key.key_name);
|
||||
}
|
||||
|
||||
let (keychain_key, public_key) = util_keychainpasskey::generate_pass_x25519_static_secret();
|
||||
opt_result!(
|
||||
sec_keychain.set_generic_password(service_name, &cmd_keychain_key.key_name, keychain_key.as_bytes()),
|
||||
"Write static x25519 failed: {}"
|
||||
);
|
||||
|
||||
let public_key_hex = hex::encode(public_key.as_bytes());
|
||||
debugging!("Keychain key : {}", keychain_key);
|
||||
success!("Keychain name: {}", &cmd_keychain_key.key_name);
|
||||
success!("Public key : {}", &public_key_hex);
|
||||
|
||||
let config_envelop = TinyEncryptConfigEnvelop {
|
||||
r#type: TinyEncryptEnvelopType::StaticX25519,
|
||||
sid: Some(cmd_keychain_key.key_name.clone()),
|
||||
kid: format!("keychain:{}", &public_key_hex),
|
||||
desc: Some("Keychain static".to_string()),
|
||||
args: Some(vec![
|
||||
"".to_string(),
|
||||
service_name.to_string(),
|
||||
cmd_keychain_key.key_name.clone(),
|
||||
]),
|
||||
public_part: public_key_hex,
|
||||
};
|
||||
|
||||
information!("Config envelop:\n{}", serde_json::to_string_pretty(&config_envelop).unwrap());
|
||||
|
||||
// TODO Under developing
|
||||
// keychain://keychain_name?sn=service_name&kt=kp-p256&kn=key_name&fp=fingerprint
|
||||
// keychain_name -> default
|
||||
// service_name -> tiny-encrypt
|
||||
// kt=kp-p256|kp-p384|kp-x25519 -> keypair P256, P385 or X25519
|
||||
// key_name -> key name in keychain
|
||||
// fingerprint -> hex(SHA256(public_key)[0..4])
|
||||
pub fn keychain_key(_cmd_keychain_key: CmdKeychainKey) -> XResult<()> {
|
||||
println!();
|
||||
Ok(())
|
||||
}
|
||||
Reference in New Issue
Block a user