comparison libpurple/certificate.c @ 27925:93950851db8c

propagate from branch 'im.pidgin.pidgin' (head 586bc4a7e754d6b26a95c0d69dd5f2967c7a98a1) to branch 'im.pidgin.pidgin.yaz' (head a133b1255cf2e94684f42e5e8fd335d6db91c053)

25003:86ba0d87c04b

	/* Next, check that the certificate chain is valid */
	if ( ! purple_certificate_check_signature_chain(chain) ) {
		/* TODO: Tell the user where the chain broke? */
		/* TODO: This error will hopelessly confuse any
		   non-elite user. */
		gchar *secondary;

		secondary = g_strdup_printf(_("The certificate chain presented"
					      " for %s is not valid."),
					    vrq->subject_name);

		/* TODO: Make this error either block the ensuing SSL
		   connection error until the user dismisses this one, or
		   stifle it. */
		purple_notify_error(NULL, /* TODO: Probably wrong. */
				    _("SSL Certificate Error"),
				    _("Invalid certificate chain"),
				    secondary );
		g_free(secondary);

		/* Okay, we're done here */
		purple_certificate_verify_complete(vrq,
						   PURPLE_CERTIFICATE_INVALID);
		return;

		   that, too. */
		/* TODO: Also mention the CA involved. While I could do this
		   now, a full DN is a little much with which to assault the
		   user's poor, leaky eyes. */
		/* TODO: This error message makes my eyes cross, and I wrote it */
		gchar * secondary =
			g_strdup_printf(_("The certificate chain presented by "
					  "%s does not have a valid digital "
					  "signature from the Certificate "
					  "Authority from which it claims to "
					  "have a signature."),
					vrq->subject_name);
		
		purple_notify_error(NULL, /* TODO: Probably wrong */
				    _("SSL Certificate Error"),
				    _("Invalid certificate authority"
				      " signature"),
				    secondary);
		g_free(secondary);

		/* Signal "bad cert" */
		purple_certificate_verify_complete(vrq,
						   PURPLE_CERTIFICATE_INVALID);
		return;
	} /* if (CA signature not good) */

27925:93950851db8c

	/* Next, check that the certificate chain is valid */
	if ( ! purple_certificate_check_signature_chain(chain) ) {
		/* TODO: Tell the user where the chain broke? */
		/* TODO: This error will hopelessly confuse any
		   non-elite user. */
		if(purple_prefs_get_bool("/purple/network/warn_cert")) {
			gchar *secondary;

			secondary = g_strdup_printf(_("The certificate chain presented"
						      " for %s is not valid."),
						    vrq->subject_name);

			/* TODO: Make this error either block the ensuing SSL
			   connection error until the user dismisses this one, or
			   stifle it. */
			purple_notify_error(NULL, /* TODO: Probably wrong. */
					    _("SSL Certificate Error"),
					    _("Invalid certificate chain"),
					    secondary );
			g_free(secondary);
		}

		/* Okay, we're done here */
		purple_certificate_verify_complete(vrq,
						   PURPLE_CERTIFICATE_INVALID);
		return;

		   that, too. */
		/* TODO: Also mention the CA involved. While I could do this
		   now, a full DN is a little much with which to assault the
		   user's poor, leaky eyes. */
		/* TODO: This error message makes my eyes cross, and I wrote it */
		if(purple_prefs_get_bool("/purple/network/warn_cert")) {

			gchar * secondary =
				g_strdup_printf(_("The certificate chain presented by "
						  "%s does not have a valid digital "
						  "signature from the Certificate "
						  "Authority from which it claims to "
						  "have a signature."),
						vrq->subject_name);
		
			purple_notify_error(NULL, /* TODO: Probably wrong */
					    _("SSL Certificate Error"),
					    _("Invalid certificate authority"
					      " signature"),
					    secondary);
			g_free(secondary);
		}
		/* Signal "bad cert" */
		purple_certificate_verify_complete(vrq,
						   PURPLE_CERTIFICATE_INVALID);
		return;
	} /* if (CA signature not good) */