Working on improving crypto stuff

Author: hakril

ctypes_generation/definitions/winfunc_crypto_wintrust.txt

@@ -319,3 +319,8 @@ BOOL WINAPI CertCompareCertificate(
   _In_ PCERT_INFO pCertId1,
   _In_ PCERT_INFO pCertId2
 );
+
+PCCTL_CONTEXT WINAPI CertEnumCTLsInStore(
+  _In_ HCERTSTORE    hCertStore,
+  _In_ PCCTL_CONTEXT pPrevCtlContext
+);

ctypes_generation/extended_structs/_CRYPTOAPI_BLOB.py

@@ -0,0 +1,11 @@
+class _CRYPTOAPI_BLOB(_CRYPTOAPI_BLOB):
+    @classmethod
+    def from_string(cls, buf):
+        self = cls()
+        self.cbData = len(buf)
+        self.pbData = (BYTE * self.cbData)(*bytearray(buf))
+        return self
+
+    @property
+    def data(self):
+        return bytearray(self.pbData[:self.cbData])

ctypes_generation/generate.py

@@ -16,6 +16,7 @@
 dedent = textwrap.dedent
 
 
+
 TYPE_EQUIVALENCE = [
     # BYTE is defined in ctypes.wintypes as c_byte but who wants
     # BYTE to be signed ? (from MSDN: <typedef unsigned char BYTE;>)
@@ -258,8 +259,6 @@ def generate_doc(self, target_file):
         with open(target_file, "w") as f:
             f.writelines(all_lines)
 
-EXTENDED_STRUCT = ["_GUID", "_RPC_IF_ID"] # TODO: check auto the dir
-
 class StructGenerator(CtypesGenerator):
     PARSER = struct_parser.WinStructParser
     IMPORT_HEADER = dedent ("""
@@ -723,6 +722,10 @@ class DefGenerator(InitialDefGenerator):
 print(SCRIPT_DIR)
 from_here = lambda path: pjoin(SCRIPT_DIR, path)
 
+
+EXTENDED_STRUCT_FILE = glob.glob(pjoin(SCRIPT_DIR, "extended_structs", "*.py"))
+EXTENDED_STRUCT = [os.path.basename(filename)[:-len(".py")] for filename in EXTENDED_STRUCT_FILE]
+
 DEFAULT_INTERFACE_TO_IID = from_here("definitions\\interface_to_iid.txt")
 
 # A partial define without the dependance to ntstatus defintion

docs/source/winstructs_generated.rst

@@ -5480,6 +5480,181 @@ _CRYPTOAPI_BLOB
 
         :class:`BYTE`
 
+CRYPTCATATTRIBUTE_
+''''''''''''''''''
+.. class:: CRYPTCATATTRIBUTE
+
+    Alias for :class:`CRYPTCATATTRIBUTE_`
+
+.. class:: PCRYPTCATATTRIBUTE
+
+    Pointer to :class:`CRYPTCATATTRIBUTE_`
+
+.. class:: CRYPTCATATTRIBUTE_
+
+    .. attribute:: cbStruct
+
+        :class:`DWORD`
+
+
+    .. attribute:: pwszReferenceTag
+
+        :class:`LPWSTR`
+
+
+    .. attribute:: dwAttrTypeAndAction
+
+        :class:`DWORD`
+
+
+    .. attribute:: cbValue
+
+        :class:`DWORD`
+
+
+    .. attribute:: pbValue
+
+        :class:`BYTE`
+
+
+    .. attribute:: dwReserved
+
+        :class:`DWORD`
+
+_CRYPT_ATTRIBUTE_TYPE_VALUE
+'''''''''''''''''''''''''''
+.. class:: CRYPT_ATTRIBUTE_TYPE_VALUE
+
+    Alias for :class:`_CRYPT_ATTRIBUTE_TYPE_VALUE`
+
+.. class:: PCRYPT_ATTRIBUTE_TYPE_VALUE
+
+    Pointer to :class:`_CRYPT_ATTRIBUTE_TYPE_VALUE`
+
+.. class:: _CRYPT_ATTRIBUTE_TYPE_VALUE
+
+    .. attribute:: pszObjId
+
+        :class:`LPSTR`
+
+
+    .. attribute:: Value
+
+        :class:`CRYPT_OBJID_BLOB`
+
+_CRYPT_ALGORITHM_IDENTIFIER
+'''''''''''''''''''''''''''
+.. class:: CRYPT_ALGORITHM_IDENTIFIER
+
+    Alias for :class:`_CRYPT_ALGORITHM_IDENTIFIER`
+
+.. class:: PCRYPT_ALGORITHM_IDENTIFIER
+
+    Pointer to :class:`_CRYPT_ALGORITHM_IDENTIFIER`
+
+.. class:: _CRYPT_ALGORITHM_IDENTIFIER
+
+    .. attribute:: pszObjId
+
+        :class:`LPSTR`
+
+
+    .. attribute:: Parameters
+
+        :class:`CRYPT_OBJID_BLOB`
+
+SIP_INDIRECT_DATA_
+''''''''''''''''''
+.. class:: SIP_INDIRECT_DATA
+
+    Alias for :class:`SIP_INDIRECT_DATA_`
+
+.. class:: PSIP_INDIRECT_DATA
+
+    Pointer to :class:`SIP_INDIRECT_DATA_`
+
+.. class:: SIP_INDIRECT_DATA_
+
+    .. attribute:: Data
+
+        :class:`CRYPT_ATTRIBUTE_TYPE_VALUE`
+
+
+    .. attribute:: DigestAlgorithm
+
+        :class:`CRYPT_ALGORITHM_IDENTIFIER`
+
+
+    .. attribute:: Digest
+
+        :class:`CRYPT_HASH_BLOB`
+
+CRYPTCATMEMBER_
+'''''''''''''''
+.. class:: CRYPTCATMEMBER
+
+    Alias for :class:`CRYPTCATMEMBER_`
+
+.. class:: PCRYPTCATMEMBER
+
+    Pointer to :class:`CRYPTCATMEMBER_`
+
+.. class:: CRYPTCATMEMBER_
+
+    .. attribute:: cbStruct
+
+        :class:`DWORD`
+
+
+    .. attribute:: pwszReferenceTag
+
+        :class:`LPWSTR`
+
+
+    .. attribute:: pwszFileName
+
+        :class:`LPWSTR`
+
+
+    .. attribute:: gSubjectType
+
+        :class:`GUID`
+
+
+    .. attribute:: fdwMemberFlags
+
+        :class:`DWORD`
+
+
+    .. attribute:: pIndirectData
+
+        :class:`SIP_INDIRECT_DATA`
+
+
+    .. attribute:: dwCertVersion
+
+        :class:`DWORD`
+
+
+    .. attribute:: dwReserved
+
+        :class:`DWORD`
+
+
+    .. attribute:: hReserved
+
+        :class:`HANDLE`
+
+
+    .. attribute:: sEncodedIndirectData
+
+        :class:`CRYPT_ATTR_BLOB`
+
+
+    .. attribute:: sEncodedMemberInfo
+
+        :class:`CRYPT_ATTR_BLOB`
+
 WINTRUST_FILE_INFO_
 '''''''''''''''''''
 .. class:: WINTRUST_FILE_INFO
@@ -5610,27 +5785,6 @@ _CRYPT_ATTRIBUTES
 
         :class:`PCRYPT_ATTRIBUTE`
 
-_CRYPT_ALGORITHM_IDENTIFIER
-'''''''''''''''''''''''''''
-.. class:: CRYPT_ALGORITHM_IDENTIFIER
-
-    Alias for :class:`_CRYPT_ALGORITHM_IDENTIFIER`
-
-.. class:: PCRYPT_ALGORITHM_IDENTIFIER
-
-    Pointer to :class:`_CRYPT_ALGORITHM_IDENTIFIER`
-
-.. class:: _CRYPT_ALGORITHM_IDENTIFIER
-
-    .. attribute:: pszObjId
-
-        :class:`LPSTR`
-
-
-    .. attribute:: Parameters
-
-        :class:`CRYPT_OBJID_BLOB`
-
 _CMSG_SIGNER_INFO
 '''''''''''''''''
 .. class:: CMSG_SIGNER_INFO