summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Fröhlich <bernhard@cacert.org>2019-07-26 22:58:36 +0200
committerBernhard Fröhlich <bernhard@cacert.org>2019-07-26 22:58:36 +0200
commita866d3f5379b144ac5c0ee05757db335f179f758 (patch)
treeb38b6311b6a004989cad1a6ac014cd0d4e406c76
parenta3a2566577cb3400472a8274ccaeb9163f88efee (diff)
parent799266bcfe58fc4da30a5c534827466c4f5d9c2a (diff)
downloadcacert-devel-a866d3f5379b144ac5c0ee05757db335f179f758.tar.gz
cacert-devel-a866d3f5379b144ac5c0ee05757db335f179f758.tar.xz
cacert-devel-a866d3f5379b144ac5c0ee05757db335f179f758.zip
Merge remote-tracking branch 'github/bug-775' into test-1442
-rwxr-xr-xCommModule/client.pl2
-rw-r--r--includes/general.php1
-rw-r--r--pages/index/feed.rss1
3 files changed, 3 insertions, 1 deletions
diff --git a/CommModule/client.pl b/CommModule/client.pl
index b18055f..a1dd789 100755
--- a/CommModule/client.pl
+++ b/CommModule/client.pl
@@ -832,7 +832,7 @@ sub HandleCerts($$)
SysLog "SAN: --$SAN--\n" if($debug);
SysLog "memid: $row{'memid'}\n" if($debug);
- my $days=$org?($server?(365*2):365):calculateDays($row{"memid"});
+ my $days=$org?730:calculateDays($row{"memid"});
my $md_id = 0;
$md_id = 1 if( $row{'md'} eq "md5");
diff --git a/includes/general.php b/includes/general.php
index 7901226..5231c88 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -614,6 +614,7 @@
$fp_opt = array(
'ssl' => array(
'verify_peer' => false, // Opportunistic Encryption
+ 'verify_peer_name' => false, // Opportunistic Encryption
)
);
$fp_ctx = stream_context_create($fp_opt);
diff --git a/pages/index/feed.rss b/pages/index/feed.rss
index 7a8890f..fe81399 100644
--- a/pages/index/feed.rss
+++ b/pages/index/feed.rss
@@ -15,6 +15,7 @@
Merged in children are bug-1442.
Additional changes:
+ 2019-07-26: Merged in bug-775 (2 years lifetime for all org certificates)
2019-05-14: Merged in post-installation changes in preparation of a follow-up
2019-03-31: Another change in bug-1305: removed sub-header
2019-03-31: Once more the changes of bug-1305 have been merged in