extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2025-06-20 03:37:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes for compile errors reported on mailinglist

Browse Source 
git-svn-id: http://encfs.googlecode.com/svn/trunk@23 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
Valient Gough 2008-05-11 03:41:24 +00:00
parent a54fd2c92c
commit 6264bbf0b4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
encfs/ConfigVar.cpp
View File

@ -18,6 +18,8 @@
#include "ConfigVar.h" #include "ConfigVar.h"
#include <rlog/rlog.h> #include <rlog/rlog.h>
#include <string.h>
using namespace rlog; using namespace rlog;
#ifndef MIN #ifndef MIN

6
encfs/FileUtils.cpp
View File

@ -67,6 +67,7 @@ using namespace rlog;
using namespace std; using namespace std;
using namespace gnu; using namespace gnu;
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
namespace serial = boost::serialization;
static const int DefaultBlockSize = 1024; static const int DefaultBlockSize = 1024;
// The maximum length of text passwords. If longer are needed, // The maximum length of text passwords. If longer are needed,
@ -137,7 +138,8 @@ namespace boost
ar << make_nvp("encodedKeySize", keyLen); ar << make_nvp("encodedKeySize", keyLen);
char key[keyLen]; char key[keyLen];
memcpy(key, cfg.keyData.data(), keyLen); memcpy(key, cfg.keyData.data(), keyLen);
ar << make_nvp("encodedKeyData", make_binary_object(key, keyLen)); ar << make_nvp("encodedKeyData",
serial::make_binary_object(key, keyLen));
} }
template<class Archive> template<class Archive>
@ -161,7 +163,7 @@ namespace boost
ar >> make_nvp("encodedKeySize", encodedKeySize); ar >> make_nvp("encodedKeySize", encodedKeySize);
char key[encodedKeySize]; char key[encodedKeySize];
ar >> make_nvp("encodedKeyData", ar >> make_nvp("encodedKeyData",
make_binary_object(key, encodedKeySize)); serial::make_binary_object(key, encodedKeySize));
cfg.keyData.assign( (char*)key, encodedKeySize ); cfg.keyData.assign( (char*)key, encodedKeySize );
} }