"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "encfs/FileUtils.h" between
encfs-1.9.4.tar.gz and encfs-1.9.5.tar.gz

About: EncFS is an encrypted virtual filesystem for Linux using the FUSE kernel module.

FileUtils.h  (encfs-1.9.4)	:	FileUtils.h  (encfs-1.9.5)
skipping to change at line 75		skipping to change at line 75
enum ConfigMode { Config_Prompt, Config_Standard, Config_Paranoia };		enum ConfigMode { Config_Prompt, Config_Standard, Config_Paranoia };
/**		/**
* EncFS_Opts stores internal settings		* EncFS_Opts stores internal settings
*		*
* See struct EncFS_Args (main.cpp) for the parsed command line arguments		* See struct EncFS_Args (main.cpp) for the parsed command line arguments
*/		*/
struct EncFS_Opts {		struct EncFS_Opts {
std::string rootDir;		std::string rootDir;
std::string mountPoint; // where to make filesystem visible		std::string mountPoint; // where to make filesystem visible
		std::string unmountPoint;// same as mountPoint, but as given by the user
		std::string cygDrive; // Cygwin mount drive
bool createIfNotFound; // create filesystem if not found		bool createIfNotFound; // create filesystem if not found
bool idleTracking; // turn on idle monitoring of filesystem		bool idleTracking; // turn on idle monitoring of filesystem
bool mountOnDemand; // mounting on-demand		bool mountOnDemand; // mounting on-demand
bool delayMount; // delay initial mount		bool delayMount; // delay initial mount
		bool unmount; // unmount
bool checkKey; // check crypto key decoding		bool checkKey; // check crypto key decoding
bool forceDecode; // force decode on MAC block failures		bool forceDecode; // force decode on MAC block failures
std::string passwordProgram; // path to password program (or empty)		std::string passwordProgram; // path to password program (or empty)
bool useStdin; // read password from stdin rather then prompting		bool useStdin; // read password from stdin rather then prompting
bool annotate; // print annotation line prompt to stderr.		bool annotate; // print annotation line prompt to stderr.
bool ownerCreate; // set owner of new files to caller		bool ownerCreate; // set owner of new files to caller
bool reverseEncryption; // Reverse encryption		bool reverseEncryption; // Reverse encryption
bool noCache; /* Disable block cache (in EncFS) and stat cache (in kernel).		bool noCache; /* Disable block cache (in EncFS) and stat cache (in kernel).
* This is needed if the backing files may be modified		* This is needed if the backing files may be modified
* behind the back of EncFS (for example, in reverse mode).		* behind the back of EncFS (for example, in reverse mode).
* See main.cpp for a longer explaination. */		* See main.cpp for a longer explaination. */
bool readOnly; // Mount read-only		bool readOnly; // Mount read-only
		bool insecure; // Allow to use plain data / to disable data encoding
bool requireMac; // Throw an error if MAC is disabled		bool requireMac; // Throw an error if MAC is disabled
ConfigMode configMode;		ConfigMode configMode;
		std::string config; // path to configuration file (or empty)
EncFS_Opts() {		EncFS_Opts() {
createIfNotFound = true;		createIfNotFound = true;
idleTracking = false;		idleTracking = false;
mountOnDemand = false;		mountOnDemand = false;
delayMount = false;		delayMount = false;
		unmount = false;
checkKey = true;		checkKey = true;
forceDecode = false;		forceDecode = false;
useStdin = false;		useStdin = false;
annotate = false;		annotate = false;
ownerCreate = false;		ownerCreate = false;
reverseEncryption = false;		reverseEncryption = false;
configMode = Config_Prompt;		configMode = Config_Prompt;
noCache = false;		noCache = false;
readOnly = false;		readOnly = false;
		insecure = false;
requireMac = false;		requireMac = false;
}		}
};		};
/*		/*
Read existing config file. Looks for any supported configuration version.		Read existing config file. Looks for any supported configuration version.
*/		*/
ConfigType readConfig(const std::string &rootDir, EncFSConfig *config);		ConfigType readConfig(const std::string &rootDir, EncFSConfig *config, const std ::string &cmdConfig);
/*		/*
Save the configuration. Saves back as the same configuration type as was		Save the configuration. Saves back as the same configuration type as was
read from.		read from.
*/		*/
bool saveConfig(ConfigType type, const std::string &rootdir,		bool saveConfig(ConfigType type, const std::string &rootdir,
const EncFSConfig *config);		const EncFSConfig *config, const std::string &cmdConfig);
class EncFS_Context;		class EncFS_Context;
RootPtr initFS(EncFS_Context *ctx, const std::shared_ptr<EncFS_Opts> &opts);		RootPtr initFS(EncFS_Context *ctx, const std::shared_ptr<EncFS_Opts> &opts);
		void unmountFS(const char *mountPoint);
RootPtr createV6Config(EncFS_Context *ctx,		RootPtr createV6Config(EncFS_Context *ctx,
const std::shared_ptr<EncFS_Opts> &opts);		const std::shared_ptr<EncFS_Opts> &opts);
void showFSInfo(const EncFSConfig *config);		void showFSInfo(const EncFSConfig *config);
bool readV4Config(const char *configFile, EncFSConfig *config,		bool readV4Config(const char *configFile, EncFSConfig *config,
struct ConfigInfo *);		struct ConfigInfo *);
bool writeV4Config(const char *configFile, const EncFSConfig *config);		bool writeV4Config(const char *configFile, const EncFSConfig *config);
bool readV5Config(const char *configFile, EncFSConfig *config,		bool readV5Config(const char *configFile, EncFSConfig *config,
End of changes. 9 change blocks.
2 lines changed or deleted		12 lines changed or added

---