lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-09-20 02:57:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re-encrypt pages on write

Browse Source
This commit is contained in:
Benedikt Reinartz
2021-05-17 07:27:49 +02:00
parent 873c6a027e
commit 89ce71637c
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libmdb/file.c
View File

@@ -191,8 +191,6 @@ static MdbHandle *mdb_handle_from_stream(FILE *stream, MdbFileFlags flags) {
/* Bug - JET3 supports 20 byte passwords, this is currently just 14 bytes */ /* Bug - JET3 supports 20 byte passwords, this is currently just 14 bytes */
memcpy(mdb->f->db_passwd, mdb->pg_buf + 0x42, sizeof(mdb->f->db_passwd)); memcpy(mdb->f->db_passwd, mdb->pg_buf + 0x42, sizeof(mdb->f->db_passwd));
} }
/* write is not supported for encrypted files yet */
mdb->f->writable = mdb->f->writable && !mdb->f->db_key;
mdb_iconv_init(mdb); mdb_iconv_init(mdb);

18
src/libmdb/write.c
View File

@@ -16,6 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <mdbfakeglib.h>
#include <time.h> #include <time.h>
#include <inttypes.h> #include <inttypes.h>
#include "mdbtools.h" #include "mdbtools.h"
@@ -70,6 +71,7 @@ mdb_write_pg(MdbHandle *mdb, unsigned long pg)
{ {
ssize_t len; ssize_t len;
off_t offset = pg * mdb->fmt->pg_size; off_t offset = pg * mdb->fmt->pg_size;
unsigned char *buf = mdb->pg_buf;
fseeko(mdb->f->stream, 0, SEEK_END); fseeko(mdb->f->stream, 0, SEEK_END);
/* is page beyond current size + 1 ? */ /* is page beyond current size + 1 ? */
@@ -78,7 +80,21 @@ mdb_write_pg(MdbHandle *mdb, unsigned long pg)
return 0; return 0;
} }
fseeko(mdb->f->stream, offset, SEEK_SET); fseeko(mdb->f->stream, offset, SEEK_SET);
len = fwrite(mdb->pg_buf, 1, mdb->fmt->pg_size, mdb->f->stream);
if (pg != 0 && mdb->f->db_key != 0)
{
buf = g_malloc(mdb->fmt->pg_size);
memcpy(buf, mdb->pg_buf, mdb->fmt->pg_size);
unsigned int tmp_key = mdb->f->db_key ^ pg;
mdb_rc4((unsigned char*)&tmp_key, 4, buf, mdb->fmt->pg_size);
}
len = fwrite(buf, 1, mdb->fmt->pg_size, mdb->f->stream);
if (buf != mdb->pg_buf) {
g_free(buf);
}
if (ferror(mdb->f->stream)) { if (ferror(mdb->f->stream)) {
perror("write"); perror("write");
return 0; return 0;