diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index 88779ff5..96aaddf6 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -1,4 +1,7 @@ -

Encrypted Instant Messengers

+

+ + Encrypted Instant Messengers +

@@ -9,42 +12,45 @@

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 +

Centralized messengers are those where every participant is on the same server or network of servers controlled by the same organization.

Advantages

Disadvantages

{% - include cardv2.html - title="Signal" - image="/assets/img/svg/3rd-party/signal.svg" - 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" + include cardv2.html + title="Signal" + image="/assets/img/svg/3rd-party/signal.svg" + 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" %} {% @@ -68,27 +74,30 @@ %}
-

Federated

+

+ + 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.

+

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

- +

Advantages

+ -

Disadvantages

- +

Disadvantages

+
{% @@ -111,40 +120,44 @@ %}
-

Worth Mentioning

+

Worth Mentioning

+ -

Peer to Peer (P2P)

+

+ + 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.

+

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.

-

Advantages

+

Advantages

+ + +

Disadvantages

+
{% @@ -176,30 +189,8 @@ ios="https://itunes.apple.com/app/ring-a-gnu-package/id1306951055?mt=8" %} -{% - include cardv2.html - title="Tox" - image="/assets/img/svg/3rd-party/tox.svg" - image-dark="/assets/img/svg/3rd-party/tox-dark.svg" - 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" - windows="https://tox.chat/download.html#oses" - mac="https://tox.chat/download.html#oses" - linux="https://tox.chat/download.html#oses" - freebsd="https://tox.chat/download.html#oses" - openbsd="http://openports.se/search.php?so=tox" - netbsd="http://pkgsrc.se/search.php?so=tox" - fdroid="https://tox.chat/download.html#oses" - googleplay="https://tox.chat/download.html#oses" - ios="https://tox.chat/download.html#oses" -%} -

Worth Mentioning

diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html index 21cd9064..6c19fdd0 100644 --- a/_includes/sections/teamchat.html +++ b/_includes/sections/teamchat.html @@ -1,7 +1,11 @@ -

Team Chat Platforms

+

+ + + Team Chat Platforms +

{% diff --git a/assets/img/svg/3rd-party/bitmessage.svg b/assets/img/svg/3rd-party/bitmessage.svg deleted file mode 100644 index b4dd6814..00000000 --- a/assets/img/svg/3rd-party/bitmessage.svg +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/assets/img/svg/3rd-party/tox-dark.svg b/assets/img/svg/3rd-party/tox-dark.svg deleted file mode 100644 index 13f26fe2..00000000 --- a/assets/img/svg/3rd-party/tox-dark.svg +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/assets/img/svg/3rd-party/tox.svg b/assets/img/svg/3rd-party/tox.svg deleted file mode 100644 index 18433b42..00000000 --- a/assets/img/svg/3rd-party/tox.svg +++ /dev/null @@ -1,2 +0,0 @@ - -