diff options
| author | segfault <segfault@secmail.pro> | 2019-05-05 17:48:42 +0200 |
|---|---|---|
| committer | segfault <segfault@secmail.pro> | 2019-05-05 17:48:42 +0200 |
| commit | 76e89361f6cba455934dd19bce0deae1ab1c73e6 (patch) | |
| tree | a5301b897a725171cffc73149932220b6c322e7d /funccrypt.c | |
| parent | 21144d5cb548f8fad5583e77fcce51e2e0a707e9 (diff) | |
_DEBUG macro check example, CRET_CHECK *before* (en|de)cryption but *after* validating, crypt_return documentation, fix for Windoze VirtualProtect: DWORD *old_protect can not be NULL
Signed-off-by: segfault <segfault@secmail.pro>
Diffstat (limited to 'funccrypt.c')
| -rw-r--r-- | funccrypt.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/funccrypt.c b/funccrypt.c index de51405..bfb0b31 100644 --- a/funccrypt.c +++ b/funccrypt.c @@ -61,7 +61,6 @@ crypt_return crypt_func(void *fn_start) if (cret == CRET_EPILOGUE && i >= sizeof *hdr) { - cret = CRET_CHECK; #if _DEBUG printf("Prologue Marker: %p\n", pro); printf("Epilogue Marker: %p\n", epi); @@ -81,6 +80,7 @@ crypt_return crypt_func(void *fn_start) #endif ) { + cret = CRET_CHECK; #ifdef __linux__ mbuf = (uint8_t *)( (long int)hdr & ~(sysconf(_SC_PAGESIZE) - 1) ); if (!mprotect(mbuf, sysconf(_SC_PAGESIZE), PROT_READ|PROT_WRITE|PROT_EXEC)) @@ -92,17 +92,23 @@ crypt_return crypt_func(void *fn_start) { if (hdr->crpyted == 0x00) { hdr->crpyted = 0xFF; - hdr->key = (uint64_t) rand() << 32; - hdr->key |= rand(); +#ifdef __linux__ + hdr->key = (uint64_t) rand() << 32; + hdr->key |= (uint64_t) rand(); +#else + hdr->key = (uint64_t) rand() << 48; + hdr->key |= (uint64_t) rand() << 32; + hdr->key |= (uint64_t) rand() << 16; + hdr->key |= (uint64_t) rand(); +#endif } for (i = 0; i < crypt_size / 0x8; ++i) { hdr->func_body[i] ^= hdr->key; } - #ifdef __linux__ if (!mprotect(mbuf, sysconf(_SC_PAGESIZE), PROT_READ|PROT_EXEC)) #else - if (VirtualProtect(mbuf, crypt_size, old_prot, NULL)) + if (VirtualProtect(mbuf, crypt_size, old_prot, &old_prot)) #endif cret = CRET_OK; } |