X-Git-Url: https://www.wagner.pp.ru/gitweb/?a=blobdiff_plain;f=ctypescrypto%2Fx509.py;h=91364c4746ce805f8f07da4d30a39485cbdfb28d;hb=876630b04080b68d724e22066d374ce25efd8a97;hp=b018f782b90f6f56edd6ef3ab7c271796ffcf67e;hpb=b3da41f8c31a637c77f1b1f2a4f031fb3ec72226;p=oss%2Fctypescrypto.git diff --git a/ctypescrypto/x509.py b/ctypescrypto/x509.py index b018f78..91364c4 100644 --- a/ctypescrypto/x509.py +++ b/ctypescrypto/x509.py @@ -8,7 +8,7 @@ such as CMS, OCSP and timestamps. -from ctypes import c_void_p, c_long, c_int, POINTER, c_char_p, Structure, cast +from ctypes import c_void_p, c_long, c_ulong, c_int, POINTER, c_char_p, Structure, cast from ctypescrypto.bio import Membio from ctypescrypto.pkey import PKey from ctypescrypto.oid import Oid @@ -45,11 +45,11 @@ if hasattr(libcrypto,"X509_get_version"): _X509_get_version.restype = c_long _X509_get_version.argtypes = (c_void_p,) - _X509_get_notBefore=libcrypto.X509_get_notBefore + _X509_get_notBefore=libcrypto.X509_getm_notBefore _X509_get_notBefore.restype = c_void_p _X509_get_notBefore.argtypes = (c_void_p,) - _X509_get_notAfter=libcrypto.X509_get_notAfter + _X509_get_notAfter=libcrypto.X509_getm_notAfter _X509_get_notAfter.restype = c_void_p _X509_get_notAfter.argtypes = (c_void_p,) else: @@ -101,6 +101,22 @@ else: def _X509_get_notAfter(ptr): return cast(ptr, _px509)[0].cert_info[0].validity[0].notAfter +if hasattr(libcrypto,'sk_num'): + sk_num = libcrypto.sk_num + sk_set = libcrypto.sk_set + sk_value = libcrypto.sk_value + sk_delete = libcrypto.sk_delete + sk_new_null = libcrypto.sk_new_null + sk_pop_free = libcrypto.sk_pop_free + sk_push = libcrypto.sk_push +else: + sk_num = libcrypto.OPENSSL_sk_num + sk_set = libcrypto.OPENSSL_sk_set + sk_value = libcrypto.OPENSSL_sk_value + sk_delete = libcrypto.OPENSSL_sk_delete + sk_new_null = libcrypto.OPENSSL_sk_new_null + sk_pop_free = libcrypto.OPENSSL_sk_pop_free + sk_push = libcrypto.OPENSSL_sk_push class X509Error(LibCryptoError): """ Exception, generated when some openssl function fail @@ -565,7 +581,7 @@ class StackOfX509(object): self.need_free = False if ptr is None: self.need_free = True - self.ptr = libcrypto.sk_new_null() + self.ptr = sk_new_null() if certs is not None: for crt in certs: self.append(crt) @@ -575,11 +591,11 @@ class StackOfX509(object): self.need_free = disposable self.ptr = ptr def __len__(self): - return libcrypto.sk_num(self.ptr) + return sk_num(self.ptr) def __getitem__(self, index): if index < 0 or index >= len(self): raise IndexError - p = libcrypto.sk_value(self.ptr, index) + p = sk_value(self.ptr, index) return X509(ptr=libcrypto.X509_dup(p)) def __setitem__(self, index, value): if not self.need_free: @@ -587,28 +603,29 @@ class StackOfX509(object): if index < 0 or index >= len(self): raise IndexError if not isinstance(value, X509): - raise TypeError('StackOfX508 can contain only X509 objects') - p = libcrypto.sk_value(self.ptr, index) - libcrypto.sk_set(self.ptr, index, libcrypto.X509_dup(value.cert)) + raise TypeError('StackOfX509 can contain only X509 objects') + p = sk_value(self.ptr, index) + sk_set(self.ptr, index, libcrypto.X509_dup(value.cert)) libcrypto.X509_free(p) def __delitem__(self, index): if not self.need_free: raise ValueError("Stack is read-only") if index < 0 or index >= len(self): raise IndexError - p = libcrypto.sk_delete(self.ptr, index) + p = sk_delete(self.ptr, index) libcrypto.X509_free(p) def __del__(self): if self.need_free: - libcrypto.sk_pop_free(self.ptr, libcrypto.X509_free) + sk_pop_free(self.ptr, libcrypto.X509_free) def append(self, value): """ Adds certificate to stack """ if not self.need_free: raise ValueError("Stack is read-only") if not isinstance(value, X509): - raise TypeError('StackOfX508 can contain only X509 objects') - libcrypto.sk_push(self.ptr, libcrypto.X509_dup(value.cert)) + raise TypeError('StackOfX509 can contain only X509 objects') + sk_push(self.ptr, libcrypto.X509_dup(value.cert)) +libcrypto.d2i_X509_bio.argtypes = (c_void_p,POINTER(c_void_p)) libcrypto.X509_free.argtypes = (c_void_p,) libcrypto.X509_dup.restype = c_void_p libcrypto.X509_dup.argtypes = (c_void_p, ) @@ -622,38 +639,71 @@ libcrypto.PEM_write_bio_X509.argtypes = (c_void_p, c_void_p) libcrypto.ASN1_TIME_print.argtypes = (c_void_p, c_void_p) libcrypto.ASN1_INTEGER_get.argtypes = (c_void_p, ) libcrypto.ASN1_INTEGER_get.restype = c_long +libcrypto.X509_check_ca.argtypes = (c_void_p, ) libcrypto.X509_get_serialNumber.argtypes = (c_void_p, ) libcrypto.X509_get_serialNumber.restype = c_void_p +libcrypto.X509_get_subject_name.argtypes = (c_void_p, ) +libcrypto.X509_get_subject_name.restype = c_void_p +libcrypto.X509_get_issuer_name.argtypes = (c_void_p, ) +libcrypto.X509_get_issuer_name.restype = c_void_p libcrypto.X509_NAME_ENTRY_get_object.restype = c_void_p libcrypto.X509_NAME_ENTRY_get_object.argtypes = (c_void_p, ) +libcrypto.X509_NAME_ENTRY_get_data.restype = c_void_p +libcrypto.X509_NAME_ENTRY_get_data.argtypes = (c_void_p, ) libcrypto.OBJ_obj2nid.argtypes = (c_void_p, ) libcrypto.X509_NAME_get_entry.restype = c_void_p libcrypto.X509_NAME_get_entry.argtypes = (c_void_p, c_int) libcrypto.X509_STORE_new.restype = c_void_p libcrypto.X509_STORE_add_lookup.restype = c_void_p libcrypto.X509_STORE_add_lookup.argtypes = (c_void_p, c_void_p) +libcrypto.X509_STORE_add_cert.argtypes = (c_void_p, c_void_p) +libcrypto.X509_STORE_CTX_new.restype = c_void_p +libcrypto.X509_STORE_CTX_free.argtypes = (c_void_p,) +libcrypto.X509_STORE_CTX_init.argtypes = (c_void_p, c_void_p, c_void_p, + c_void_p) +libcrypto.X509_STORE_set_depth.argtypes = (c_void_p, c_int) +libcrypto.X509_STORE_set_flags.argtypes = (c_void_p, c_ulong) +libcrypto.X509_STORE_set_purpose.argtypes = (c_void_p, c_int) libcrypto.X509_LOOKUP_file.restype = c_void_p libcrypto.X509_LOOKUP_hash_dir.restype = c_void_p libcrypto.X509_LOOKUP_ctrl.restype = c_int libcrypto.X509_LOOKUP_ctrl.argtypes = (c_void_p, c_int, c_char_p, c_long, POINTER(c_char_p)) +libcrypto.X509_EXTENSION_free.argtypes = (c_void_p, ) libcrypto.X509_EXTENSION_dup.argtypes = (c_void_p, ) libcrypto.X509_EXTENSION_dup.restype = POINTER(_x509_ext) libcrypto.X509V3_EXT_print.argtypes = (c_void_p, POINTER(_x509_ext), c_long, c_int) libcrypto.X509_get_ext.restype = c_void_p libcrypto.X509_get_ext.argtypes = (c_void_p, c_int) +libcrypto.X509_get_ext_by_critical.argtypes = (c_void_p, c_int, c_int) +libcrypto.X509_get_ext_by_NID.argtypes = (c_void_p, c_int, c_int) +libcrypto.X509_get_ext_count.argtypes = (c_void_p, ) +libcrypto.X509_get_pubkey.restype = c_void_p +libcrypto.X509_get_pubkey.argtypes = (c_void_p, ) libcrypto.X509V3_EXT_print.argtypes = (c_void_p, POINTER(_x509_ext), c_long, - c_int) -libcrypto.sk_num.restupe = c_int -libcrypto.sk_num.argtypes= (c_void_p,) -libcrypto.sk_set.argtypes = (c_void_p, c_int, c_void_p) -libcrypto.sk_set.restype = c_void_p -libcrypto.sk_value.argtypes = (c_void_p, c_int) -libcrypto.sk_value.restype = c_void_p -libcrypto.sk_delete.argtypes = (c_void_p, c_int) -libcrypto.sk_new_null.restype = c_void_p -libcrypto.sk_pop_free.argtypes = (c_void_p, c_void_p) -libcrypto.sk_push.argtypes = (c_void_p, c_void_p) + c_int) +libcrypto.X509_LOOKUP_file.restype = c_void_p +libcrypto.X509_LOOKUP_hash_dir.restype = c_void_p +libcrypto.X509_NAME_cmp.argtypes = (c_void_p, c_void_p) +libcrypto.X509_NAME_entry_count.argtypes = (c_void_p,) +libcrypto.X509_NAME_free.argtypes = (c_void_p,) +libcrypto.X509_NAME_new.restype = c_void_p +libcrypto.X509_NAME_print_ex.argtypes = (c_void_p, c_void_p, c_int, c_ulong) +libcrypto.X509_PURPOSE_get_by_sname.argtypes=(c_char_p,) +libcrypto.X509_verify.argtypes = (c_void_p, c_void_p) +libcrypto.X509_verify_cert.argtypes = (c_void_p,) +sk_num.restype = c_int +sk_num.argtypes= (c_void_p,) +sk_set.argtypes = (c_void_p, c_int, c_void_p) +sk_set.restype = c_void_p +sk_value.argtypes = (c_void_p, c_int) +sk_value.restype = c_void_p +sk_delete.argtypes = (c_void_p, c_int) +sk_delete.restype = c_void_p +sk_new_null.restype = c_void_p +sk_pop_free.argtypes = (c_void_p, c_void_p) +sk_push.argtypes = (c_void_p, c_void_p) libcrypto.X509_NAME_hash.restype = c_long libcrypto.X509_NAME_hash.argtypes = (c_void_p, ) +libcrypto.X509_NAME_get_index_by_NID.argtypes = (c_void_p, c_int, c_int)