deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for 64-bit machine (emulation).

Browse Source
This commit is contained in:
NIIBE Yutaka
2017-09-29 14:15:48 +09:00
parent 7004453669
commit 547e263d6b
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,5 +1,10 @@
2017-09-29 NIIBE Yutaka <gniibe@fsij.org> 2017-09-29 NIIBE Yutaka <gniibe@fsij.org>
* src/openpgp.c (modify_binary): Fix for 64-bit machine.
* src/openpgp-do.c (encrypt, decrypt): Likewise.
(gpg_data_scan): Likewise.
(gpg_do_chks_prvkey): Fix error return path.
* src/stack-def.h: New. * src/stack-def.h: New.
* src/gnuk.ld.in: Remove stack definitions. * src/gnuk.ld.in: Remove stack definitions.

2
chopstx

Submodule chopstx updated: 5b7c5a9996...c08044e22b

16
src/openpgp-do.c
View File

@@ -848,7 +848,7 @@ encrypt (const uint8_t *key, const uint8_t *iv, uint8_t *data, int len)
{ {
aes_context aes; aes_context aes;
uint8_t iv0[INITIAL_VECTOR_SIZE]; uint8_t iv0[INITIAL_VECTOR_SIZE];
unsigned int iv_offset; size_t iv_offset;
DEBUG_INFO ("ENC\r\n"); DEBUG_INFO ("ENC\r\n");
DEBUG_BINARY (data, len); DEBUG_BINARY (data, len);
@@ -867,7 +867,7 @@ decrypt (const uint8_t *key, const uint8_t *iv, uint8_t *data, int len)
{ {
aes_context aes; aes_context aes;
uint8_t iv0[INITIAL_VECTOR_SIZE]; uint8_t iv0[INITIAL_VECTOR_SIZE];
unsigned int iv_offset; size_t iv_offset;
aes_setkey_enc (&aes, key, 128); /* This is setkey_enc, because of CFB. */ aes_setkey_enc (&aes, key, 128); /* This is setkey_enc, because of CFB. */
memcpy (iv0, iv, INITIAL_VECTOR_SIZE); memcpy (iv0, iv, INITIAL_VECTOR_SIZE);
@@ -1263,9 +1263,9 @@ gpg_do_chks_prvkey (enum kind_of_key kk,
const uint8_t *do_data = do_ptr[nr]; const uint8_t *do_data = do_ptr[nr];
uint8_t dek[DATA_ENCRYPTION_KEY_SIZE]; uint8_t dek[DATA_ENCRYPTION_KEY_SIZE];
struct prvkey_data *pd; struct prvkey_data *pd;
const uint8_t *p;
uint8_t *dek_p; uint8_t *dek_p;
int update_needed = 0; int update_needed = 0;
int r = 1; /* Success */
if (do_data == NULL) if (do_data == NULL)
return 0; /* No private key */ return 0; /* No private key */
@@ -1304,18 +1304,20 @@ gpg_do_chks_prvkey (enum kind_of_key kk,
if (update_needed) if (update_needed)
{ {
const uint8_t *p;
flash_do_release (do_data); flash_do_release (do_data);
do_ptr[nr] = NULL; do_ptr[nr] = NULL;
p = flash_do_write (nr, (const uint8_t *)pd, sizeof (struct prvkey_data)); p = flash_do_write (nr, (const uint8_t *)pd, sizeof (struct prvkey_data));
do_ptr[nr] = p; do_ptr[nr] = p;
if (p == NULL)
r = -1;
} }
memset (pd, 0, sizeof (struct prvkey_data)); memset (pd, 0, sizeof (struct prvkey_data));
free (pd); free (pd);
if (update_needed && p == NULL)
return -1;
return 1; return r;
} }
@@ -1571,7 +1573,7 @@ gpg_data_scan (const uint8_t *do_start, const uint8_t *do_end)
p += second_byte + 1; /* second_byte has length */ p += second_byte + 1; /* second_byte has length */
if (((uint32_t)p & 1)) if (((uintptr_t)p & 1))
p++; p++;
} }
else if (nr >= 0x80 && nr <= 0xbf) else if (nr >= 0x80 && nr <= 0xbf)

2
src/openpgp.c
View File

@@ -1216,7 +1216,7 @@ modify_binary (uint8_t op, uint8_t p1, uint8_t p2, int len)
if (i == 4) /* all update keys are removed */ if (i == 4) /* all update keys are removed */
{ {
p = gpg_get_firmware_update_key (0); p = gpg_get_firmware_update_key (0);
flash_erase_page ((uint32_t)p); flash_erase_page ((uintptr_t)p);
} }
} }