From: Victor Wagner <vitus@wagner.pp.ru>
Date: Tue, 21 Jun 2016 17:30:19 +0000 (+0300)
Subject: Merge branch 'master' of https://github.com/vbwagner/ctypescrypto
X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;ds=inline;h=3d2279c5056b4035cbed9b53749ebf5a2c48a333;hp=-c;p=oss%2Fctypescrypto.git

Merge branch 'master' of https://github.com/vbwagner/ctypescrypto
---

3d2279c5056b4035cbed9b53749ebf5a2c48a333
diff --combined ctypescrypto/x509.py
index ae31abf,a3335fb..2226ed9
--- a/ctypescrypto/x509.py
+++ b/ctypescrypto/x509.py
@@@ -8,7 -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
@@@ -587,7 -587,7 +587,7 @@@ 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')
 +            raise TypeError('StackOfX509 can contain only X509 objects')
          p = libcrypto.sk_value(self.ptr, index)
          libcrypto.sk_set(self.ptr, index, libcrypto.X509_dup(value.cert))
          libcrypto.X509_free(p)
@@@ -606,10 -606,9 +606,10 @@@
          if not self.need_free:
              raise ValueError("Stack is read-only")
          if not isinstance(value, X509):
 -            raise TypeError('StackOfX508 can contain only X509 objects')
 +            raise TypeError('StackOfX509 can contain only X509 objects')
          libcrypto.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, )
@@@ -623,52 -622,36 +623,59 @@@ libcrypto.PEM_write_bio_X509.argtypes 
  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_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)
 +      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,)
  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)
@@@ -681,3 -664,4 +688,4 @@@ libcrypto.sk_pop_free.argtypes = (c_voi
  libcrypto.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)