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
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
dubslow
458a09f6ab
Merge branch 'master' of https://github.com/irungentoo/toxcore
2014-10-12 02:29:34 -05:00
dubslow
ccfd777e35
apparently i forgot to add/commit these comments...
2014-10-12 02:28:18 -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
Dubslow
61bfa596b6
Add magic number, auto tests still required
2014-09-11 19:29:18 -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
