mirror of
https://github.com/ibm-s390-linux/s390-tools.git
synced 2026-08-05 02:14:52 +00:00
rust: Refactoring and reduce API surface
Prepare pv & pv_core crates to be released on crates.io: * Remove any unused API to stay flexible * Remove utils dependency * Move cli, tmpfile and version utilities to local utils crate * Use the new utilities in the pv tools * Rename Secret into Confidential to avoid confusion of Secret (now Confidential) and AddSecret requests. * Move the uvsecret module out of the request module and change the name to secret. * Cleanup dependencies * Precise and correct minimal dependency versions * Inline `Aes256Key::from_digest` The cleanup ensures that the code also compiles with the dependencies resolved to their minimal versions using: $ cargo +nightly -Z minimal-versions update $ cargo build For more information refer to this blog post: https://users.rust-lang.org/t/psa-please-specify-precise-dependency-versions-in-cargo-toml/71277/8 Signed-off-by: Marc Hartmayer <mhartmay@de.ibm.com> Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
This commit is contained in:
+13
-4
@@ -1,6 +1,8 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
//
|
||||
// Copyright IBM Corp. 2023
|
||||
// Copyright IBM Corp. 2023, 2024
|
||||
|
||||
use crate::secret::UserDataType;
|
||||
|
||||
/// Result type for this crate
|
||||
pub type Result<T, E = Error> = std::result::Result<T, E>;
|
||||
@@ -68,6 +70,15 @@ pub enum Error {
|
||||
)]
|
||||
AsrcbUserDataSgnFail,
|
||||
|
||||
#[error("The provided Host Key Document in '{hkd}' is not in PEM or DER format")]
|
||||
HkdNotPemOrDer {
|
||||
hkd: String,
|
||||
source: openssl::error::ErrorStack,
|
||||
},
|
||||
|
||||
#[error("The provided host key document in {0} contains no certificate!")]
|
||||
NoHkdInFile(String),
|
||||
|
||||
// errors from other crates
|
||||
#[error(transparent)]
|
||||
PvCore(#[from] pv_core::Error),
|
||||
@@ -97,7 +108,7 @@ pub enum HkdVerifyErrorType {
|
||||
#[error("No valid CRL found")]
|
||||
NoCrl,
|
||||
#[error("Host-key document is revoked.")]
|
||||
HdkRevoked,
|
||||
HkdRevoked,
|
||||
#[error("Not enough bits of security. ({0}, {1} expected)")]
|
||||
SecurityBits(u32, u32),
|
||||
#[error("Authority Key Id mismatch")]
|
||||
@@ -126,5 +137,3 @@ macro_rules! bail_hkd_verify {
|
||||
};
|
||||
}
|
||||
pub(crate) use bail_hkd_verify;
|
||||
|
||||
use crate::request::uvsecret::UserDataType;
|
||||
|
||||
Reference in New Issue
Block a user