coelner/gnuk
1
0
Fork 0
mirror of https://salsa.debian.org/gnuk-team/gnuk/gnuk.git synced 2024-09-20 02:40:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for address calculation and access to object on memory.

Browse Source 
Applied from STABLE-BRANCH-1-2.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-04-22 10:36:13 +09:00
parent 38687ae83e
commit 3b2540bbf6
6 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2022-04-22 NIIBE Yutaka <gniibe@fsij.org>
* src/gnuk.h (_regnual_start): Fix type.
* src/main.c (main): Fix address for _regnual_start.
* src/usb_ctrl.c (mem_info, usb_setup): Follow the change.
* src/flash.c (_keystore_pool, _data_pool): Fix type.
(FLASH_ADDR_KEY_STORAGE_START, FLASH_ADDR_DATA_STORAGE_START):
Follow the change.
2022-03-26 Bertrand Jacquin <bertrand@jacquin.bzh>
* regnual/regnual.c (memset): Remove declaration.
* regnual/types.h (NULL): Remove.
(size_t): Remove.
2021-11-02 NIIBE Yutaka <gniibe@shouwa2020.gniibe.org>
* src/ecc-mont.c (ecdh_compute_public_25519): Fix alignment

2
regnual/regnual.c
View File

@ -1,7 +1,7 @@
/*
* regnual.c -- Firmware installation for STM32F103 Flash ROM
*
* Copyright (C) 2012, 2013, 2015, 2016, 2017, 2018
* Copyright (C) 2012, 2013, 2015, 2016, 2017, 2018, 2022
* Free Software Initiative of Japan
* Author: NIIBE Yutaka <gniibe@fsij.org>
*

11
src/flash.c
View File

@ -1,7 +1,8 @@
/*
* flash.c -- Data Objects (DO) and GPG Key handling on Flash ROM
*
* Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
* Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018,
* 2022
* Free Software Initiative of Japan
* Author: NIIBE Yutaka <gniibe@fsij.org>
*
@ -82,10 +83,10 @@ extern uint8_t *flash_addr_data_storage_start;
#define FLASH_ADDR_DATA_STORAGE_START flash_addr_data_storage_start
#else
/* Linker sets these symbols */
extern uint8_t _keystore_pool;
extern uint8_t _data_pool;
#define FLASH_ADDR_KEY_STORAGE_START ((&_keystore_pool))
#define FLASH_ADDR_DATA_STORAGE_START ((&_data_pool))
extern uint8_t _keystore_pool[];
extern uint8_t _data_pool[];
#define FLASH_ADDR_KEY_STORAGE_START ((_keystore_pool))
#define FLASH_ADDR_DATA_STORAGE_START ((_data_pool))
#endif
static int key_available_at (const uint8_t *k, int key_size)

2
src/gnuk.h
View File

@ -479,6 +479,6 @@ int pinpad_getline (int msg_code, uint32_t timeout_usec);
#endif
extern uint8_t _regnual_start, __heap_end__[];
extern uint8_t _regnual_start[], __heap_end__[];
uint8_t * sram_address (uint32_t offset);

7
src/main.c
View File

@ -1,7 +1,8 @@
/*
* main.c - main routine of Gnuk
*
* Copyright (C) 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2021
* Copyright (C) 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2021,
* 2022
* Free Software Initiative of Japan
* Author: NIIBE Yutaka <gniibe@fsij.org>
*
@ -503,8 +504,8 @@ main (int argc, const char *argv[])
#ifdef FLASH_UPGRADE_SUPPORT
/* Set vector */
SCB->VTOR = (uintptr_t)&_regnual_start;
entry = calculate_regnual_entry_address (&_regnual_start);
SCB->VTOR = (uintptr_t)_regnual_start;
entry = calculate_regnual_entry_address (_regnual_start);
#ifdef DFU_SUPPORT
{
/* Use SYS at ORIGIN_REAL instead of the one at ORIGIN */

7
src/usb_ctrl.c
View File

@ -1,7 +1,8 @@
/*
* usb_ctrl.c - USB control pipe device specific code for Gnuk
*
* Copyright (C) 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018
* Copyright (C) 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018,
* 2022
* Free Software Initiative of Japan
* Author: NIIBE Yutaka <gniibe@fsij.org>
*
@ -227,7 +228,7 @@ static const uint8_t lun_table[] = { 0, 0, 0, 0, };
#endif
#ifdef FLASH_UPGRADE_SUPPORT
static const uint8_t *const mem_info[] = { &_regnual_start, __heap_end__, };
static const uint8_t *const mem_info[] = { _regnual_start, __heap_end__, };
#endif
#define USB_FSIJ_GNUK_MEMINFO 0
@ -284,7 +285,7 @@ usb_setup (struct usb_dev *dev)
if (ccid_get_ccid_state () != CCID_STATE_EXITED)
return -1;
if (addr < &_regnual_start || addr + arg->len > __heap_end__)
if (addr < _regnual_start || addr + arg->len > __heap_end__)
return -1;
if (arg->index + arg->len < 256)