update pem

goyalankit · Jun 2, 2023 · 6cab6d1 · 6cab6d1
1 parent 962f520
commit 6cab6d1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,7 +36,7 @@ k8s-openapi = { version = "0.14.0", features = ["v1_23"] }
 lazy_static = "^1.4"
 os_pipe = "^1.0"
 p12 = "^0.6"
-pem = "^1.0"
+pem = "^2.0"
 regex = "^1.3"
 rustls = { version = "0.20", features = ["dangerous_configuration"] }
 rustyline = "^10.0"

diff --git a/src/k8s.rs b/src/k8s.rs
@@ -110,26 +110,26 @@ fn pkcs1to8(pkcs1: &[u8]) -> Vec<u8> {
 fn get_id_from_pkcs12(key: Vec<u8>, cert: Vec<u8>) -> Result<Identity, ClickError> {
     let key_pem = pem::parse(key)?;
 
-    let key_der = match key_pem.tag.as_str() {
+    let key_der = match key_pem.tag() {
         "RSA PRIVATE KEY" => {
             // pkcs#1 pem, need to convert to pkcs#8
-            pkcs1to8(&key_pem.contents)
+            pkcs1to8(key_pem.contents())
         }
         "PRIVATE KEY" => {
             // pkcs#8 pem, use as is
-            key_pem.contents
+            key_pem.contents().to_vec()
         }
         _ => {
             return Err(ClickError::ConfigFileError(format!(
                 "Unknown key type: {}",
-                key_pem.tag
+                key_pem.tag()
             )));
         }
     };
 
     let cert_pem = pem::parse(cert)?;
 
-    let pfx = p12::PFX::new(&cert_pem.contents, &key_der, None, "", "")
+    let pfx = p12::PFX::new(cert_pem.contents(), &key_der, None, "", "")
         .ok_or_else(|| ClickError::ConfigFileError("Could not parse pkcs12 data".to_string()))?;
 
     let pkcs12der = pfx.to_der();