extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2024-11-21 23:43:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix encfsctl cat when iv chaining is enabled. Fixes issue #132

Browse Source 
git-svn-id: http://encfs.googlecode.com/svn/trunk@77 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
Valient Gough 2012-04-26 02:15:38 +00:00
parent 687b51a7e5
commit b28b97999e
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
encfs/DirNode.cpp
View File

@ -742,14 +742,6 @@ shared_ptr<FileNode> DirNode::renameNode( const char *from, const char *to,
return node; return node;
} }
shared_ptr<FileNode> DirNode::directLookup( const char *path )
{
return shared_ptr<FileNode>(
new FileNode( this,
fsConfig,
"unknown", path ));
}
shared_ptr<FileNode> DirNode::findOrCreate( const char *plainName) shared_ptr<FileNode> DirNode::findOrCreate( const char *plainName)
{ {
shared_ptr<FileNode> node; shared_ptr<FileNode> node;

4
encfs/DirNode.h
View File

@ -108,10 +108,6 @@ public:
shared_ptr<FileNode> openNode( const char *plaintextName, shared_ptr<FileNode> openNode( const char *plaintextName,
const char *requestor, int flags, int *openResult ); const char *requestor, int flags, int *openResult );
/* For internal use - open a cipher file directly
*/
shared_ptr<FileNode> directLookup( const char *realPath );
std::string cipherPath( const char *plaintextPath ); std::string cipherPath( const char *plaintextPath );
std::string cipherPathWithoutRoot( const char *plaintextPath ); std::string cipherPathWithoutRoot( const char *plaintextPath );
std::string plainPath( const char *cipherPath ); std::string plainPath( const char *cipherPath );

5
encfs/encfsctl.cpp
View File

@ -411,8 +411,9 @@ int processContents( const shared_ptr<EncFS_Root> &rootInfo,
if(!node) if(!node)
{ {
// try opening directly, so a cipher-path can be passed in // try treating filename as an enciphered path
node = rootInfo->root->directLookup( path ); string plainName = rootInfo->root->plainPath( path );
node = rootInfo->root->lookupNode( plainName.c_str(), "encfsctl" );
if(node) if(node)
{ {
errCode = node->open( O_RDONLY ); errCode = node->open( O_RDONLY );