Commit Graph

2 Commits (master)

Author SHA1 Message Date
aefo bdee7ef4fa Merge remote-tracking branch 'upstream/master'. Also extracted unit
tests to new files

Conflicts:
	src/main/java/org/mrpdaemon/sec/encfs/EncFSCrypto.java
	src/main/java/org/mrpdaemon/sec/encfs/EncFSFile.java
	src/test/java/org/mrpdaemon/sec/encfs/EncFSComparer.java
	src/test/java/org/mrpdaemon/sec/encfs/EncFSVolumeTest.java
2011-12-21 18:05:11 +00:00
Mark Pariente bf71a24594 Add more test volumes
Added test volumes created with encfs 1.7.4:

* Default settings
* No uniqueIV (no per-file IV header)
2011-12-21 00:13:12 -08:00