Граф коммитов

41 Коммитов

Автор SHA1 Сообщение Дата
Roeland Jago Douma 7f00299639
Merge pull request #55 from nextcloud/rullzer-patch-1
Check the server certificate
2021-05-14 13:28:23 +02:00
Roeland Jago Douma e7e210ee65 Check the server certificate 2021-05-14 13:29:05 +02:00
Tobias Kaminsky ab7dc4dba8
Merge pull request #52 from nextcloud/iv
ivDelimiter is not encoded
2020-07-14 07:23:22 +02:00
tobiasKaminsky 51a1a6d1b3
ivDelimiter is not encoded 2020-07-09 09:47:57 +02:00
Roeland Jago Douma 876e089c4d
Merge pull request #51 from EdGeraghty/patch-2
Fix a couple of typos in UUID-like description
2020-07-04 08:59:31 +02:00
Roeland Jago Douma 68a112ff1f
Merge pull request #50 from EdGeraghty/patch-1
Fix word order for readability
2020-06-22 16:28:20 +02:00
Ed Geraghty 2a81ce9fa6
Fix a couple of typos in UUID-like description
Signed-off-by: Ed Geraghty <ed@geraghty.london>
2020-06-17 19:38:03 +01:00
Ed Geraghty dc22a86729
Fix word order for readabiliity
Signed-off-by: Ed Geraghty <ed@geraghty.london>
2020-06-17 19:30:36 +01:00
Tobias Kaminsky c6ca91f290
Merge pull request #48 from nextcloud/e2e-token
token -> e2e-token
2020-05-12 16:07:44 +02:00
tobiasKaminsky 57be3034bf
token -> e2e-token 2020-04-09 10:55:06 +02:00
Roeland Jago Douma f7075c5af0
Merge pull request #27 from kwisatz/patch-1
Update RFC.md
2020-03-13 15:00:21 +01:00
Tobias Kaminsky 27d55d0fe3
Merge pull request #31 from procilon/master
salt is not a constant and should not be
2019-01-25 13:20:38 +01:00
Max Fichtelmann 195f21548e salt is not a constant and should not be 2018-12-06 16:06:54 +01:00
David Raison 8c46814608
Update RFC.md
Fixed some of the wording in the `Update metadata file` section.
2018-11-12 11:21:46 +01:00
Tobias Kaminsky 69311c5b24
Merge pull request #26 from nextcloud/mnemonic-everywhere
mnemonic also in keychain of other devices
2018-10-22 14:48:34 +02:00
Jos Poortvliet 50875f9d89
Merge pull request #4 from nextcloud/also_new_iv
Explain file create/update/download in a bit more detail
2018-10-15 21:39:51 +02:00
Jos Poortvliet 3a01ce890e
Merge branch 'master' into also_new_iv 2018-10-15 21:38:58 +02:00
Jos Poortvliet ef882d8875
Merge pull request #3 from nextcloud/openssl_psuedo
Add some psuedocode to make it more clear what is going on
2018-10-15 21:35:55 +02:00
Jos Poortvliet 2c53805dec
mnemonic also in keychain of other devices
add that the mnemonic is stored in the keychain of other devices so it can be displayed to the user if he/she needs it.

Added the 'with spaces' part as well...
2018-10-14 20:57:21 +02:00
Roeland Jago Douma d01de3fdc5
Merge pull request #15 from nextcloud/encryptedFilename
Clarify random file name
2018-02-13 09:42:06 +01:00
Tobias Kaminsky 6946f8eabe
Clarify random file name 2018-02-10 08:03:45 +01:00
Roeland Jago Douma 5288b4d5eb
Merge pull request #12 from nextcloud/tobiasKaminsky-patch-1
Clarify mnemonic
2017-12-20 15:40:04 +01:00
Tobias Kaminsky 9b3a0d1919
Update RFC.md
clarify it & set lowercase.
2017-12-20 15:37:03 +01:00
Roeland Jago Douma 406451ae68
Merge pull request #11 from nextcloud/tobiasKaminsky-salt-IV
Add info about salt and IV
2017-12-20 13:57:19 +01:00
Tobias Kaminsky cf358e8d94
Clarify mnemonic
Whitespaces only for conveninent reasons, storing & using w/o.
2017-12-20 13:22:39 +01:00
Tobias Kaminsky a2e7fa9f37
Add info about salt and IV 2017-12-18 08:14:58 +01:00
Roeland Jago Douma 34d2f84b67
Merge pull request #8 from nextcloud/rename-public-key-to-certificate
Rename public key to certificate
2017-11-27 11:44:54 +01:00
Lukas Reschke c92eafad3d
Rename public key to certificate
This should clarify this a little bit more.
2017-11-27 11:44:04 +01:00
Tobias Kaminsky ccec5e2ee8 Update RFC.md 2017-10-26 12:35:06 +02:00
Tobias Kaminsky ea64d3540b Update RFC.md 2017-10-26 12:33:25 +02:00
Roeland Jago Douma e3aefb0088
Add some psuedocode to make it more clear what is going on
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-26 11:56:39 +02:00
Roeland Jago Douma 681b81a856
Explain file create/update/download in a bit more detail
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-26 11:54:21 +02:00
Lukas Reschke ef6be014fc Merge pull request #2 from nextcloud/private_key_256_bit_enc
Encrypt the private key with a 256 bit key
2017-10-25 11:48:48 +02:00
Roeland Jago Douma 2f23920b24
Encrypt the private key with a 256 bit key
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-25 10:37:12 +02:00
Lukas Reschke 4644101911 Merge pull request #1 from maxhq/master
Fix typo: encrypt -> decrypt
2017-10-19 12:11:59 +02:00
Jens Berthold d2365c8c5c Fix typo 2017-10-12 00:25:07 +02:00
Lukas Reschke c72177dd3e
Properly move authentication tag and IV into unencrypted area
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-18 10:53:37 +02:00
Lukas Reschke 74c4b2f19f Rename rfc.md to RFC.md 2017-09-15 17:01:22 +02:00
Lukas Reschke 9c51eed2d6 Create README.md 2017-09-15 16:59:40 +02:00
Lukas Reschke a4f8d160c4
Initial import of RFC
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-15 16:57:02 +02:00
Lukas Reschke 0cd41faa7c
Add license text
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-15 16:38:56 +02:00