From 9073275c16590ec036eb7933f53d265f17da9d59 Mon Sep 17 00:00:00 2001
From: Dmytro Donskov <donskovdmitriyv@gmail.com>
Date: Thu, 27 Jun 2024 17:51:19 +0300
Subject: [PATCH] fix(webcomponents): fix downloading wrong DER format (#146)

---
 .../src/crypto/pkcs10_certificate_request.ts     |  2 +-
 .../src/crypto/x509_attribute_certificate.ts     |  2 +-
 .../webcomponents/src/crypto/x509_certificate.ts |  2 +-
 packages/webcomponents/src/crypto/x509_crl.ts    |  2 +-
 packages/webcomponents/src/utils/download.ts     | 16 ++++++++--------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/webcomponents/src/crypto/pkcs10_certificate_request.ts b/packages/webcomponents/src/crypto/pkcs10_certificate_request.ts
index d81b853a..3b1959f7 100644
--- a/packages/webcomponents/src/crypto/pkcs10_certificate_request.ts
+++ b/packages/webcomponents/src/crypto/pkcs10_certificate_request.ts
@@ -162,7 +162,7 @@ export class Pkcs10CertificateRequest extends AsnData<CertificationRequest> {
 
   public downloadAsDER(name?: string) {
     Download.csr.asDER(
-      this.toString('hex'),
+      this.raw,
       name || this.commonName,
     );
   }
diff --git a/packages/webcomponents/src/crypto/x509_attribute_certificate.ts b/packages/webcomponents/src/crypto/x509_attribute_certificate.ts
index 8ddef0ae..66764302 100644
--- a/packages/webcomponents/src/crypto/x509_attribute_certificate.ts
+++ b/packages/webcomponents/src/crypto/x509_attribute_certificate.ts
@@ -146,7 +146,7 @@ export class X509AttributeCertificate extends AsnData<AttributeCertificate> {
 
   public downloadAsDER(name?: string) {
     Download.attrCert.asDER(
-      this.toString('hex'),
+      this.raw,
       name || this.commonName,
     );
   }
diff --git a/packages/webcomponents/src/crypto/x509_certificate.ts b/packages/webcomponents/src/crypto/x509_certificate.ts
index 1e0beb8c..45823217 100644
--- a/packages/webcomponents/src/crypto/x509_certificate.ts
+++ b/packages/webcomponents/src/crypto/x509_certificate.ts
@@ -258,7 +258,7 @@ export class X509Certificate extends AsnData<Certificate> {
 
   public downloadAsDER(name?: string) {
     Download.cert.asDER(
-      this.toString('hex'),
+      this.raw,
       name || this.commonName,
     );
   }
diff --git a/packages/webcomponents/src/crypto/x509_crl.ts b/packages/webcomponents/src/crypto/x509_crl.ts
index f326b27b..f66baca4 100644
--- a/packages/webcomponents/src/crypto/x509_crl.ts
+++ b/packages/webcomponents/src/crypto/x509_crl.ts
@@ -138,7 +138,7 @@ export class X509Crl extends AsnData<CertificateList> {
 
   public downloadAsDER(name?: string) {
     Download.crl.asDER(
-      this.toString('hex'),
+      this.raw,
       name || this.commonName,
     );
   }
diff --git a/packages/webcomponents/src/utils/download.ts b/packages/webcomponents/src/utils/download.ts
index 45f40b84..14fbb6db 100644
--- a/packages/webcomponents/src/utils/download.ts
+++ b/packages/webcomponents/src/utils/download.ts
@@ -21,9 +21,9 @@ export class Download {
       );
     },
 
-    asDER: (hex: string, name: string) => {
+    asDER: (raw: ArrayBuffer, name: string) => {
       downloadFromBuffer(
-        Convert.FromString(hex),
+        raw,
         name,
         'cer',
         'application/pkix-cert',
@@ -41,9 +41,9 @@ export class Download {
       );
     },
 
-    asDER: (hex: string, name: string) => {
+    asDER: (raw: ArrayBuffer, name: string) => {
       downloadFromBuffer(
-        Convert.FromString(hex),
+        raw,
         name,
         'cer',
         'application/pkix-attr-cert',
@@ -61,9 +61,9 @@ export class Download {
       );
     },
 
-    asDER: (hex: string, name: string) => {
+    asDER: (raw: ArrayBuffer, name: string) => {
       downloadFromBuffer(
-        Convert.FromString(hex),
+        raw,
         name,
         'csr',
         'application/pkcs10',
@@ -81,9 +81,9 @@ export class Download {
       );
     },
 
-    asDER: (hex: string, name: string) => {
+    asDER: (raw: ArrayBuffer, name: string) => {
       downloadFromBuffer(
-        Convert.FromString(hex),
+        raw,
         name,
         'crl',
         'application/pkix-crl',