summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libpurple/certificate.c30
-rw-r--r--libpurple/certificate.h15
-rw-r--r--libpurple/plugins/ssl/ssl-gnutls.c8
-rw-r--r--libpurple/plugins/ssl/ssl-nss.c7
4 files changed, 53 insertions, 7 deletions
diff --git a/libpurple/certificate.c b/libpurple/certificate.c
index b3d4878b32..0e2267e78f 100644
--- a/libpurple/certificate.c
+++ b/libpurple/certificate.c
@@ -580,7 +580,12 @@ PurpleCertificateVerifier x509_singleuse = {
"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 @@ static PurpleCertificatePool x509_ca = {
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 @@ static PurpleCertificatePool x509_tls_peers = {
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 @@ static PurpleCertificateVerifier x509_tls_cached = {
"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
+
};
/****************************************************************************/
diff --git a/libpurple/certificate.h b/libpurple/certificate.h
index 88b56a9f9e..1c1b0442dd 100644
--- a/libpurple/certificate.h
+++ b/libpurple/certificate.h
@@ -123,6 +123,11 @@ struct _PurpleCertificatePool
/** 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 @@ struct _PurpleCertificateScheme
/** 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 @@ struct _PurpleCertificateVerifier
* @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
diff --git a/libpurple/plugins/ssl/ssl-gnutls.c b/libpurple/plugins/ssl/ssl-gnutls.c
index e028ce3278..4f7dd1ea28 100644
--- a/libpurple/plugins/ssl/ssl-gnutls.c
+++ b/libpurple/plugins/ssl/ssl-gnutls.c
@@ -911,7 +911,13 @@ static PurpleCertificateScheme x509_gnutls = {
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 =
diff --git a/libpurple/plugins/ssl/ssl-nss.c b/libpurple/plugins/ssl/ssl-nss.c
index e23577167f..26e79cd60e 100644
--- a/libpurple/plugins/ssl/ssl-nss.c
+++ b/libpurple/plugins/ssl/ssl-nss.c
@@ -641,7 +641,12 @@ static PurpleCertificateScheme x509_nss = {
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 =