mirror of
https://github.com/vgough/encfs.git
synced 2025-02-04 11:59:30 +01:00
fixes for compile errors reported on mailinglist
git-svn-id: http://encfs.googlecode.com/svn/trunk@23 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
parent
a54fd2c92c
commit
6264bbf0b4
@ -18,6 +18,8 @@
|
||||
#include "ConfigVar.h"
|
||||
#include <rlog/rlog.h>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace rlog;
|
||||
|
||||
#ifndef MIN
|
||||
|
@ -67,6 +67,7 @@ using namespace rlog;
|
||||
using namespace std;
|
||||
using namespace gnu;
|
||||
namespace fs = boost::filesystem;
|
||||
namespace serial = boost::serialization;
|
||||
|
||||
static const int DefaultBlockSize = 1024;
|
||||
// The maximum length of text passwords. If longer are needed,
|
||||
@ -137,7 +138,8 @@ namespace boost
|
||||
ar << make_nvp("encodedKeySize", keyLen);
|
||||
char key[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>
|
||||
@ -161,7 +163,7 @@ namespace boost
|
||||
ar >> make_nvp("encodedKeySize", encodedKeySize);
|
||||
char key[encodedKeySize];
|
||||
ar >> make_nvp("encodedKeyData",
|
||||
make_binary_object(key, encodedKeySize));
|
||||
serial::make_binary_object(key, encodedKeySize));
|
||||
cfg.keyData.assign( (char*)key, encodedKeySize );
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user