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

Rename flash functions.

Browse Source
This commit is contained in:
NIIBE Yutaka
2017-09-28 15:10:20 +09:00
parent f4b9073b11
commit 7345f3c241
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2017-09-28 NIIBE Yutaka <gniibe@fsij.org>
* src/flash.c (flash_do_storage_init): Rename from flash_init.
(flash_key_storage_init): Rename from flash_init_keys.
* src/openpgp.c (gpg_init): Use new function names.
* src/stdlib.h: Update for GNU/Linux emulation.
* src/Makefile: Support GNU/Linux emulation.

4
src/flash.c
View File

@@ -103,7 +103,7 @@ static int key_available_at (const uint8_t *k, int key_size)
#define CHIP_ID_REG ((uint32_t *)0xe0042000)
void
flash_init (const uint8_t **p_do_start, const uint8_t **p_do_end)
flash_do_storage_init (const uint8_t **p_do_start, const uint8_t **p_do_end)
{
uint16_t gen0, gen1;
uint16_t *gen0_p = (uint16_t *)&_data_pool;
@@ -169,7 +169,7 @@ flash_activate (void)
void
flash_init_keys (void)
flash_key_storage_init (void)
{
const uint8_t *p;
int i;

4
src/gnuk.h
View File

@@ -139,10 +139,10 @@ enum size_of_key {
int gpg_get_algo_attr (enum kind_of_key kk);
int gpg_get_algo_attr_key_size (enum kind_of_key kk, enum size_of_key s);
void flash_init (const uint8_t **, const uint8_t **);
void flash_do_storage_init (const uint8_t **, const uint8_t **);
void flash_terminate (void);
void flash_activate (void);
void flash_init_keys (void);
void flash_key_storage_init (void);
void flash_do_release (const uint8_t *);
const uint8_t *flash_do_write (uint8_t nr, const uint8_t *data, int len);
uint8_t *flash_key_alloc (enum kind_of_key);

4
src/openpgp.c
View File

@@ -108,7 +108,7 @@ gpg_init (void)
const uint8_t *flash_do_start;
const uint8_t *flash_do_end;
flash_init (&flash_do_start, &flash_do_end);
flash_do_storage_init (&flash_do_start, &flash_do_end);
if (flash_do_start == NULL)
file_selection = FILE_CARD_TERMINATED;
@@ -116,7 +116,7 @@ gpg_init (void)
file_selection = FILE_NONE;
gpg_data_scan (flash_do_start, flash_do_end);
flash_init_keys ();
flash_key_storage_init ();
}
static void