diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html
index 2d97b00d..b0c8370b 100644
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@@ -1,64 +1,264 @@
-
If you are currently using an Instant Messenger like Telegram, LINE, Viber, WhatsApp, or plain SMS you should pick an alternative here.
+
+
We only recommend instant messenger programs or apps that support end-to-end encryption (E2EE). When E2EE is used, all transmissions (messages, voice, video, etc.) are encrypted before they are sent from your device. E2EE protects both the authenticity and confidentiality of the transmission as they pass through any part of the network (servers, etc.).
+
+
All the client programs/apps we chose are free and open-source software unless otherwise mentioned. This to ensure that the code can be independently verified by experts now and in the future.
+
+
We have described the three main types of messaging programs that exist: Centralized, Federated and Peer-to-Peer (P2P), with the advantages and disadvantages of each.
+
+
Centralized
+
+
Centralized messengers are those where every participant is on the same server or network of servers controlled by the same organization.
+
+
Advantages
+
+ - New features and changes can be implemented more quickly.
+ - Easier to get started with and to find contacts.
+
+
+
Disadvantages
+
+
+
If you are currently using an Instant Messenger like Telegram, LINE, Viber, WhatsApp, or plain SMS, you should pick an alternative here.
-{% include cardv2.html
-title="Signal"
-image="/assets/img/tools/Signal.png"
-description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
-All communications are end-to-end encrypted. Signal is free and open source."
-labels="success:VoIP"
-website="https://signal.org/"
-forum="https://forum.privacytools.io/t/discussion-signal/664"
-github="https://github.com/signalapp"
-windows="https://signal.org/download/"
-mac="https://signal.org/download/"
-linux="https://signal.org/download/"
-googleplay="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms"
-android="https://signal.org/android/apk/#apk-danger"
-ios="https://apps.apple.com/us/app/signal-private-messenger/id874139669"
+{%
+ include cardv2.html
+ title="Signal"
+ image="/assets/img/tools/Signal.png"
+ description='Signal is a mobile app developed by Signal Messenger LLC. The app provides instant messaging, as well as voice and video calling. All communications are E2EE unless you choose to send as SMS. Its protocol has also been
indepedently audited (PDF)'
+ labels="warning:
Requires phone number:Signal requires your phone number as an personal identifier which means anyone you communicate with will see it.|success:VoIP"
+ website="https://signal.org/"
+ forum="https://forum.privacytools.io/t/discussion-signal/664"
+ github="https://github.com/signalapp"
+ windows="https://signal.org/download/"
+ mac="https://signal.org/download/"
+ linux="https://signal.org/download/"
+ googleplay="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms"
+ android="https://signal.org/android/apk/#apk-danger"
+ ios="https://apps.apple.com/app/signal-private-messenger/id874139669"
%}
-
Complete Comparison
-
+{%
+ include cardv2.html
+ title="Keybase"
+ image="/assets/img/tools/keybase.png"
+ description='Keybase provides a hosted team chat with E2EE. Its protocol has also been
indepedently audited (PDF). Keybase can help you prove you own social media accounts though the use of cryptographic signing of "
identity proofs".'
+ labels="warning:
Warning:This software relies on a closed-source central server."
+ website="https://keybase.io/"
+ forum="https://forum.privacytools.io/t/discussion-keybase/1224"
+ tor="http://keybase5wmilwokqirssclfnsqrjdsi7jdir5wy7y7iu3tanwmtp6oid.onion/"
+ github="https://github.com/Keybase"
+ windows="https://keybase.io/docs/the_app/install_windows"
+ mac="https://keybase.io/docs/the_app/install_macos"
+ linux="https://keybase.io/docs/the_app/install_linux"
+ freebsd="https://www.freshports.org/security/keybase/"
+ googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage"
+ ios="https://apps.apple.com/app/keybase-crypto-for-everyone/id1044461770"
+ firefox="https://addons.mozilla.org/firefox/addon/keybase-for-firefox/"
+ chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj"
+%}
+
+
+
Federated
+
+
Federated messengers use multiple, independent servers that are able to talk to each other (email is one example of a federated service). Federation allows system administrators to control their own server and still be a part of the larger communications network.
+
+
Advantages
+
+ - Allows for greater control over your own data when running your own server.
+ - Allows you to choose who to trust your data with by choosing between multiple "public" servers.
+ - Often allows for third party clients which can provide a more native, customized, or accessible experience.
+ - Generally a less juicy target for governments wanting backdoor access to everything as the trust is decentralized. The server may be hosted independently from the organization developing the software.
+ - Server software can be verified that it matches public source code, assuming you have access to the server or you trust the person who does (eg family member)
+ - Third-party developers can contribute code and add new features, instead of waiting for a private development team to do so.
+
+
+
Disadvantages
+
+ - Adding new features is more complex, because these features need to be standardized and tested to ensure they work with all servers on the network.
+ - Some metadata may be available. Information like "who is talking to whom," but not actual message content if E2EE is used.
+ - Federated servers generally require trusting your server's administrator. They may be a hobbyist or otherwise not a "security professional," and may not serve standard documents like a privacy policy or terms of service detailing how your data is utilized.
+ - Server administrators sometimes choose to block other servers, which are a source of unmoderated abuse or break general rules of accepted behavior. This will hinder your ability to communicate with users on those servers.
+
+
+
+{%
+ include cardv2.html
+ title="Matrix"
+ image="/assets/img/tools/Matrix.png"
+ image-dark="/assets/img/tools/Matrix-dark.png"
+ description='
Matrix is an open-source project that publishes the
Matrix open standard for secure, decentralized, real-time communication.
+
Riot.im is the popular reference client produced by the Matrix.org team. It offers optional E2EE for 1:1 and group conversations that
must be turned on by the user. (This can be done by clicking on the toggle switch which is accessed by clicking the room name or user name of the chat → Security & Privacy → Encrypted). In the future it will be
on by default.'
+ website="https://about.riot.im/"
+ forum="https://forum.privacytools.io/t/discussion-riot-im/665/"
+ github="https://github.com/vector-im/riot-web/"
+ windows="https://riot.im/download/desktop/"
+ mac="https://riot.im/download/desktop/"
+ linux="https://riot.im/download/desktop/"
+ fdroid="https://f-droid.org/repository/browse/?fdid=im.vector.alpha"
+ googleplay="https://play.google.com/store/apps/details?id=im.vector.app"
+ ios="https://itunes.apple.com/app/vector.im/id1083446067"
+ web="https://riot.im/app/"
+%}
+
+
+
Worth Mentioning
+
+
+ - Other Matrix clients, that may however be less feature complete than Riot.im.
+ - XMPP (Extensible Messaging and Presence Protocol) is an open-source communications protocol that began development in 1999. Since then, XMPP has been extended by the publishing of XEPs (XMPP Extension Protocols). OMEMO is the most popular XEP (XMPP extension) for E2EE. Unlike Matrix, clients are only developed by the community and not by the foundation itself. Warning
+
+ - Kontalk is a community-driven instant messaging network based on XMPP.
+
+
+
+
Peer to Peer (P2P)
+
+
Peer-to-Peer instant messengers connect directly to each other without requiring third-party servers. Clients (peers) usually find each other through the use of a distributed computing network. Examples of this include DHT (distributed hash table) (used with technologies like torrents and IPFS, for example), or Ethereum's Whisper protocol (used with some newer DApps). Another approach is proximity based networks, where a connection is established over WiFi or Bluetooth (for example, Briar or the Scuttlebutt social networking protocol). Once a peer has found a route to its contact via any of these methods, a direct connection between them is made.
-
Worth Mentioning
+
Advantages
+
+ - Minimal information is exposed to third parties.
+ - Modern P2P platforms implement end-to-end encryption by default. There are no servers that could potentially intercept and decrypt your transmissions, unlike centralized and federated models.
+
-
- - Briar - An ultra-secure peer-to-peer instant messenger that connects to contacts via Direct Wi-Fi, Bluetooth, or Tor over the internet, keeping its users protected from surveillance and censorship.
- - Riot - An open-source, federated messenger that utilizes the Matrix protocol. This application is primarily recommended as a large group/team chat solution. While Riot has the ability to perform 1-on-1 communications we believe there are better solutions for direct communications.
- - RetroShare - An end-to-end encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P.
- - XMPP - Federated instant messaging protocol with OMEMO, OTR, or OpenPGP end-to-end encryption:
-
- - Conversations (Android) - An open-source Jabber/XMPP client for Android 4.4+ smartphones. OMEMO
- - Gajim (FreeBSD, Linux, Windows) - An open-source fully featured XMPP client. OMEMO
- - Monal (iOS, MacOS) - An XMPP client in active development. OMEMO VoIP
- - Other OMEMO-ready clients.
-
- - Kontalk - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.
- - Keybase - Warning End-to-end encrypted messaging with social verification.
- - Status - Experimental A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.
- - Tox - Experimental A free and open-source, peer-to-peer, encrypted instant messaging, and video calling software. VoIP
- - Jami (formerly Ring/SFLphone) - Gives you full control over your communications and an unmatched level of privacy. Jami has text messaging, video and audio calls, file transfer, and video conferencing. VoIP
-
+
Disadvantages
+
+ - Reduced feature set:
+
+ - Messages can only be sent when both peers are online, however, your client may store messages locally to wait for the contact to return online.
+ - Generally increases battery usage on mobile devices, because the client must stay connected to the distributed network to learn about who is online.
+
+ - Your IP address and that of the contacts you're communicating with may be visible if you do not use the software in conjunction with a self contained network, such as Tor or I2P. Many countries have some form of mass surveillance and/or metadata retention.
+
+
+{%
+ include cardv2.html
+ title="Briar"
+ image="/assets/img/tools/Briar.png"
+ description="Encrypted instant messenger that connects to contacts via Wi-Fi, Bluetooth, or Tor over the internet to synchronize messages. Technology such as this has proven to be useful when Internet availability is an issue, such as in times of crisis."
+ website="https://briarproject.org"
+ forum="https://forum.privacytools.io/t/discussion-briar/2114"
+ gitlab="https://code.briarproject.org/briar/briar"
+ fdroid="https://f-droid.org/packages/org.briarproject.briar.android/"
+ googleplay="https://play.google.com/store/apps/details?id=org.briarproject.briar.android"
+%}
-
Related Information
+{%
+ include cardv2.html
+ title="Jami"
+ image="/assets/img/tools/Jami.png"
+ description="Encrypted instant messaging and video calling software. Uses
TLS 1.3 for encryption."
+ labels="success:VoIP"
+ website="https://jami.net/"
+ forum="https://forum.privacytools.io/t/discussion-jami/2116"
+ gitlab="https://git.jami.net/savoirfairelinux"
+ windows="https://jami.net/download-jami-windows"
+ mac="https://jami.net/download-jami-macos"
+ linux="https://jami.net/download-jami-linux"
+ fdroid="https://f-droid.org/packages/cx.ring/"
+ googleplay="https://play.google.com/store/apps/details?id=cx.ring"
+ ios="https://itunes.apple.com/app/ring-a-gnu-package/id1306951055?mt=8"
+%}
-
+{%
+ include cardv2.html
+ title="qTox"
+ image="/assets/img/tools/qtox.png"
+ image-dark="/assets/img/tools/qtox-dark.png"
+ description='Encrypted instant messaging and video calling software. Uses its
own encryption protocol that has not yet been officially audited by cryptographers.'
+ labels="warning:
Experimental:Encryption has not been audited by professional cryptographers|success:VoIP"
+ website="https://tox.chat"
+ forum="https://forum.privacytools.io/t/discussion-tox/2115"
+ github="https://github.com/qTox/qTox"
+ windows="https://tox.chat/download.html#oses"
+ mac="https://tox.chat/download.html#oses"
+ linux="https://tox.chat/download.html#oses"
+%}
+
+
+
Worth Mentioning
+
+
+
+
+
+
+
+ Recent news about breaking E2EE on centralized instant messengers
+
+
+
November 2019
+
+
+
October 2019
+
+
+
August 2019
+
+
+
July 2019
+
+
+
May 2019
+
+
+
January 2019
+
+
+
December 2018
+
+
+
Complete Comparison
+
+
+
Independent security audits
+
+
diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html
index 064778e6..e6fae9e8 100644
--- a/_includes/sections/teamchat.html
+++ b/_includes/sections/teamchat.html
@@ -6,10 +6,11 @@
{%
include cardv2.html
- title="Riot.im (Matrix)"
- image="/assets/img/tools/Riot.png"
- description="Riot.im is a federated free-software messaging application based on the
Matrix protocol, a recent open protocol for real-time communication offering optional E2E encryption. It also has bridging functionality, allowing you to connect to other chat protocols such as IRC or Telegram."
- labels="warning:
Experimental E2EE:The end-to-end encryption is currently in beta, and the mobile client states 'End-to-end encryption is in beta and may not be reliable. You should not yet trust it to secure data.'"
+ title="Matrix"
+ image="/assets/img/tools/Matrix.png"
+ image-dark="/assets/img/tools/Matrix-dark.png"
+ description='
Matrix is an open-source project that publishes the
Matrix open standard for secure, decentralized, real-time communication.
+
Riot.im is the popular reference client produced by the Matrix.org team. It offers optional E2EE for 1:1 and group conversations that
must be turned on by the user. (This can be done by clicking on the toggle switch which is accessed by clicking the room name or user name of the chat → Security & Privacy → Encrypted). In the future it will be
on by default.'
website="https://about.riot.im/"
forum="https://forum.privacytools.io/t/discussion-riot-im/665/"
github="https://github.com/vector-im/riot-web/"
@@ -18,7 +19,7 @@
linux="https://riot.im/download/desktop/"
fdroid="https://f-droid.org/repository/browse/?fdid=im.vector.alpha"
googleplay="https://play.google.com/store/apps/details?id=im.vector.app"
- ios="https://itunes.apple.com/us/app/vector.im/id1083446067"
+ ios="https://itunes.apple.com/app/vector.im/id1083446067"
web="https://riot.im/app/"
%}
@@ -43,8 +44,8 @@
include cardv2.html
title="Keybase"
image="/assets/img/tools/keybase.png"
- description='Keybase provides a hosted team chat with end-to-end encryption. It has also been
independently audited (PDF).'
- labels="warning:
Warning:The server side of Keybase runs on proprietary code and is centralized."
+ description='Keybase provides a hosted team chat with E2EE. Its protocol has also been
indepedently audited (PDF). Keybase can help you prove you own social media accounts though the use of cryptographic signing of "
identity proofs".'
+ labels="warning:
Warning:This software relies on a closed-source central server."
website="https://keybase.io/"
forum="https://forum.privacytools.io/t/discussion-keybase/1224"
tor="http://keybase5wmilwokqirssclfnsqrjdsi7jdir5wy7y7iu3tanwmtp6oid.onion/"
@@ -53,8 +54,8 @@
mac="https://keybase.io/docs/the_app/install_macos"
linux="https://keybase.io/docs/the_app/install_linux"
freebsd="https://www.freshports.org/security/keybase/"
- googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage&hl=en_US"
- ios="https://keybase.io/_/download/keybase-for-ios"
- firefox="https://addons.mozilla.org/en-US/firefox/addon/keybase-for-firefox/"
+ googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage"
+ ios="https://apps.apple.com/app/keybase-crypto-for-everyone/id1044461770"
+ firefox="https://addons.mozilla.org/firefox/addon/keybase-for-firefox/"
chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj"
%}
diff --git a/assets/img/tools/Briar.png b/assets/img/tools/Briar.png
new file mode 100644
index 00000000..09d73c26
Binary files /dev/null and b/assets/img/tools/Briar.png differ
diff --git a/assets/img/tools/Jami.png b/assets/img/tools/Jami.png
new file mode 100644
index 00000000..fafb8b59
Binary files /dev/null and b/assets/img/tools/Jami.png differ
diff --git a/assets/img/tools/Matrix-dark.png b/assets/img/tools/Matrix-dark.png
new file mode 100644
index 00000000..11f0922c
Binary files /dev/null and b/assets/img/tools/Matrix-dark.png differ
diff --git a/assets/img/tools/Matrix.png b/assets/img/tools/Matrix.png
new file mode 100644
index 00000000..d72cf25e
Binary files /dev/null and b/assets/img/tools/Matrix.png differ
diff --git a/assets/img/tools/XMPP-dark.png b/assets/img/tools/XMPP-dark.png
new file mode 100644
index 00000000..3d02606a
Binary files /dev/null and b/assets/img/tools/XMPP-dark.png differ
diff --git a/assets/img/tools/XMPP.png b/assets/img/tools/XMPP.png
new file mode 100644
index 00000000..62ad65fb
Binary files /dev/null and b/assets/img/tools/XMPP.png differ
diff --git a/assets/img/tools/qtox-dark.png b/assets/img/tools/qtox-dark.png
new file mode 100644
index 00000000..a62590d8
Binary files /dev/null and b/assets/img/tools/qtox-dark.png differ
diff --git a/assets/img/tools/qtox.png b/assets/img/tools/qtox.png
new file mode 100644
index 00000000..97559fe9
Binary files /dev/null and b/assets/img/tools/qtox.png differ