X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=ctypescrypto%2Fx509.py;h=e2ddea88f508f336f822f43ea9ad5c640e6751e7;hb=85a6cf49ee43a6948d7af79fdc9521360ae4c405;hp=4f086328f2ee143afed0c939c6efbb9d7631be22;hpb=ca6a5055ad8a9ea82e9f42aff3c906903d5e6df7;p=oss%2Fctypescrypto.git

diff --git a/ctypescrypto/x509.py b/ctypescrypto/x509.py
index 4f08632..e2ddea8 100644
--- a/ctypescrypto/x509.py
+++ b/ctypescrypto/x509.py
@@ -154,7 +154,7 @@ class X509Name(object):
 			b=Membio()
 			libcrypto.ASN1_STRING_print_ex(b.bio,s,self.PRINT_FLAG)
 			return unicode(b)
-		elif isinstance(key,int):
+		elif isinstance(key,(int,long)):
 			# Return OID, string tuple
 			entry=libcrypto.X509_NAME_get_entry(self.ptr,key)
 			if entry is None:
@@ -164,12 +164,21 @@ class X509Name(object):
 			b=Membio()
 			libcrypto.ASN1_STRING_print_ex(b.bio,s,self.PRINT_FLAG)
 			return (oid,unicode(b))
+		else:
+			raise TypeError("X509 NAME can be indexed by Oids or integers only")
 
 	def __setitem__(self,key,val):
 		if not self.writable:
 			raise ValueError("Attempt to modify constant X509 object")
 		else:
 			raise NotImplementedError
+	def __delitem__(self,key):
+		if not self.writable:
+			raise ValueError("Attempt to modify constant X509 object")
+		else:
+			raise NotImplementedError
+	def __hash__(self):
+		return libcrypto.X509_NAME_hash(self.ptr)
 
 class _x509_ext(Structure):
 	""" Represens C structure X509_EXTENSION """
@@ -487,11 +496,11 @@ class StackOfX509(object):
 		"""
 		if  ptr is None:
 			self.need_free = True
-			self.ptr=libcrypt.sk_new_null()
+			self.ptr=libcrypto.sk_new_null()
 			if certs is not None:
 				for crt in certs:
 					self.append(crt)
-		elif not certs is None:
+		elif certs is not None:
 				raise ValueError("cannot handle certs an ptr simultaneously")
 		else:
 			self.need_free = disposable
@@ -503,12 +512,15 @@ class StackOfX509(object):
 			raise IndexError
 		p=libcrypto.sk_value(self.ptr,index)
 		return X509(ptr=libcrypto.X509_dup(p))
-	def __putitem__(self,index,value):
+	def __setitem__(self,index,value):
 		if not self.need_free:
 			raise ValueError("Stack is read-only")
 		if index <0 or index>=len(self):
 			raise IndexError
-		p=libcrypto.sk_set(self.ptr,index,libcrypto.X509_dup(value.cert))
+		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))
 		libcrypto.X509_free(p)
 	def __delitem__(self,index):	
 		if not self.need_free:
@@ -523,6 +535,8 @@ class StackOfX509(object):
 	def append(self,value):
 		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))
 libcrypto.i2a_ASN1_INTEGER.argtypes=(c_void_p,c_void_p)
 libcrypto.ASN1_STRING_print_ex.argtypes=(c_void_p,c_void_p,c_long)
@@ -549,3 +563,12 @@ 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.X509V3_EXT_print.argtypes=(c_void_p,POINTER(_x509_ext),c_long,c_int)
+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.X509_dup.restype=c_void_p
+libcrypto.sk_new_null.restype=c_void_p
+libcrypto.X509_dup.argtypes=(c_void_p,)
+libcrypto.X509_NAME_hash.restype=c_long
+libcrypto.X509_NAME_hash.argtypes=(c_void_p,)