r3090 - trunk/libmcrypto/source/gnutls

[mikma at minisip.org]

Author: mikma
Date: 2007-01-06 10:41:59 +0100 (Sat, 06 Jan 2007)
New Revision: 3090

Modified:
   trunk/libmcrypto/source/gnutls/cert.cxx
Log:
* Fix gtls_certificate_chain::control return values.
* Remove debug output.


Modified: trunk/libmcrypto/source/gnutls/cert.cxx
===================================================================
--- trunk/libmcrypto/source/gnutls/cert.cxx	2007-01-04 21:37:21 UTC (rev 3089)
+++ trunk/libmcrypto/source/gnutls/cert.cxx	2007-01-06 09:41:59 UTC (rev 3090)
@@ -353,7 +353,7 @@
 		goto error;
 	}
 
-	if( err = gcry_pk_encrypt( &cipher, data_sexp, m_key ) ){
+	if( (err = gcry_pk_encrypt( &cipher, data_sexp, m_key ) ) ){
 		goto error;
 	}
 
@@ -942,11 +942,9 @@
 // 
 
 gtls_ca_db_item::gtls_ca_db_item(): certs(NULL), num_certs(0){
-	cerr << "gtls_ca_db_item ctor" << endl;
 }
 
 gtls_ca_db_item::~gtls_ca_db_item(){
-	cerr << "gtls_ca_db_item dtor" << endl;
 	if( certs ){
 		delete[] certs;
 		certs = NULL;
@@ -955,11 +953,9 @@
 }
 
 gtls_ca_db::gtls_ca_db(): caList(NULL), caListLength(0){
-	cerr << "gtls_ca_db ctor" << endl;
 }
 
 gtls_ca_db::~gtls_ca_db(){
-	cerr << "gtls_ca_db dtor" << endl;
 	if( caList != NULL ){
 		delete[] caList;
 		caList = NULL;
@@ -1147,7 +1143,9 @@
 // 		return NULL;
 	}
 
+#ifdef DEBUG_OUTPUT
 	cerr << "Loaded " << res << " certificates" << endl;
+#endif
 
 	gtls_ca_db_item * item = new gtls_ca_db_item();
 	item->item = file;
@@ -1189,23 +1187,23 @@
 	gnutls_x509_crt_t* gtls_list = NULL;
 	size_t gtls_list_length = 0;
 
-	cerr << "gtls_certificate_chain::control" << endl;
 	if( !gtls_db ){
 		cerr << "Not gtls CA db" << endl;
-		return 1;
+		return 0;
 	}
 
 // 	lock();
 	gtls_list_length = cert_list.size();
 
 	if( gtls_list_length == 0 ){
+#ifdef DEBUG_OUTPUT
 		cerr << "certificate: Empty list of certificates"
 			"to verify" << endl;
-		return 0;
+#endif
+		// Return success
+		return 1;
 	}
 
-	cerr << "Cert chain length " << gtls_list_length << endl;
-
 	/* Chain of certificates */
 	list< MRef<certificate *> >::iterator i = cert_list.begin();
 
@@ -1221,7 +1219,7 @@
 			delete[] gtls_list;
 			// Not gtls cert
 			cerr << "Not a gtls cert" << endl;
-			return 1;
+			return 0;
 		}
 		
 		gtls_list[j] = cert->get_certificate();
@@ -1231,11 +1229,9 @@
 	if( !gtls_db->getDb( &ca_list, &ca_list_length ) ){
 		delete[] gtls_list;
 		cerr << "No CA db" << endl;
-		return 1;
+		return 0;
 	}
 
-	cerr << "CA db size " << ca_list_length << endl;
-
 	result = gnutls_x509_crt_list_verify( gtls_list, gtls_list_length,
 					      ca_list, ca_list_length,
 // 					      crl_list, crl_list_length,
@@ -1247,9 +1243,11 @@
 
 	if( result < 0 ){
 		cerr << "gnutls_x509_crt_list_verify failed" << endl;
-		return 1;
+		return 0;
 	}
 
+#ifdef DEBUG_OUTPUT
 	cerr << "gnutls_x509_crt_list_verify returns " << verify << endl;
+#endif
 	return verify ? 0 : 1;
 }