env: cleanups after adding multiple envs
v2 cover env: cleanups after adding multiple envs
With the new code to support multiple environment drivers and select an environment at runtime, to correctly implement fallback when one environment fails to load (e.g. crc error), the return value of env_import has to be propagated by all env driver's load function.
While cleaning this up, made some other cleanups, mainly to reduce duplicated code.
Changes from v1:
- fixed duplicated commit message for patch 3/4
- removed german company email footer
Simon Goldschmidt (4):
env: make env_import(_redund) return 0 on success, not 1
env: move more common code to env_import_redund
env: make env drivers propagate env_import return value
env: sf: use env_import_redund to simplify env_sf_load
env/common.c | 29 ++++++++++++++++++---- env/eeprom.c | 4 +-- env/ext4.c | 3 +-- env/fat.c | 3 +-- env/flash.c | 4 +-- env/mmc.c | 26 +++---------------- env/nand.c | 24 +++--------------- env/nvram.c | 4 +-- env/onenand.c | 4 +-- env/remote.c | 2 +- env/sata.c | 4 +-- env/sf.c | 69 +++++++-------------------------------------------- env/ubi.c | 22 ++++++++-------- include/environment.h | 3 ++- 14 files changed, 61 insertions(+), 140 deletions(-)
Signature · 1 line
2.11.0
PATCH v2 1/4 env: make env_import(_redund) return 0 on success, not 1
env_import (and env_import_redund) currently return 1 on success and 0 on error. However, they are only used from functions returning 0 on success or a negative value on error.
Let's clean this up by making env_import and env_import_redund return 0 on success and -EIO on error (as was the case for all users before).
Users that cared for the return value are also updated. Funny enough, this only affects onenand.c and sf.c
--- env/common.c | 8 ++++---- env/onenand.c | 4 ++-- env/sf.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)
env/common.c +4 -4
@@ -118,21 +118,21 @@ int env_import(const char *buf, int check)if (crc32 (0 , ep->data,ENV_SIZE ) != crc) {set_default_env ("!bad CRC" ); -return 0 ; +return -EIO ; } }if (himport_r (&env_htab, (char *)ep->data,ENV_SIZE ,'\0' ,0 ,0 ,0 ,NULL )) { gd->flags |=GD_FLG_ENV_READY ; -return 1 ; +return 0 ; }pr_err ("Cannot import environment: errno = %d\n" , errno);set_default_env ("!import failed" ); -return 0 ; +return -EIO ; }#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
@@ -153,7 +153,7 @@ int env_import_redund(const char *buf1, const char *buf2)if (!crc1_ok && !crc2_ok) {set_default_env ("!bad CRC" ); -return 0 ; +return -EIO ; }else if (crc1_ok && !crc2_ok) { gd->env_valid =ENV_VALID ; }else if (!crc1_ok && crc2_ok) {
env/onenand.c +2 -2
@@ -57,10 +57,10 @@ static int env_onenand_load(void)#endif /* !ENV_IS_EMBEDDED */ rc =env_import (buf,1 ); -if (rc) +if (!rc) gd->env_valid =ENV_VALID ; -return rc ?0 : -EIO ; +return rc; }static int env_onenand_save (void )
env/sf.c +2 -2
@@ -236,7 +236,7 @@ static int env_sf_load(void) ep = tmp_env2; ret =env_import ((char *)ep,0 ); -if (!ret) { +if (ret) {pr_err ("Cannot import environment: errno = %d\n" , errno);set_default_env ("!env_import failed" ); }
@@ -336,7 +336,7 @@ static int env_sf_load(void) } ret =env_import (buf,1 ); -if (ret) +if (!ret) gd->env_valid =ENV_VALID ; err_read:
Signature · 1 line
2.11.0
PATCH v2 1/4 env: make env_import(_redund) return 0 on success, not 1
Quoted 4 lines · Simon Goldschmidt
env_import(andenv_import_redund) currently return 1 on success and 0 on error. However, they are only used from functions returning 0 on success or a negative value on error.
Quoted 8 lines
Let's clean this up by making
env_importandenv_import_redundreturn 0 on success and-EIOon error (as was the case for all users before).Users that cared for the return value are also updated. Funny enough, this only affects
onenand.candsf.cSigned-off-by Simon Goldschmidt <[email protected]>
Thanks!
Maxime
Signature · 10 lines
Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180131/e9128503/attachment.sig>
PATCH v2 1/4 env: make env_import(_redund) return 0 on success, not 1
In reply to Simon GoldschmidtQuoted 8 lines · Simon Goldschmidt
env_import(andenv_import_redund) currently return 1 on success and 0 on error. However, they are only used from functions returning 0 on success or a negative value on error.Let's clean this up by making
env_importandenv_import_redundreturn 0 on success and-EIOon error (as was the case for all users before).
Quoted 5 lines
Users that cared for the return value are also updated. Funny enough, this only affects
onenand.candsf.cSigned-off-by Simon Goldschmidt <[email protected]>Acked-by Maxime Ripard <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180201/25ca419f/attachment.sig>
PATCH v2 2/4 env: move more common code to env_import_redund
In reply to Simon GoldschmidtThere is more common code in mmc, nand and ubi env drivers that can be shared by moving to env_import_redund.
For this, a status/error value whether the buffers were loaded are passed as additional parameters to env_import_redund. Ideally, these are already returned to the env driver by the storage driver. This is the case for mmc, nand and ubi, so for this change, code deduplicated.
--- env/common.c | 21 ++++++++++++++++++++- env/mmc.c | 23 ++--------------------- env/nand.c | 22 +++------------------- env/ubi.c | 18 +++++++++--------- include/environment.h | 3 ++- 5 files changed, 36 insertions(+), 51 deletions(-)
env/common.c +20 -1
@@ -138,7 +138,8 @@ int env_import(const char *buf, int check)#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT static unsigned char env_flags; -int env_import_redund (const char *buf1,const char *buf2) +int env_import_redund (const char *buf1,int buf1_read_fail, +const char *buf2,int buf2_read_fail) {int crc1_ok, crc2_ok;env_t *ep, *tmp_env1, *tmp_env2;
@@ -146,6 +147,24 @@ int env_import_redund(const char *buf1, const char *buf2) tmp_env1 = (env_t *)buf1; tmp_env2 = (env_t *)buf2; +if (buf1_read_fail && buf2_read_fail) { +puts ("*** Error - No Valid Environment Area found\n" ); + }else if (buf1_read_fail || buf2_read_fail) { +puts ("*** Warning - some problems detected " ); +puts ("reading environment; recovered successfully\n" ); + } + +if (buf1_read_fail && buf2_read_fail) { +set_default_env ("!bad env area" ); +return -EIO ; + }else if (!buf1_read_fail && buf2_read_fail) { + gd->env_valid =ENV_VALID ; +return env_import ((char *)tmp_env1,1 ); + }else if (buf1_read_fail && !buf2_read_fail) { + gd->env_valid =ENV_REDUND ; +return env_import ((char *)tmp_env2,1 ); + } + crc1_ok =crc32 (0 , tmp_env1->data,ENV_SIZE ) == tmp_env1->crc; crc2_ok = crc32(0, tmp_env2->data, ENV_SIZE) ==
env/mmc.c +2 -21
@@ -290,27 +290,8 @@ static int env_mmc_load(void) read1_fail =read_env (mmc,CONFIG_ENV_SIZE , offset1, tmp_env1); read2_fail =read_env (mmc,CONFIG_ENV_SIZE , offset2, tmp_env2); -if (read1_fail && read2_fail) -puts ("*** Error - No Valid Environment Area found\n" ); -else if (read1_fail || read2_fail) -puts ("*** Warning - some problems detected " -"reading environment; recovered successfully\n" ); - -if (read1_fail && read2_fail) { - errmsg ="!bad CRC" ; - ret = -EIO ; - goto fini; - }else if (!read1_fail && read2_fail) { - gd->env_valid =ENV_VALID ; -env_import ((char *)tmp_env1,1 ); - }else if (read1_fail && !read2_fail) { - gd->env_valid =ENV_REDUND ; -env_import ((char *)tmp_env2,1 ); - }else { -env_import_redund ((char *)tmp_env1, (char *)tmp_env2); - } - - ret =0 ; + ret =env_import_redund ((char *)tmp_env1, read1_fail, (char *)tmp_env2, + read2_fail); fini:fini_mmc_for_env (mmc);
env/nand.c +3 -19
@@ -320,7 +320,7 @@ static int env_nand_load(void)#if defined(ENV_IS_EMBEDDED )return 0 ;#else -int read1_fail =0 , read2_fail =0 ; +int read1_fail, read2_fail;env_t *tmp_env1, *tmp_env2;int ret =0 ;
@@ -336,24 +336,8 @@ static int env_nand_load(void) read1_fail =readenv (CONFIG_ENV_OFFSET , (u_char *) tmp_env1); read2_fail =readenv (CONFIG_ENV_OFFSET_REDUND , (u_char *) tmp_env2); -if (read1_fail && read2_fail) -puts ("*** Error - No Valid Environment Area found\n" ); -else if (read1_fail || read2_fail) -puts ("*** Warning - some problems detected " -"reading environment; recovered successfully\n" ); - -if (read1_fail && read2_fail) { -set_default_env ("!bad env area" ); - goto done; - }else if (!read1_fail && read2_fail) { - gd->env_valid =ENV_VALID ; -env_import ((char *)tmp_env1,1 ); - }else if (read1_fail && !read2_fail) { - gd->env_valid =ENV_REDUND ; -env_import ((char *)tmp_env2,1 ); - }else { -env_import_redund ((char *)tmp_env1, (char *)tmp_env2); - } + ret =env_import_redund ((char *)tmp_env1, read1_fail, (char *)tmp_env2, + read2_fail); done:free (tmp_env1);
env/ubi.c +9 -9
@@ -95,6 +95,7 @@ static int env_ubi_load(void) {ALLOC_CACHE_ALIGN_BUFFER (char, env1_buf,CONFIG_ENV_SIZE );ALLOC_CACHE_ALIGN_BUFFER (char, env2_buf,CONFIG_ENV_SIZE ); +int read1_fail, read2_fail;env_t *tmp_env1, *tmp_env2;/*
@@ -118,21 +119,20 @@ static int env_ubi_load(void)return -EIO ; } -if (ubi_volume_read (CONFIG_ENV_UBI_VOLUME , (void *)tmp_env1, -CONFIG_ENV_SIZE )) { + read1_fail =ubi_volume_read (CONFIG_ENV_UBI_VOLUME , (void *)tmp_env1, + CONFIG_ENV_SIZE)); +if (read1_fail)printf ("\n** Unable to read env from %s:%s **\n" ,CONFIG_ENV_UBI_PART ,CONFIG_ENV_UBI_VOLUME ); - } -if (ubi_volume_read (CONFIG_ENV_UBI_VOLUME_REDUND , (void *)tmp_env2, -CONFIG_ENV_SIZE )) { + read2_fail =ubi_volume_read (CONFIG_ENV_UBI_VOLUME_REDUND , + (void *)tmp_env2, CONFIG_ENV_SIZE)); +if (read2_fail)printf ("\n** Unable to read redundant env from %s:%s **\n" ,CONFIG_ENV_UBI_PART ,CONFIG_ENV_UBI_VOLUME_REDUND ); - } -env_import_redund ((char *)tmp_env1, (char *)tmp_env2); - -return 0 ; +return env_import_redund ((char *)tmp_env1, read1_fail, (char *)tmp_env2, + read2_fail); }#else /* ! CONFIG_SYS_REDUNDAND_ENVIRONMENT */ static int env_ubi_load (void )
include/environment.h +2 -1
@@ -297,7 +297,8 @@ int env_export(env_t *env_out);#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT /* Select and import one of two redundant environments */ -int env_import_redund (const char *buf1,const char *buf2); +int env_import_redund (const char *buf1,int buf1_status, +const char *buf2,int buf2_status);#endif /**
Signature · 1 line
2.11.0
PATCH v2 2/4 env: move more common code to env_import_redund
Quoted 10 lines · Simon Goldschmidt
There is more common code in mmc, nand and ubi env drivers that can be shared by moving to
env_import_redund.For this, a status/error value whether the buffers were loaded are passed as additional parameters to
env_import_redund. Ideally, these are already returned to the env driver by the storage driver. This is the case for mmc, nand and ubi, so for this change, code deduplicated.Signed-off-by Simon Goldschmidt <[email protected]>
Thanks!
Maxime
Signature · 10 lines
Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180131/27fc76c3/attachment.sig>
PATCH v2 2/4 env: move more common code to env_import_redund
In reply to Simon GoldschmidtQuoted 11 lines · Simon Goldschmidt
There is more common code in mmc, nand and ubi env drivers that can be shared by moving to
env_import_redund.For this, a status/error value whether the buffers were loaded are passed as additional parameters to
env_import_redund. Ideally, these are already returned to the env driver by the storage driver. This is the case for mmc, nand and ubi, so for this change, code deduplicated.Signed-off-by Simon Goldschmidt <[email protected]>Acked-by Maxime Ripard <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180201/a29f0688/attachment.sig>
PATCH v2 3/4 env: make env drivers propagate env_import return value
In reply to Simon GoldschmidtFor multiple env drivers to correctly implement fallback when one environment fails to load (e.g. crc error), the return value of env_import has to be propagated by all env driver's load function.
Without this change, the first driver that succeeds to load an environment with an invalid CRC return 0 (success) and no other drivers are checked.
--- env/eeprom.c | 4 +--- env/ext4.c | 3 +-- env/fat.c | 3 +-- env/flash.c | 4 +--- env/mmc.c | 3 +-- env/nand.c | 2 +- env/nvram.c | 4 +--- env/remote.c | 2 +- env/sata.c | 4 +--- env/ubi.c | 4 +--- 10 files changed, 10 insertions(+), 23 deletions(-)
env/eeprom.c +1 -3
@@ -181,9 +181,7 @@ static int env_eeprom_load(void)eeprom_bus_read (CONFIG_SYS_DEF_EEPROM_ADDR , off, (uchar *)buf_env,CONFIG_ENV_SIZE ); -env_import (buf_env,1 ); - -return 0 ; +return env_import (buf_env,1 ); }static int env_eeprom_save (void )
env/ext4.c +1 -2
@@ -114,8 +114,7 @@ static int env_ext4_load(void) goto err_env_relocate; } -env_import (buf,1 ); -return 0 ; +return env_import (buf,1 ); err_env_relocate:set_default_env (NULL );
env/fat.c +1 -2
@@ -117,8 +117,7 @@ static int env_fat_load(void) goto err_env_relocate; } -env_import (buf,1 ); -return 0 ; +return env_import (buf,1 ); err_env_relocate:set_default_env (NULL );
env/flash.c +1 -3
@@ -351,9 +351,7 @@ static int env_flash_load(void) "reading environment; recovered successfully\n\n");#endif /* CONFIG_ENV_ADDR_REDUND */ -env_import ((char *)flash_addr,1 ); - - return 0; + return env_import((char *)flash_addr, 1); }#endif /* LOADENV */
env/mmc.c +1 -2
@@ -332,8 +332,7 @@ static int env_mmc_load(void) goto fini; } -env_import (buf,1 ); - ret =0 ; + ret =env_import (buf,1 ); fini:fini_mmc_for_env (mmc);
env/nand.c +1 -1
@@ -378,7 +378,7 @@ static int env_nand_load(void) return -EIO; } -env_import (buf,1 ); +return env_import (buf,1 );#endif /* ! ENV_IS_EMBEDDED */ return 0 ;
env/nvram.c +1 -3
@@ -60,9 +60,7 @@ static int env_nvram_load(void)#else memcpy (buf, (void *)CONFIG_ENV_ADDR ,CONFIG_ENV_SIZE );#endif -env_import (buf,1 ); - -return 0 ; +return env_import (buf,1 ); }static int env_nvram_save (void )
env/remote.c +1 -1
@@ -49,7 +49,7 @@ static int env_remote_save(void)static int env_remote_load (void ) {#ifndef ENV_IS_EMBEDDED -env_import ((char *)env_ptr,1 ); +return env_import ((char *)env_ptr,1 );#endif return 0 ;
env/sata.c +1 -3
@@ -113,9 +113,7 @@ static void env_sata_load(void)return -EIO ; } -env_import (buf,1 ); - -return 0 ; +return env_import (buf,1 ); }U_BOOT_ENV_LOCATION (sata) = {
env/ubi.c +1 -3
@@ -163,9 +163,7 @@ static int env_ubi_load(void) return -EIO; } -env_import (buf,1 ); - -return 0 ; +return env_import (buf,1 ); }#endif /* CONFIG_SYS_REDUNDAND_ENVIRONMENT */
Signature · 1 line
2.11.0
PATCH v2 3/4 env: make env drivers propagate env_import return value
Quoted 10 lines · Simon Goldschmidt
For multiple env drivers to correctly implement fallback when one environment fails to load (e.g. crc error), the return value of
env_importhas to be propagated by all env driver's load function.Without this change, the first driver that succeeds to load an environment with an invalid CRC return 0 (success) and no other drivers are checked.
Signed-off-by Simon Goldschmidt <[email protected]>
Thanks!
maxime
Signature · 10 lines
Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180131/31e87be6/attachment.sig>
PATCH v2 3/4 env: make env drivers propagate env_import return value
In reply to Simon GoldschmidtQuoted 11 lines · Simon Goldschmidt
For multiple env drivers to correctly implement fallback when one environment fails to load (e.g. crc error), the return value of
env_importhas to be propagated by all env driver's load function.Without this change, the first driver that succeeds to load an environment with an invalid CRC return 0 (success) and no other drivers are checked.
Signed-off-by Simon Goldschmidt <[email protected]>Acked-by Maxime Ripard <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180201/ec7ab8be/attachment.sig>
PATCH v2 4/4 env: sf: use env_import_redund to simplify env_sf_load
In reply to Simon GoldschmidtFor the redundant environment configuration, env_sf_load still contained duplicate code instead of using env_import_redund().
Simplify the code by only executing the load twice and delegating everything else to env_import_redund.
--- env/sf.c | 67 ++++++++-------------------------------------------------------- 1 file changed, 8 insertions(+), 59 deletions(-)
env/sf.c +8 -59
@@ -166,10 +166,8 @@ static int env_sf_save(void)static int env_sf_load (void ) {int ret; -int crc1_ok =0 , crc2_ok =0 ; -env_t *tmp_env1 =NULL ; -env_t *tmp_env2 =NULL ; -env_t *ep =NULL ; +int read1_fail, read2_fail; +env_t *tmp_env1, *tmp_env2; tmp_env1 = (env_t *)memalign (ARCH_DMA_MINALIGN ,CONFIG_ENV_SIZE );
@@ -185,63 +183,14 @@ static int env_sf_load(void)if (ret) goto out; - ret =spi_flash_read (env_flash,CONFIG_ENV_OFFSET , -CONFIG_ENV_SIZE , tmp_env1); -if (ret) { -set_default_env ("!spi_flash_read() failed" ); - goto err_read; - } - -if (crc32 (0 , tmp_env1->data,ENV_SIZE ) == tmp_env1->crc) - crc1_ok =1 ; + read1_fail =spi_flash_read (env_flash,CONFIG_ENV_OFFSET , +CONFIG_ENV_SIZE , tmp_env1); + read2_fail =spi_flash_read (env_flash,CONFIG_ENV_OFFSET_REDUND , +CONFIG_ENV_SIZE , tmp_env2); - ret =spi_flash_read (env_flash,CONFIG_ENV_OFFSET_REDUND , -CONFIG_ENV_SIZE , tmp_env2); -if (!ret) { -if (crc32 (0 , tmp_env2->data,ENV_SIZE ) == tmp_env2->crc) - crc2_ok =1 ; - } + ret =env_import_redund ((char *)tmp_env1, read1_fail, (char *)tmp_env2, + read2_fail); -if (!crc1_ok && !crc2_ok) { -set_default_env ("!bad CRC" ); - ret = -EIO ; - goto err_read; - }else if (crc1_ok && !crc2_ok) { - gd->env_valid =ENV_VALID ; - }else if (!crc1_ok && crc2_ok) { - gd->env_valid =ENV_REDUND ; - }else if (tmp_env1->flags ==ACTIVE_FLAG && - tmp_env2->flags ==OBSOLETE_FLAG ) { - gd->env_valid =ENV_VALID ; - }else if (tmp_env1->flags ==OBSOLETE_FLAG && - tmp_env2->flags ==ACTIVE_FLAG ) { - gd->env_valid =ENV_REDUND ; - }else if (tmp_env1->flags == tmp_env2->flags) { - gd->env_valid =ENV_VALID ; - }else if (tmp_env1->flags ==0xFF ) { - gd->env_valid =ENV_VALID ; - }else if (tmp_env2->flags ==0xFF ) { - gd->env_valid =ENV_REDUND ; - }else { -/* -* this differs from code in env_flash.c, but I think a sane -* default path is desirable. -*/ - gd->env_valid =ENV_VALID ; - } - -if (gd->env_valid ==ENV_VALID ) - ep = tmp_env1; -else - ep = tmp_env2; - - ret =env_import ((char *)ep,0 ); -if (ret) { -pr_err ("Cannot import environment: errno = %d\n" , errno); -set_default_env ("!env_import failed" ); - } - -err_read:spi_flash_free (env_flash); env_flash =NULL ; out:
Signature · 1 line
2.11.0
PATCH v2 4/4 env: sf: use env_import_redund to simplify env_sf_load
Quoted 7 lines · Simon Goldschmidt
For the redundant environment configuration,
env_sf_loadstill contained duplicate code instead of usingenv_import_redund().Simplify the code by only executing the load twice and delegating everything else to
env_import_redund.Signed-off-by Simon Goldschmidt <[email protected]>
Thanks!
Maxime
Signature · 10 lines
Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180131/35468f86/attachment.sig>
PATCH v2 4/4 env: sf: use env_import_redund to simplify env_sf_load
In reply to Simon GoldschmidtQuoted 8 lines · Simon Goldschmidt
For the redundant environment configuration,
env_sf_loadstill contained duplicate code instead of usingenv_import_redund().Simplify the code by only executing the load twice and delegating everything else to
env_import_redund.Signed-off-by Simon Goldschmidt <[email protected]>Acked-by Maxime Ripard <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180201/dcb67fd2/attachment.sig>