From 906b4ec5baf255db7dc8ca0bfe5603e83b7735fd Mon Sep 17 00:00:00 2001
From: Pete Scopes <peter.scopes@gmail.com>
Date: Tue, 1 Dec 2020 15:16:44 +0000
Subject: [PATCH] Cryptography 3.x pkcs12 (#4792)

---
 .../hazmat/primitives/serialization/pkcs12.pyi      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/third_party/2and3/cryptography/hazmat/primitives/serialization/pkcs12.pyi b/third_party/2and3/cryptography/hazmat/primitives/serialization/pkcs12.pyi
index 745f05251..101eb26fe 100644
--- a/third_party/2and3/cryptography/hazmat/primitives/serialization/pkcs12.pyi
+++ b/third_party/2and3/cryptography/hazmat/primitives/serialization/pkcs12.pyi
@@ -1,7 +1,18 @@
-from typing import Any, List, Optional, Tuple
+from typing import Any, List, Optional, Tuple, Union
 
+from cryptography.hazmat.primitives.asymmetric.dsa import DSAPrivateKeyWithSerialization
+from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurvePrivateKeyWithSerialization
+from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKeyWithSerialization
+from cryptography.hazmat.primitives.serialization import KeySerializationEncryption
 from cryptography.x509 import Certificate
 
 def load_key_and_certificates(
     data: bytes, password: Optional[bytes], backend: Optional[Any] = ...
 ) -> Tuple[Optional[Any], Optional[Certificate], List[Certificate]]: ...
+def serialize_key_and_certificates(
+    name: bytes,
+    key: Union[RSAPrivateKeyWithSerialization, EllipticCurvePrivateKeyWithSerialization, DSAPrivateKeyWithSerialization],
+    cert: Optional[Certificate],
+    cas: Optional[List[Certificate]],
+    enc: KeySerializationEncryption,
+) -> bytes: ...