Skip to content

Commit 985b0ab

Browse files
authored
Merge branch 'main' into session-mode-example
2 parents f78fcee + 7269495 commit 985b0ab

File tree

3 files changed

+12
-27
lines changed

3 files changed

+12
-27
lines changed

specs/bep-v1.rst

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,14 @@ level protocols providing encryption and authentication.
3535
+-----------------------------+
3636
| Block Exchange Protocol |
3737
|-----------------------------|
38-
| Encryption & Auth (TLS 1.2) |
38+
| Encryption & Auth (TLS 1.3) |
3939
|-----------------------------|
4040
| Reliable Transport |
4141
|-----------------------------|
4242
v ... v
4343

44-
The encryption and authentication layer SHALL use TLS 1.2 or a higher
45-
revision. A strong cipher suite SHALL be used, with "strong cipher
46-
suite" being defined as being without known weaknesses and providing
47-
Perfect Forward Secrecy (PFS). Examples of strong cipher suites are
48-
given at the end of this document. This is not to be taken as an
49-
exhaustive list of allowed cipher suites but represents best practices
50-
at the time of writing.
44+
The encryption and authentication layer SHALL use TLS 1.3 or a higher
45+
revision.
5146

5247
The exact nature of the authentication is up to the application, however
5348
it SHALL be based on the TLS certificate presented at the start of the
@@ -889,20 +884,3 @@ retrieves the data from the folder and transmits Response records (9 through
889884
message (13). Both peers enter idle state after 13. At some later time 14,
890885
the ping timer on device B expires and a Ping message is sent. The same
891886
process occurs for device A at 15.
892-
893-
Examples of Strong Cipher Suites
894-
--------------------------------
895-
896-
====== =========================== ==================================
897-
ID Name Description
898-
====== =========================== ==================================
899-
0x009F DHE-RSA-AES256-GCM-SHA384 TLSv1.2 DH RSA AESGCM(256) AEAD
900-
0x006B DHE-RSA-AES256-SHA256 TLSv1.2 DH RSA AES(256) SHA256
901-
0xC030 ECDHE-RSA-AES256-GCM-SHA384 TLSv1.2 ECDH RSA AESGCM(256) AEAD
902-
0xC028 ECDHE-RSA-AES256-SHA384 TLSv1.2 ECDH RSA AES(256) SHA384
903-
0x009E DHE-RSA-AES128-GCM-SHA256 TLSv1.2 DH RSA AESGCM(128) AEAD
904-
0x0067 DHE-RSA-AES128-SHA256 TLSv1.2 DH RSA AES(128) SHA256
905-
0xC02F ECDHE-RSA-AES128-GCM-SHA256 TLSv1.2 ECDH RSA AESGCM(128) AEAD
906-
0xC027 ECDHE-RSA-AES128-SHA256 TLSv1.2 ECDH RSA AES(128) SHA256
907-
====== =========================== ==================================
908-

users/faq-parts/general.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ The following may be synchronized or not, depending:
3636
- Extended attributes (when enabled)
3737
- POSIX or NFS ACLs (as part of extended attributes)
3838

39+
.. note::
40+
41+
Note that what can be synced often depends on the operating system, file
42+
system, and possibly other factors. For example, even though Syncthing may
43+
try to synchronise symbolic links on Android, this will not succeed, as the
44+
OS does not support them on the user storage.
45+
3946
The following are *not* synchronized;
4047

4148
- Directory modification times (not preserved)

users/profiling.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Once done the profiling will result in a download called something like
4545
keep and send in, without modifying the file name as it tells us information
4646
necessary to interpret it.
4747

48-
Repeat the process twice and keep both files.
48+
Perform the process twice and keep both files.
4949

5050
Capture a heap profile
5151
----------------------
@@ -65,4 +65,4 @@ The profiling will result in a download called something like
6565
keep and send in, without modifying the file name as it tells us information
6666
necessary to interpret it.
6767

68-
Repeat the process twice and keep both files.
68+
Perform the process twice and keep both files.

0 commit comments

Comments
 (0)