Commit Graph

35 Commits

Author SHA1 Message Date
Gregory Mullen (GrayHatter)
9628f9d171 added the dropped ; 2016-02-13 20:53:30 -08:00
Gregory Mullen (GrayHatter)
58ebf7a5b6 added versioning to toxencryptsave 2016-02-13 20:50:16 -08:00
irungentoo
dfe5d9b256
Fixes.
Fixed bug from merged PR.

Don't build useless files when building with libsodium.
2016-01-30 17:23:15 -05:00
irungentoo
3f6a8f10bb
Allow empty keys in toxencryptsave. 2015-05-27 19:54:04 -04:00
irungentoo
51c5810d72
These parameters should have been const. 2015-05-26 12:57:14 -04:00
irungentoo
abff31d2ad
Merge branch 'master' of https://github.com/dubslow/toxcore 2015-04-01 19:57:31 -04:00
Dubslow
f7beee495e
Make keys into a struct for more programmer safety 2015-03-31 21:16:04 -05:00
Dubslow
9b66c57bd0
Fix minor code duplication 2015-03-31 19:30:09 -05:00
irungentoo
99e0fde297
Merge branch 'master' of https://github.com/dubslow/toxcore 2015-03-31 19:44:51 -04:00
Dubslow
e998aca8f7
Fix toxencryptsave to be consistent with new_api
Upon my own decision, the two tox_encryped_new convenience functions were removed due to basically needing two different sets of error codes.
At iphydf's suggestion the corresponding tox_get_encrypted_savedata convenience functions were removed as well.
2015-03-31 18:31:23 -05:00
irungentoo
06b389ea5e
Making tox_encrypted_new() use the same error codes as tox_new was a bad idea.
They now have their own error codes.
2015-03-26 12:39:09 -04:00
irungentoo
8286c2c22f
Save function renamed to tox_get_savedata() 2015-03-17 16:20:38 -04:00
irungentoo
680c7c2ecd
Merge branch 'new_api' of https://github.com/dubslow/toxcore into new_api 2015-03-01 20:14:01 -05:00
Dubslow
e632ef8a47
Realign toxencryptsave with new API 2015-02-27 17:42:36 -06:00
irungentoo
3c7888d752
A bit of new api work done. 2015-02-14 23:00:12 -05:00
irungentoo
553a8dd7bd
Fixed warning. 2015-01-15 21:00:45 -05:00
irungentoo_trip
9878b441b1 Merge branch 'dubslow-master'
#
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-10-23 18:09:02 -07:00
dubslow
d90ee9d4e4 fix #1124 by adding salt manip functions
Also, all data now has the magic number prepended. This is incompatible
for all but the save/load functions, but I think nothing besides the one
experimental qTox branch used any of those, which is why I feel confident
about the change.
2014-10-23 04:19:18 -05:00
irungentoo
0fb3062f08
Merge branch 'master' of https://github.com/dubslow/toxcore 2014-10-17 16:06:00 -04:00
dubslow
ff1d4faa74 add new test cases, cleanup astray printf 2014-10-17 09:23:21 -05:00
dubslow
ffb13e4716 add load/save from key instead of pw 2014-10-17 06:02:15 -05:00
irungentoo
87130997cd
astyle toxencryptsave. 2014-10-16 20:59:52 -04:00
dubslow
57d3b3be05 Fix include issue 2014-10-12 03:11:11 -05:00
irungentoo
3f855b2445
Merge branch 'master' of https://github.com/dubslow/toxcore 2014-10-10 22:07:43 -04:00
dubslow
54fdf3bdd6 re-refactor to separate pass->key and key->encryption 2014-10-09 20:18:29 -05:00
dubslow
e6f30694d3 refactor toxencryptedsave to allow passphrase encryption of arbitrary data
also a minor API change for clarity
2014-10-08 18:50:40 -05:00
irungentoo
5a2a756671
Fixed toxencryptsave include issue. 2014-09-14 13:08:01 -04:00
irungentoo
331efce602
Properly ported a toxencryptsave function to NaCl.
removed now useless files.
2014-09-13 23:08:16 -04:00
irungentoo
cbb526e83f
Merge branch 'encrypted_data' of https://github.com/dubslow/toxcore 2014-09-13 21:29:33 -04:00
dubslow
579e7998b7 encrypted save fully work with both libsodium and nacl
they both reliably pass "make check"
2014-09-12 21:15:05 -05:00
Dubslow
c26c6d86ae memzero() segfaulted for unknown reasons... probably pebkac... 2014-09-11 22:42:22 -05:00
Dubslow
61bfa596b6 Add magic number, auto tests still required 2014-09-11 19:29:18 -05:00
Dubslow
74434c7798 nacl compiles! still needs testing though. 2014-09-10 18:25:42 -05:00
Dubslow
45f3b9559b modify inclusions 2014-09-10 18:12:58 -05:00
Dubslow
7eb7e68805 compiling against nacl seems to break VANILLA_NACL... 2014-09-09 12:23:09 -05:00