Fix certificate import (#217)

* Fix import algorithm * Fix CertificateImportDialog * Change version * Fix mimes --------- Co-authored-by: alex-slobodian <[email protected]>
PeculiarVentures · Oct 30, 2024 · 31218b0 · 31218b0
1 parent 695e317
commit 31218b0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@peculiar/fortify-tools",
   "homepage": "https://tools.fortifyapp.com",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "author": "PeculiarVentures Team",
   "license": "MIT",
   "private": true,

diff --git a/src/components/certificate-import-dialog/styles/index.module.scss b/src/components/certificate-import-dialog/styles/index.module.scss
@@ -121,6 +121,7 @@
 
   .text_area textarea {
     height: 340px;
+    font-family: monospace;
   }
 
   .buttons_group {

diff --git a/src/config/index.ts b/src/config/index.ts
@@ -4,7 +4,7 @@ export const APP_FORTIFY_DOWLOAD_APP_URL = "https://fortifyapp.com";
 // https://www.iana.org/assignments/media-types/media-types.xhtml
 export const APP_CERTIFICATE_ALLOWED_MIMES = {
   "application/pem-certificate-chain": [".pem"],
-  "application/pkix-cert": [".cer"],
+  "application/pkix-cert": [".cer", ".der"],
   "application/x-x509-ca-cert": [".crt"],
   "application/pkcs10": [".csr"],
 };

diff --git a/src/dialogs/certificate-import-dialog/useCertificateImportDialog.tsx b/src/dialogs/certificate-import-dialog/useCertificateImportDialog.tsx
@@ -67,7 +67,10 @@ export function useCertificateImportDialog(
       const cert = await provider.certStorage.importCert(
         certificateType.current === "csr" ? "request" : "x509",
         certificate.current.rawData,
-        certificate.current.signatureAlgorithm,
+        {
+          ...certificate.current.publicKey.algorithm,
+          ...certificate.current.signatureAlgorithm,
+        },
         ["verify"]
       );
 

diff --git a/src/i18n/locales/en/main.json b/src/i18n/locales/en/main.json
@@ -100,7 +100,7 @@
             "invalid-data": "Certificate is invalid. Please check your data and try again."
           }
         },
-        "divider-label": "Or paste certificate in Base64 format below",
+        "divider-label": "Or paste certificate in PEM format below",
         "loading-text": "Importing certificate...",
         "success-message": "Certificate imported.",
         "failure-message": "Failed to import certificate because of error. Please try again."