changeset 19648:450f4a3c4c0f

- Add purple_reserved fields to various structures.
author William Ehlhardt <williamehlhardt@gmail.com>
date Wed, 05 Sep 2007 01:12:44 +0000
parents 33ccac7fd32b
children c6f1f9971c4a 21e67147f9f0
files libpurple/certificate.c libpurple/certificate.h libpurple/plugins/ssl/ssl-gnutls.c libpurple/plugins/ssl/ssl-nss.c
diffstat 4 files changed, 53 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/certificate.c	Tue Sep 04 21:55:59 2007 +0000
+++ b/libpurple/certificate.c	Wed Sep 05 01:12:44 2007 +0000
@@ -580,7 +580,12 @@
 	"x509",                         /* Scheme name */
 	"singleuse",                    /* Verifier name */
 	x509_singleuse_start_verify,    /* start_verification function */
-	x509_singleuse_destroy_request  /* Request cleanup operation */
+	x509_singleuse_destroy_request, /* Request cleanup operation */
+
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 
@@ -872,7 +877,13 @@
 	x509_ca_get_cert,             /* Cert retriever */
 	x509_ca_put_cert,             /* Cert writer */
 	x509_ca_delete_cert,          /* Cert remover */
-	x509_ca_get_idlist            /* idlist retriever */
+	x509_ca_get_idlist,           /* idlist retriever */
+
+	NULL,
+	NULL,
+	NULL,
+	NULL
+
 };
 
 
@@ -1034,7 +1045,12 @@
 	x509_tls_peers_get_cert,      /* Cert retriever */
 	x509_tls_peers_put_cert,      /* Cert writer */
 	x509_tls_peers_delete_cert,   /* Cert remover */
-	x509_tls_peers_get_idlist     /* idlist retriever */
+	x509_tls_peers_get_idlist,    /* idlist retriever */
+
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 
@@ -1459,7 +1475,13 @@
 	"x509",                         /* Scheme name */
 	"tls_cached",                   /* Verifier name */
 	x509_tls_cached_start_verify,   /* Verification begin */
-	x509_tls_cached_destroy_request /* Request cleanup */
+	x509_tls_cached_destroy_request,/* Request cleanup */
+
+	NULL,
+	NULL,
+	NULL,
+	NULL
+
 };
 
 /****************************************************************************/
--- a/libpurple/certificate.h	Tue Sep 04 21:55:59 2007 +0000
+++ b/libpurple/certificate.h	Wed Sep 05 01:12:44 2007 +0000
@@ -123,6 +123,11 @@
 
 	/** Returns a list of IDs stored in the pool */
 	GList * (* get_idlist)(void);
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 /** A certificate type
@@ -241,7 +246,10 @@
 	/** Retrieve the certificate activation/expiration times */
 	gboolean (* get_times)(PurpleCertificate *crt, time_t *activation, time_t *expiration);
 	
-	/* TODO: Fill out this structure */
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 /** A set of operations used to provide logic for verifying a Certificate's
@@ -286,6 +294,11 @@
 	 * @param vrq       Request to destroy
 	 */
 	void (* destroy_request)(PurpleCertificateVerificationRequest *vrq);
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 /** Structure for a single certificate request
--- a/libpurple/plugins/ssl/ssl-gnutls.c	Tue Sep 04 21:55:59 2007 +0000
+++ b/libpurple/plugins/ssl/ssl-gnutls.c	Wed Sep 05 01:12:44 2007 +0000
@@ -911,7 +911,13 @@
 	x509_issuer_dn,                  /* Issuer Unique ID */
 	x509_common_name,                /* Subject name */
 	x509_check_name,                 /* Check subject name */
-	x509_times                       /* Activation/Expiration time */
+	x509_times,                      /* Activation/Expiration time */
+
+	NULL,
+	NULL,
+	NULL,
+	NULL
+
 };
 
 static PurpleSslOps ssl_ops =
--- a/libpurple/plugins/ssl/ssl-nss.c	Tue Sep 04 21:55:59 2007 +0000
+++ b/libpurple/plugins/ssl/ssl-nss.c	Wed Sep 05 01:12:44 2007 +0000
@@ -641,7 +641,12 @@
 	NULL,                            /* Issuer Unique ID */
 	x509_common_name,                /* Subject name */
 	x509_check_name,                 /* Check subject name */
-	x509_times                       /* Activation/Expiration time */
+	x509_times,                      /* Activation/Expiration time */
+
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurpleSslOps ssl_ops =