summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard "Ted" Fröhlich <ted@convey.de>2021-08-08 15:14:35 +0200
committerBernhard "Ted" Fröhlich <ted@convey.de>2021-08-08 15:14:35 +0200
commit3311e58c474883481269a1aaa27488b10cf42326 (patch)
tree90d95e184c1d5cda67aa7641acd7e6de1dc5f412
parentcaf34173ad0e6e004082eb38440a87ef0022d9ce (diff)
parentb5f7c60573e5da9bd49c0b7e6dad90c635e6017f (diff)
downloadcacert-devel-3311e58c474883481269a1aaa27488b10cf42326.tar.gz
cacert-devel-3311e58c474883481269a1aaa27488b10cf42326.tar.xz
cacert-devel-3311e58c474883481269a1aaa27488b10cf42326.zip
Merge remote-tracking branch 'origin/bug-1473' into test-1442test-1442
-rwxr-xr-xCommModule/server.pl4
-rw-r--r--pages/index/feed.rss1
2 files changed, 4 insertions, 1 deletions
diff --git a/CommModule/server.pl b/CommModule/server.pl
index 3fd77e6..7e0e1e8 100755
--- a/CommModule/server.pl
+++ b/CommModule/server.pl
@@ -26,6 +26,8 @@ my $serialport="/dev/ttyUSB0";
my $CPSUrl="http://www.cacert.org/cps.php";
+my $GPGCertDigestAlgo="SHA256";
+
my $OCSPUrl="http://ocsp.cacert.org/";
my $gpgbin="/usr/bin/gpg";
@@ -688,7 +690,7 @@ sub SignOpenPGP
$ENV{'LANG'}="";
- my $line="$gpgbin --no-tty --default-key $gpgID --homedir $homedir --default-cert-expire $days"."d --ask-cert-expire --cert-policy-url $CPSUrl --command-fd 0 --status-fd 1 --logger-fd 2 --sign-key $keyid ";
+ my $line="$gpgbin --no-tty --default-key $gpgID --homedir $homedir --default-cert-expire $days"."d --ask-cert-expire --cert-policy-url $CPSUrl --command-fd 0 --cert-digest-algo $GPGCertDigestAlgo --status-fd 1 --logger-fd 2 --sign-key $keyid ";
SysLog($line."\n");
my $pid = open3($stdin,$stdout,$stderr,$line);
diff --git a/pages/index/feed.rss b/pages/index/feed.rss
index c33bc5e..a3cc15d 100644
--- a/pages/index/feed.rss
+++ b/pages/index/feed.rss
@@ -15,6 +15,7 @@
Merged in children are bug-1442.
Additional changes:
+ 2021-08-08: Merged in bug-1473 (PGP keys should be signed with SHA256)
2021-08-07: Merged in bug-1533 (update hashes in CAP forms)
2019-09-26: Merged in bug-1423 (remove link to Open Architecture Netword)
2019-09-21: Merged in bug-1440 (change link to data protection policy)