mirrors/acsm-calibre-plugin
mirrors
/
acsm-calibre-plugin
mirror of https://github.com/Leseratte10/acsm-calibre-plugin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix buffer allocation/zeroing bugs, use clearer variable names

This commit is contained in:
melvyn2 2022-07-15 11:17:46 -07:00 committed by Florian Bach
parent 2b989f21e9
commit 8e53929d94
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
calibre-plugin/keyextract/main.c
View File

@ -2,6 +2,9 @@
#include <cpuid.h> #include <cpuid.h>
#include <intsafe.h> #include <intsafe.h>
// Size for buffers that will hold unknown-size data
#define BUFSIZE 1024
union CPUIDVendor { union CPUIDVendor {
unsigned int reg[3]; unsigned int reg[3];
char vendor[13]; char vendor[13];
@ -46,44 +49,43 @@ int main() {
// Get windows user // Get windows user
#define USERBUFSIZE 512 wchar_t wideuser[BUFSIZE];
wchar_t wideuser[USERBUFSIZE];
// RegGetValueW/GetUserNameW only sets bytes as needed for length of username, but we need null bytes to fill the rest // RegGetValueW/GetUserNameW only sets bytes as needed for length of username, but we need null bytes to fill the rest
// Only the first 13 bytes are used for entropy, so only set those memset(&wideuser, 0, sizeof(wideuser));
memset(&wideuser, 0, 13); DWORD wideuser_size = BUFSIZE;
DWORD bufsize = USERBUFSIZE; LSTATUS user_retval = RegGetValueW(HKEY_CURRENT_USER, L"Software\\Adobe\\Adept\\Device", L"username", RRF_RT_REG_SZ, NULL, &wideuser, &wideuser_size);
LSTATUS user_retval = RegGetValueW(HKEY_CURRENT_USER, L"Software\\Adobe\\Adept\\Device", L"username", RRF_RT_REG_SZ, NULL, &wideuser, &bufsize);
if (user_retval != ERROR_SUCCESS) { if (user_retval != ERROR_SUCCESS) {
fprintf(stderr, "Error with RegGetValue: %ld\n", user_retval); fprintf(stderr, "Error with RegGetValue: %ld\n", user_retval);
fprintf(stderr, "bufsize: %ld\n", bufsize); fprintf(stderr, "wideuser_size: %ld\n", wideuser_size);
fprintf(stderr, "Falling back to GetUserNameW\n"); fprintf(stderr, "Falling back to GetUserNameW\n");
if (GetUserNameW(wideuser, &bufsize) == 0) { if (GetUserNameW(wideuser, &wideuser_size) == 0) {
DWORD err = GetLastError(); DWORD err = GetLastError();
fprintf(stderr, "Error with GetUserName: %ld\n", err); fprintf(stderr, "Error with GetUserName: %ld\n", err);
fprintf(stderr, "wideuser_size: %ld\n", wideuser_size);
return err; return err;
} }
} }
fprintf(stderr, "Username: %ls\n", wideuser); fprintf(stderr, "Username: %ls\n", wideuser);
// Copy every second byte of the wide string, to make an ascii-ish/non-long string // Copy every second byte of the wide string, to make an ascii-ish/non-long string
// As adobe does // As adobe does
// Only the first 13 bytes are used, so only copy those // Only the first 13 chars are used, so only copy those
char user[13]; char user[13];
for (unsigned int i = 0; i < 13; i++) { for (unsigned int i = 0; i < 13; i++) {
user[i] = ((char *)wideuser)[i*2]; user[i] = ((char *)wideuser)[i*2];
} }
// Get Encrypted adobe key // Get Encrypted adobe key
#define KEYBUFSIZE 180 // As measured BYTE key[BUFSIZE];
BYTE key[KEYBUFSIZE]; memset(&key, 0, sizeof(key));
DWORD regkeysize = KEYBUFSIZE; DWORD key_size = BUFSIZE;
LSTATUS key_retval = RegGetValue(HKEY_CURRENT_USER, "Software\\Adobe\\Adept\\Device", "key", RRF_RT_REG_BINARY, NULL, &key, &regkeysize); LSTATUS key_retval = RegGetValue(HKEY_CURRENT_USER, "Software\\Adobe\\Adept\\Device", "key", RRF_RT_REG_BINARY, NULL, &key, &key_size);
if (key_retval != ERROR_SUCCESS) { if (key_retval != ERROR_SUCCESS) {
fprintf(stderr, "Error with RegGetValue: %ld\n", key_retval); fprintf(stderr, "Error with RegGetValue: %ld\n", key_retval);
fprintf(stderr, "regkeysize: %ld\n", regkeysize); fprintf(stderr, "key_size: %ld\n", key_size);
return key_retval; return key_retval;
} }
fprintf(stderr, "Encrypted key (hex): "); fprintf(stderr, "Encrypted key (hex): ");
for (size_t i = 0; i < KEYBUFSIZE; i++ ) for (size_t i = 0; i < key_size; i++ )
{ {
fprintf(stderr, "%02x", key[i]); fprintf(stderr, "%02x", key[i]);
} }
@ -109,7 +111,7 @@ int main() {
// Run decryption API // Run decryption API
DATA_BLOB ciphertext_data, entropy_data, plaintext_data; DATA_BLOB ciphertext_data, entropy_data, plaintext_data;
ciphertext_data.pbData = key; ciphertext_data.pbData = key;
ciphertext_data.cbData = sizeof(key); ciphertext_data.cbData = key_size;
entropy_data.pbData = (BYTE*)(&entropy); entropy_data.pbData = (BYTE*)(&entropy);
entropy_data.cbData = sizeof(entropy); entropy_data.cbData = sizeof(entropy);
if (CryptUnprotectData(&ciphertext_data, NULL, &entropy_data, NULL, NULL, 0, &plaintext_data) != TRUE) { if (CryptUnprotectData(&ciphertext_data, NULL, &entropy_data, NULL, NULL, 0, &plaintext_data) != TRUE) {