From 1f7ff5e66afe8625619fb1665b1d96d0a3da9323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= <midnite@outlook.com>
Date: Mon, 1 Apr 2024 16:02:55 +0800
Subject: [PATCH] =?UTF-8?q?refactor(lib):=E5=88=A0=E9=99=A4=E6=9A=82?=
 =?UTF-8?q?=E6=97=B6=E6=97=A0=E7=94=A8=E7=9A=84errors=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cert_lib/src/errors.rs |  9 ---------
 cert_lib/src/lib.rs    | 23 ++++++++++++++++++++++-
 2 files changed, 22 insertions(+), 10 deletions(-)
 delete mode 100644 cert_lib/src/errors.rs

diff --git a/cert_lib/src/errors.rs b/cert_lib/src/errors.rs
deleted file mode 100644
index af73a78..0000000
--- a/cert_lib/src/errors.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use thiserror::Error;
-
-#[derive(Debug, Error)]
-pub enum CertificateGenerateError {
-    #[error("Error generating RSA key")]
-    X509Error(#[from] openssl::error::ErrorStack),
-    #[error("IO Error")]
-    IOError(#[from] std::io::Error),
-}
diff --git a/cert_lib/src/lib.rs b/cert_lib/src/lib.rs
index 0b212ab..0e3039f 100644
--- a/cert_lib/src/lib.rs
+++ b/cert_lib/src/lib.rs
@@ -13,7 +13,6 @@ use openssl::{
     x509::X509Builder,
 };
 
-pub mod errors;
 mod root_certificate;
 
 /// 生成证书，公钥保存为.pem文件，私钥保存为.key文件
@@ -101,3 +100,25 @@ pub fn calculate_power_euqal_result(cert: X509) -> anyhow::Result<String> {
         result.to_dec_str()?
     ))
 }
+
+/// 从.pem文件中读取X509证书
+///
+/// - `file_path`：证书文件路径
+pub fn load_certificate<P: AsRef<Path>>(file_path: P) -> anyhow::Result<X509> {
+    let file_path = file_path.as_ref();
+    let cert_pem = fs::read(file_path)?;
+    let cert = X509::from_pem(&cert_pem)?;
+    Ok(cert)
+}
+
+/// 从.key文件中读取RSA私钥
+///
+/// - `file_path`：私钥文件路径
+pub fn load_private_key<R: AsRef<Path>>(
+    file_path: R,
+) -> anyhow::Result<PKey<openssl::pkey::Private>> {
+    let file_path = file_path.as_ref();
+    let key_pem = fs::read(file_path)?;
+    let key = PKey::private_key_from_pem(&key_pem)?;
+    Ok(key)
+}