From 2de98b9b925cc576a84dc2c8b87ac8bcf9630d42 Mon Sep 17 00:00:00 2001
From: El Mau <publico@cuates.net>
Date: Sat, 22 Jan 2022 21:54:31 -0600
Subject: [PATCH] =?UTF-8?q?Verificar=20cancelaci=C3=B3n=20con=20certificad?=
 =?UTF-8?q?os=20en=20CD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/app/controllers/pacs/cfdi_cert.py | 6 +++---
 source/app/controllers/utils.py          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/app/controllers/pacs/cfdi_cert.py b/source/app/controllers/pacs/cfdi_cert.py
index 210ec53..185bca2 100644
--- a/source/app/controllers/pacs/cfdi_cert.py
+++ b/source/app/controllers/pacs/cfdi_cert.py
@@ -31,12 +31,12 @@ class SATCertificate(object):
         self._test()
 
     def _test(self):
-        self._p = self._get_hash()
         key = self._get_key('')
+        self._p = f"{self.rfc}|{self.serial_number}"
         self._key_der = key.private_bytes(
             encoding=serialization.Encoding.DER,
-            format=serialization.PrivateFormat.TraditionalOpenSSL,
-            encryption_algorithm=serialization.NoEncryption()
+            format=serialization.PrivateFormat.PKCS8,
+            encryption_algorithm=serialization.BestAvailableEncryption(self._p.encode())
         )
         return
 
diff --git a/source/app/controllers/utils.py b/source/app/controllers/utils.py
index 9630edd..8259af0 100644
--- a/source/app/controllers/utils.py
+++ b/source/app/controllers/utils.py
@@ -767,7 +767,7 @@ def _cancel_with_cert(invoice, args, auth, certificado):
     pac = PACS[auth['pac']]()
     # ~ info = {'cer': cert.cer_pem, 'key': cert.key_pem, 'pass': '', 'args': args}
     info = {'cer': cert.cer_pem, 'key': cert.key_pem,
-        'key_enc': cert._key_der, 'pass': cert._p.hex(), 'args': args}
+        'key_enc': cert._key_der, 'pass': cert._p, 'args': args}
 
     result = pac.cancel(invoice.xml, info, auth)
     if pac.error: