From 4a1833fea7f0c06a66c2ed407500a289387096c9 Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Sat, 7 Sep 2019 05:12:11 -0700
Subject: [PATCH] Update File Encryption Software page to cardv2 (#1191)

* Update File Encryption Tools page to cardv2

* Add forum links

* Update GnuPG link
---
 _includes/sections/file-encryption.html | 56 ++++++++++++++-----------
 source_code.md                          |  3 +-
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/_includes/sections/file-encryption.html b/_includes/sections/file-encryption.html
index c0fbb4b1..aa99e83b 100644
--- a/_includes/sections/file-encryption.html
+++ b/_includes/sections/file-encryption.html
@@ -4,39 +4,44 @@
   <strong>If you are currently not using encryption software for your hard disk, emails or file archives, you should pick an encryption software here.</strong>
 </div>
 
-<div class="row mb-2">
-
-  {% include card.html color="success"
+{%
+  include cardv2.html
   title="VeraCrypt - Disk Encryption"
   image="/assets/img/tools/VeraCrypt.png"
-  url="https://veracrypt.fr/"
-  footer="OS: Windows, macOS, Linux."
-  description="VeraCrypt is a source-available freeware utility used for on-the-fly encryption. It can create a virtual encrypted disk within a file or encrypt a partition
-  or the entire storage device with pre-boot authentication. VeraCrypt is a fork of the discontinued TrueCrypt project. It was initially released on June 22, 2013. According to its developers, security improvements have been implemented and issues
-  raised by the initial TrueCrypt code audit have been addressed."
-  %}
+  description="<strong>VeraCrypt</strong> is a source-available freeware utility used for on-the-fly encryption. It can create a virtual encrypted disk within a file or encrypt a partition or the entire storage device with pre-boot authentication. VeraCrypt is a fork of the discontinued TrueCrypt project. It was initially released on June 22, 2013. According to its developers, security improvements have been implemented and issues raised by the initial TrueCrypt code audit have been addressed."
+  website="https://veracrypt.fr/"
+  forum="https://forum.privacytools.io/t/discussion-veracrypt-file-encryption/1532"
+  git="https://www.veracrypt.fr/code/"
+  windows="https://www.veracrypt.fr/en/Downloads.html"
+  linux="https://www.veracrypt.fr/en/Downloads.html"
+  mac="https://www.veracrypt.fr/en/Downloads.html"
+%}
 
-  {% include card.html color="primary"
+{%
+  include cardv2.html
   title="GNU Privacy Guard - Email Encryption"
   image="/assets/img/tools/GnuPG.png"
-  url="https://gpgtools.org/"
-  footer="OS: Windows, macOS, Linux, Android, BSD."
-  description="GnuPG is a GPL Licensed alternative to the PGP suite of cryptographic software. GnuPG is compliant with RFC 4880, which is the current IETF standards track specification
-  of OpenPGP. Current versions of PGP (and Veridis' Filecrypt) are interoperable with GnuPG and other OpenPGP-compliant systems. GnuPG is a part of the Free Software Foundation's GNU software project, and has received major funding from the German
-  government. <a href=\"https://gpgtools.org/\">GPGTools for macOS</a>."
-  %}
+  description="<strong>GnuPG</strong> is a GPL Licensed alternative to the PGP suite of cryptographic software. GnuPG is compliant with RFC 4880, which is the current IETF standards track specification of OpenPGP. Current versions of PGP (and Veridis' Filecrypt) are interoperable with GnuPG and other OpenPGP-compliant systems. GnuPG is a part of the Free Software Foundation's GNU software project, and has received major funding from the German government."
+  website="https://gnupg.org/"
+  forum="https://forum.privacytools.io/t/discussion-gnupg-file-encryption/1533"
+  git="https://gnupg.org/download/git.html"
+  windows="https://gnupg.org/download/index.html"
+  linux="https://gnupg.org/download/index.html"
+  mac="https://gnupg.org/download/index.html"
+  android="https://gnupg.org/download/index.html"
+%}
 
-  {% include card.html color="warning"
+{%
+  include cardv2.html
   title="PeaZip - File Archive Encryption"
   image="/assets/img/tools/PeaZip.png"
-  url="http://www.peazip.org/"
-  footer="OS: Windows, Linux, BSD."
-  description="PeaZip is a free and open-source file manager and file archiver made by Giorgio Tani. It supports its native PEA archive format (featuring compression, multi volume
-  split and flexible authenticated encryption and integrity check schemes) and other mainstream formats, with special focus on handling open formats. It supports 181 file extensions (as of version 5.5.1).</p>
-  <p><strong>macOS alternative:</strong> <a href=\"https://www.keka.io/\">Keka</a> is a free file archiver."
-  %}
-
-</div>
+  description="<strong>PeaZip</strong> is a free and open-source file manager and file archiver made by Giorgio Tani. It supports its native PEA archive format (featuring compression, multi volume split and flexible authenticated encryption and integrity check schemes) and other mainstream formats, with special focus on handling open formats. It supports 180+ archive formats."
+  website="http://www.peazip.org"
+  forum="https://forum.privacytools.io/t/discussion-peazip-file-encryption/1534"
+  source="https://sourceforge.net/projects/peazip/files/"
+  windows="https://www.peazip.org/"
+  linux="https://www.peazip.org/"
+%}
 
 <h3>Worth Mentioning</h3>
 
@@ -45,4 +50,5 @@
   <li><a href="https://diskcryptor.net/">DiskCryptor</a> - A full disk and partition encryption system for Windows including the ability to encrypt the partition and disk on which the OS is installed.</li>
   <li><a href="https://gitlab.com/cryptsetup/cryptsetup/">Linux Unified Key Setup (LUKS)</a> - A full disk encryption system for Linux using dm-crypt as the disk encryption backend. Included by default in Ubuntu. Available for Windows and Linux.</li>
   <li><a href="https://hat.sh/">Hat.sh</a> - A cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</a></li>
+  <li><a href="https://www.keka.io/">Keka</a> - A macOS-only, open-source file archiver with the ability to encrypt files.</li>
 </ul>
diff --git a/source_code.md b/source_code.md
index 692c1173..75d44aac 100644
--- a/source_code.md
+++ b/source_code.md
@@ -218,7 +218,6 @@ GNU Privacy Guard: https://github.com/gpg/gnupg
 
 PeaZip: https://github.com/giorgiotani/PeaZip/
 
-
 Worth Mentioning:
 - Cryptomator: https://github.com/cryptomator/cryptomator
 
@@ -228,6 +227,8 @@ Worth Mentioning:
 
 - Hat.sh: https://github.com/sh-dv/hat.sh
 
+- Keka: https://www.keka.io/
+
 ## Self-contained Networks
  TorBrowser: https://gitweb.torproject.org/tor.git