D49075.id151237.diff
No OneTemporary
Actions

Size

753 B

Referenced Files

None

Subscribers

None

D49075.id151237.diff
View Options

	diff --git a/secure/caroot/MAca-bundle.pl b/secure/caroot/MAca-bundle.pl
	--- a/secure/caroot/MAca-bundle.pl
	+++ b/secure/caroot/MAca-bundle.pl
	@@ -161,15 +161,9 @@

	if (/^CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL/)
	{
	- my $distrust_after = graboct($ifh);
	- my $time_now = timenow();
	- if ($time_now >= $distrust_after) { $distrust = 1; }
	- if ($debug) {
	- printf STDERR "line $.: $cka_label ser #%d: distrust after %s, now: %s -> distrust $distrust\n", $serial, $distrust_after, timenow();
	- }
	- if ($distrust) {
	- return undef;
	- }
	+ # We can ignore soft distrust because Mozilla will soon remove this CA
	+ # from their truststore.
	+ graboct($ifh);
	}
	}
	return ($serial, $cka_label, $certdata);