comparison libpurple/plugins/ssl/ssl-gnutls.c @ 19067:6c0aad79c4c5

- Change the internal structure of activation/expiration times to match the "NSS way", which is already how the libpurple public interface works - Change ssl-gnutls to match the above

19066:b631b409a515

	} else {
		return FALSE;
	}
}

static time_t
x509_activation (PurpleCertificate *crt)
{
	gnutls_x509_crt_t crt_dat;

	g_assert(crt);
	g_assert(crt->scheme == &x509_gnutls);

	crt_dat = X509_GET_GNUTLS_DATA(crt);

	/* TODO: Errorcheck this? */
	return gnutls_x509_crt_get_activation_time(crt_dat);
}

static time_t
x509_expiration (PurpleCertificate *crt)
{
	gnutls_x509_crt_t crt_dat;

	g_assert(crt);
	g_assert(crt->scheme == &x509_gnutls);

	crt_dat = X509_GET_GNUTLS_DATA(crt);

	/* TODO: Errorcheck this? */
	return gnutls_x509_crt_get_expiration_time(crt_dat);
}

/* X.509 certificate operations provided by this plugin */
/* TODO: Flesh this out! */
static PurpleCertificateScheme x509_gnutls = {

	x509_sha1sum,                    /* SHA1 fingerprint */
	NULL,                            /* Unique ID */
	NULL,                            /* Issuer Unique ID */
	x509_common_name,                /* Subject name */
	x509_check_name,                 /* Check subject name */
	x509_activation,                 /* Activation time */
	x509_expiration                  /* Expiration time */
};

static PurpleSslOps ssl_ops =
{
	ssl_gnutls_init,

19067:6c0aad79c4c5

	} else {
		return FALSE;
	}
}

static gboolean
x509_times (PurpleCertificate *crt, time_t *activation, time_t *expiration)
{
	gnutls_x509_crt_t crt_dat;
	/* GnuTLS time functions return this on error */
	const time_t errval = (time_t) (-1);


	g_return_val_if_fail(crt, FALSE);
	g_return_val_if_fail(crt->scheme == &x509_gnutls, FALSE);

	crt_dat = X509_GET_GNUTLS_DATA(crt);

	if (activation) {
		*activation = gnutls_x509_crt_get_activation_time(crt_dat);
	}
	if (expiration) {
		*expiration = gnutls_x509_crt_get_expiration_time(crt_dat);
	}

	if (*activation == errval || *expiration == errval) {
		return FALSE;
	}
	
	return TRUE;
}

/* X.509 certificate operations provided by this plugin */
/* TODO: Flesh this out! */
static PurpleCertificateScheme x509_gnutls = {

	x509_sha1sum,                    /* SHA1 fingerprint */
	NULL,                            /* Unique ID */
	NULL,                            /* Issuer Unique ID */
	x509_common_name,                /* Subject name */
	x509_check_name,                 /* Check subject name */
	x509_times                       /* Activation/Expiration time */
};

static PurpleSslOps ssl_ops =
{
	ssl_gnutls_init,