From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.gruenbichler@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 34CD161196
for <pbs-devel@lists.proxmox.com>; Wed, 16 Dec 2020 14:41:56 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 2BD0F1C9C9
for <pbs-devel@lists.proxmox.com>; Wed, 16 Dec 2020 14:41:26 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[212.186.127.180])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 95AF01C9BF
for <pbs-devel@lists.proxmox.com>; Wed, 16 Dec 2020 14:41:25 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5F9CC45212
for <pbs-devel@lists.proxmox.com>; Wed, 16 Dec 2020 14:41:25 +0100 (CET)
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Wed, 16 Dec 2020 14:41:07 +0100
Message-Id: <20201216134111.445581-4-f.gruenbichler@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20201216134111.445581-1-f.gruenbichler@proxmox.com>
References: <20201216134111.445581-1-f.gruenbichler@proxmox.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.025 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/,
medium trust
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [proxmox-backup-client.rs]
Subject: [pbs-devel] [PATCH proxmox-backup 3/7] key: move RSA-encryption to
KeyConfig
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 16 Dec 2020 13:41:56 -0000
since that is what gets encrypted, and not a CryptConfig.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
src/backup/crypt_config.rs | 26 +-------------------------
src/backup/key_derivation.rs | 14 ++++++++++++++
src/bin/proxmox-backup-client.rs | 13 +++++++++++--
3 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/src/backup/crypt_config.rs b/src/backup/crypt_config.rs
index 711f90f6..2b04380a 100644
--- a/src/backup/crypt_config.rs
+++ b/src/backup/crypt_config.rs
@@ -11,7 +11,7 @@ use std::fmt;
use std::fmt::Display;
use std::io::Write;
-use anyhow::{bail, Error};
+use anyhow::{Error};
use openssl::hash::MessageDigest;
use openssl::pkcs5::pbkdf2_hmac;
use openssl::symm::{decrypt_aead, Cipher, Crypter, Mode};
@@ -248,28 +248,4 @@ impl CryptConfig {
Ok(decr_data)
}
-
- pub fn generate_rsa_encoded_key(
- &self,
- rsa: openssl::rsa::Rsa<openssl::pkey::Public>,
- created: i64,
- ) -> Result<Vec<u8>, Error> {
-
- let modified = proxmox::tools::time::epoch_i64();
- let key_config = super::KeyConfig {
- kdf: None,
- created,
- modified,
- data: self.enc_key.to_vec(),
- fingerprint: Some(self.fingerprint()),
- };
- let data = serde_json::to_string(&key_config)?.as_bytes().to_vec();
-
- let mut buffer = vec![0u8; rsa.size() as usize];
- let len = rsa.public_encrypt(&data, &mut buffer, openssl::rsa::Padding::PKCS1)?;
- if len != buffer.len() {
- bail!("got unexpected length from rsa.public_encrypt().");
- }
- Ok(buffer)
- }
}
diff --git a/src/backup/key_derivation.rs b/src/backup/key_derivation.rs
index 046a8c8f..a2aa9469 100644
--- a/src/backup/key_derivation.rs
+++ b/src/backup/key_derivation.rs
@@ -245,3 +245,17 @@ pub fn decrypt_key(
Ok((result, created, fingerprint))
}
+
+pub fn rsa_encrypt_key_config(
+ rsa: openssl::rsa::Rsa<openssl::pkey::Public>,
+ key: &KeyConfig,
+) -> Result<Vec<u8>, Error> {
+ let data = serde_json::to_string(key)?.as_bytes().to_vec();
+
+ let mut buffer = vec![0u8; rsa.size() as usize];
+ let len = rsa.public_encrypt(&data, &mut buffer, openssl::rsa::Padding::PKCS1)?;
+ if len != buffer.len() {
+ bail!("got unexpected length from rsa.public_encrypt().");
+ }
+ Ok(buffer)
+}
diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs
index 36da624e..c40bedc5 100644
--- a/src/bin/proxmox-backup-client.rs
+++ b/src/bin/proxmox-backup-client.rs
@@ -40,6 +40,7 @@ use proxmox_backup::pxar::catalog::*;
use proxmox_backup::backup::{
archive_type,
decrypt_key,
+ rsa_encrypt_key_config,
verify_chunk_size,
ArchiveType,
AsyncReadChunk,
@@ -57,6 +58,7 @@ use proxmox_backup::backup::{
ENCRYPTED_KEY_BLOB_NAME,
FixedChunkStream,
FixedIndexReader,
+ KeyConfig,
IndexFile,
MANIFEST_BLOB_NAME,
Shell,
@@ -914,13 +916,20 @@ async fn create_backup(
let (key, created, fingerprint) = decrypt_key(&key, &key::get_encryption_key_password)?;
println!("Encryption key fingerprint: {}", fingerprint);
- let crypt_config = CryptConfig::new(key)?;
+ let crypt_config = CryptConfig::new(key.clone())?;
match key::find_master_pubkey()? {
Some(ref path) if path.exists() => {
let pem_data = file_get_contents(path)?;
let rsa = openssl::rsa::Rsa::public_key_from_pem(&pem_data)?;
- let enc_key = crypt_config.generate_rsa_encoded_key(rsa, created)?;
+ let key_config = KeyConfig {
+ kdf: None,
+ created,
+ modified: proxmox::tools::time::epoch_i64(),
+ data: key.to_vec(),
+ fingerprint: Some(fingerprint),
+ };
+ let enc_key = rsa_encrypt_key_config(rsa, &key_config)?;
println!("Master key '{:?}'", path);
(Some(Arc::new(crypt_config)), Some(enc_key))
--
2.20.1