Add SHA256 encrypted stop string for autobooting

I might have missed something, but I failed to use the escape char '\' in strings. To pass a printf format string like "foo %d bar\n" via Kconfig to the code.

Right now its not possible to use the escape character '\' in Kconfig string values correctly to e.g. set this string value "test output\n". The '\n' will be converted to 'n'.

The current implementation removes some of the '\' chars from the input string in conf_set_sym_val(). Examples:

'\'     -> ''
'\\'    -> '\'
'\\\'   -> '\'
'\\\\'  -> '\\'

...

And then doubles the backslash chars in the output string in sym_escape_string_value(). Example:

'\'     -> ''   -> ''
'\\'    -> '\'  -> '\\'
'\\\'   -> '\'  -> '\\'
'\\\\'  -> '\\' -> '\\\\'

...

As you see in these examples, its impossible to generate a single '\' charater in the output string as its needed for something like '\n'.

This patch now changes this behavior to not drop some backslashes in conf_set_sym_val() and to not add new backslashes in the resulting output string. Removing the function sym_escape_string_value() completely as its not needed anymore.

2015-05-07 21:13 GMT+09:00 Stefan Roese <[email protected]>:

Quoted 29 lines

I might have missed something, but I failed to use the escape char '\' in strings. To pass a printf format string like "foo %d bar\n" via Kconfig to the code.

Right now its not possible to use the escape character '\' in Kconfig string values correctly to e.g. set this string value "test output\n". The '\n' will be converted to 'n'.

The current implementation removes some of the '\' chars from the input string in conf_set_sym_val(). Examples:

'\'     -> ''
'\\'    -> '\'
'\\\'   -> '\'
'\\\\'  -> '\\'

...

And then doubles the backslash chars in the output string in sym_escape_string_value(). Example:

'\'     -> ''   -> ''
'\\'    -> '\'  -> '\\'
'\\\'   -> '\'  -> '\\'
'\\\\'  -> '\\' -> '\\\\'

...

As you see in these examples, its impossible to generate a single '\' charater in the output string as its needed for something like '\n'.

Quoted 4 lines

This patch now changes this behavior to not drop some backslashes in conf_set_sym_val() and to not add new backslashes in the resulting output string. Removing the function sym_escape_string_value() completely as its not needed anymore.

Interesting.
I did not know this behavior of strings in Kconfig.

I want to see the reaction from linux-kconfig ML.

Hi Masahiro,

Quoted 39 lines · Masahiro Yamada

2015-05-07 21:13 GMT+09:00 Stefan Roese <[email protected]>:

Quoted 27 lines

I might have missed something, but I failed to use the escape char '\' in strings. To pass a printf format string like "foo %d bar\n" via Kconfig to the code.

Right now its not possible to use the escape character '\' in Kconfig string values correctly to e.g. set this string value "test output\n". The '\n' will be converted to 'n'.

The current implementation removes some of the '\' chars from the input string in conf_set_sym_val(). Examples:

'\'     -> ''
'\\'    -> '\'
'\\\'   -> '\'
'\\\\'  -> '\\'

...

And then doubles the backslash chars in the output string in sym_escape_string_value(). Example:

'\'     -> ''   -> ''
'\\'    -> '\'  -> '\\'
'\\\'   -> '\'  -> '\\'
'\\\\'  -> '\\' -> '\\\\'

...

Quoted 7 lines

As you see in these examples, its impossible to generate a single '\' charater in the output string as its needed for something like '\n'.

This patch now changes this behavior to not drop some backslashes in conf_set_sym_val() and to not add new backslashes in the resulting output string. Removing the function sym_escape_string_value() completely as its not needed anymore.

Quoted 2 lines

Interesting.
I did not know this behavior of strings in Kconfig.

Then I'm not the only one. ;)

Quoted 1 line

I want to see the reaction from linux-kconfig ML.

Okay. It makes sense then to send this patch to this list right away. A quick search didn't reveal any results though. Where is this list hosted?

I might have missed something, but I failed to use the escape char '\' in strings. To pass a printf format string like "foo %d bar\n" via Kconfig to the code.

Right now its not possible to use the escape character '\' in Kconfig string values correctly to e.g. set this string value "test output\n". The '\n' will be converted to 'n'.

The current implementation removes some of the '\' chars from the input string in conf_set_sym_val(). Examples:

'\'     -> ''
'\\'    -> '\'
'\\\'   -> '\'
'\\\\'  -> '\\'

...

And then doubles the backslash chars in the output string in sym_escape_string_value(). Example:

'\'     -> ''   -> ''
'\\'    -> '\'  -> '\\'
'\\\'   -> '\'  -> '\\'
'\\\\'  -> '\\' -> '\\\\'

...

As you see in these examples, its impossible to generate a single '\' charater in the output string as its needed for something like '\n'.

This patch now changes this behavior to not drop some backslashes in conf_set_sym_val() and to not add new backslashes in the resulting output string. Removing the function sym_escape_string_value() completely as its not needed anymore.

Signed-off-by Stefan Roese <[email protected]>

Cc Masahiro Yamada <[email protected]>

Cc Simon Glass <[email protected]>

---

 scripts/kconfig/confdata.c | 20 +++++++++-----------
 scripts/kconfig/symbol.c   | 43 -------------------------------------------
 2 files changed, 9 insertions(+), 54 deletions(-)

Quoted 34 lines · Stefan Roese

I might have missed something, but I failed to use the escape char '\' in strings. To pass a printf format string like "foo %d bar\n" via Kconfig to the code.

Right now its not possible to use the escape character '\' in Kconfig string values correctly to e.g. set this string value "test output\n". The '\n' will be converted to 'n'.

The current implementation removes some of the '\' chars from the input string in conf_set_sym_val(). Examples:

'\'     -> ''
'\\'    -> '\'
'\\\'   -> '\'
'\\\\'  -> '\\'

...

And then doubles the backslash chars in the output string in sym_escape_string_value(). Example:

'\'     -> ''   -> ''
'\\'    -> '\'  -> '\\'
'\\\'   -> '\'  -> '\\'
'\\\\'  -> '\\' -> '\\\\'

...

As you see in these examples, its impossible to generate a single '\' charater in the output string as its needed for something like '\n'.

This patch now changes this behavior to not drop some backslashes in conf_set_sym_val() and to not add new backslashes in the resulting output string. Removing the function sym_escape_string_value() completely as its not needed anymore.

Quoted 8 lines

Signed-off-by Stefan Roese <[email protected]>

Cc Masahiro Yamada <[email protected]>

Cc Simon Glass <[email protected]>

---

  scripts/kconfig/confdata.c | 20 +++++++++-----------
  scripts/kconfig/symbol.c   | 43 -------------------------------------------
  2 files changed, 9 insertions(+), 54 deletions(-)

This looks right to me. But I do see one problem - the default string for CONFIG_AUTOBOOT_PROMPT appears as:

"Autoboot in %d secondsn"

so something is still removing the \ in the Kconfig default;

Quoted 45 lines · Simon Glass

Quoted 43 lines · Stefan Roese

I might have missed something, but I failed to use the escape char '\' in strings. To pass a printf format string like "foo %d bar\n" via Kconfig to the code.

Right now its not possible to use the escape character '\' in Kconfig string values correctly to e.g. set this string value "test output\n". The '\n' will be converted to 'n'.

The current implementation removes some of the '\' chars from the input string in conf_set_sym_val(). Examples:

'\'     -> ''
'\\'    -> '\'
'\\\'   -> '\'
'\\\\'  -> '\\'

...

And then doubles the backslash chars in the output string in sym_escape_string_value(). Example:

'\'     -> ''   -> ''
'\\'    -> '\'  -> '\\'
'\\\'   -> '\'  -> '\\'
'\\\\'  -> '\\' -> '\\\\'

...

As you see in these examples, its impossible to generate a single '\' charater in the output string as its needed for something like '\n'.

This patch now changes this behavior to not drop some backslashes in conf_set_sym_val() and to not add new backslashes in the resulting output string. Removing the function sym_escape_string_value() completely as its not needed anymore.

Signed-off-by Stefan Roese <[email protected]>

Cc Masahiro Yamada <[email protected]>

Cc Simon Glass <[email protected]>

---

  scripts/kconfig/confdata.c | 20 +++++++++-----------
  scripts/kconfig/symbol.c   | 43
-------------------------------------------
  2 files changed, 9 insertions(+), 54 deletions(-)

Quoted 6 lines

This looks right to me. But I do see one problem - the default string for CONFIG_AUTOBOOT_PROMPT appears as:

"Autoboot in %d secondsn"

so something is still removing the \ in the Kconfig default;

Right. Thanks for spotting. I'll fix this in v3.

Hi Simon, Hi Masahiro,

Quoted 53 lines · Stefan Roese

Quoted 51 lines · Simon Glass

Quoted 38 lines · Stefan Roese

I might have missed something, but I failed to use the escape char '\' in strings. To pass a printf format string like "foo %d bar\n" via Kconfig to the code.

Right now its not possible to use the escape character '\' in Kconfig string values correctly to e.g. set this string value "test output\n". The '\n' will be converted to 'n'.

The current implementation removes some of the '\' chars from the input string in conf_set_sym_val(). Examples:

'\'     -> ''
'\\'    -> '\'
'\\\'   -> '\'
'\\\\'  -> '\\'

...

And then doubles the backslash chars in the output string in sym_escape_string_value(). Example:

'\'     -> ''   -> ''
'\\'    -> '\'  -> '\\'
'\\\'   -> '\'  -> '\\'
'\\\\'  -> '\\' -> '\\\\'

...

As you see in these examples, its impossible to generate a single '\' charater in the output string as its needed for something like '\n'.

This patch now changes this behavior to not drop some backslashes in conf_set_sym_val() and to not add new backslashes in the resulting output string. Removing the function sym_escape_string_value() completely as its not needed anymore.

Signed-off-by Stefan Roese <[email protected]>

Cc Masahiro Yamada <[email protected]>

Cc Simon Glass <[email protected]>

Quoted 6 lines

---

  scripts/kconfig/confdata.c | 20 +++++++++-----------
  scripts/kconfig/symbol.c   | 43
-------------------------------------------
  2 files changed, 9 insertions(+), 54 deletions(-)

This looks right to me. But I do see one problem - the default string for CONFIG_AUTOBOOT_PROMPT appears as:

Quoted 6 lines

Quoted 3 lines

"Autoboot in %d secondsn"

so something is still removing the \ in the Kconfig default;

Right. Thanks for spotting. I'll fix this in v3.

I could easily change the default string in the Kconfig file to "Autoboot in %d seconds\\n". This works. But its a different syntax regarding using the escape character backslash compared to editing the .config file or editing the string in "make menuconfig etc...". So I hesitate to "fix" it this way.

Unfortunately fixing this issue in the code is not that easy. At least not for me. As the default values of the "string values" are set in the conf_parse() function (in scripts/kconfig/zconf.y). And I really have absolutely no experience with yacc / bison. Perhaps one of you guys has a quick fix to make this default value of strings compatible again so that this additional '\' is not needed in the Kconfig file?

Hi Stefan,

Quoted 70 lines · Stefan Roese

Hi Simon, Hi Masahiro,

Quoted 53 lines · Stefan Roese

Quoted 51 lines · Simon Glass

Quoted 38 lines · Stefan Roese

I might have missed something, but I failed to use the escape char '\' in strings. To pass a printf format string like "foo %d bar\n" via Kconfig to the code.

Right now its not possible to use the escape character '\' in Kconfig string values correctly to e.g. set this string value "test output\n". The '\n' will be converted to 'n'.

The current implementation removes some of the '\' chars from the input string in conf_set_sym_val(). Examples:

'\'     -> ''
'\\'    -> '\'
'\\\'   -> '\'
'\\\\'  -> '\\'

...

And then doubles the backslash chars in the output string in sym_escape_string_value(). Example:

'\'     -> ''   -> ''
'\\'    -> '\'  -> '\\'
'\\\'   -> '\'  -> '\\'
'\\\\'  -> '\\' -> '\\\\'

...

As you see in these examples, its impossible to generate a single '\' charater in the output string as its needed for something like '\n'.

This patch now changes this behavior to not drop some backslashes in conf_set_sym_val() and to not add new backslashes in the resulting output string. Removing the function sym_escape_string_value() completely as its not needed anymore.

Signed-off-by Stefan Roese <[email protected]>

Cc Masahiro Yamada <[email protected]>

Cc Simon Glass <[email protected]>

Quoted 6 lines

---

  scripts/kconfig/confdata.c | 20 +++++++++-----------
  scripts/kconfig/symbol.c   | 43
-------------------------------------------
  2 files changed, 9 insertions(+), 54 deletions(-)

This looks right to me. But I do see one problem - the default string for CONFIG_AUTOBOOT_PROMPT appears as:

Quoted 6 lines

Quoted 3 lines

"Autoboot in %d secondsn"

so something is still removing the \ in the Kconfig default;

Right. Thanks for spotting. I'll fix this in v3.

I could easily change the default string in the Kconfig file to "Autoboot in %d seconds\\n". This works. But its a different syntax regarding using the escape character backslash compared to editing the .config file or editing the string in "make menuconfig etc...". So I hesitate to "fix" it this way.

Quoted 6 lines

Unfortunately fixing this issue in the code is not that easy. At least not for me. As the default values of the "string values" are set in the conf_parse() function (in scripts/kconfig/zconf.y). And I really have absolutely no experience with yacc / bison. Perhaps one of you guys has a quick fix to make this default value of strings compatible again so that this additional '\' is not needed in the Kconfig file?

Well I am familiar with those tools but I think Masahiro probably knows a lot more here.

Hi, Simon, Stefan,

2015-05-12 7:41 GMT+09:00 Simon Glass <[email protected]>:

Quoted 80 lines

Hi Stefan,

Quoted 70 lines · Stefan Roese

Hi Simon, Hi Masahiro,

Quoted 53 lines · Stefan Roese

Quoted 51 lines · Simon Glass

Quoted 38 lines · Stefan Roese

I might have missed something, but I failed to use the escape char '\' in strings. To pass a printf format string like "foo %d bar\n" via Kconfig to the code.

Right now its not possible to use the escape character '\' in Kconfig string values correctly to e.g. set this string value "test output\n". The '\n' will be converted to 'n'.

The current implementation removes some of the '\' chars from the input string in conf_set_sym_val(). Examples:

'\'     -> ''
'\\'    -> '\'
'\\\'   -> '\'
'\\\\'  -> '\\'

...

And then doubles the backslash chars in the output string in sym_escape_string_value(). Example:

'\'     -> ''   -> ''
'\\'    -> '\'  -> '\\'
'\\\'   -> '\'  -> '\\'
'\\\\'  -> '\\' -> '\\\\'

...

As you see in these examples, its impossible to generate a single '\' charater in the output string as its needed for something like '\n'.

This patch now changes this behavior to not drop some backslashes in conf_set_sym_val() and to not add new backslashes in the resulting output string. Removing the function sym_escape_string_value() completely as its not needed anymore.

Signed-off-by Stefan Roese <[email protected]>

Cc Masahiro Yamada <[email protected]>

Cc Simon Glass <[email protected]>

Quoted 6 lines

---

   scripts/kconfig/confdata.c | 20 +++++++++-----------
   scripts/kconfig/symbol.c   | 43
-------------------------------------------
   2 files changed, 9 insertions(+), 54 deletions(-)

This looks right to me. But I do see one problem - the default string for CONFIG_AUTOBOOT_PROMPT appears as:

Quoted 6 lines

Quoted 3 lines

"Autoboot in %d secondsn"

so something is still removing the \ in the Kconfig default;

Right. Thanks for spotting. I'll fix this in v3.

I could easily change the default string in the Kconfig file to "Autoboot in %d seconds\\n". This works. But its a different syntax regarding using the escape character backslash compared to editing the .config file or editing the string in "make menuconfig etc...". So I hesitate to "fix" it this way.

Quoted 6 lines

Unfortunately fixing this issue in the code is not that easy. At least not for me. As the default values of the "string values" are set in the conf_parse() function (in scripts/kconfig/zconf.y). And I really have absolutely no experience with yacc / bison. Perhaps one of you guys has a quick fix to make this default value of strings compatible again so that this additional '\' is not needed in the Kconfig file?

Quoted 2 lines

Well I am familiar with those tools but I think Masahiro probably knows a lot more here.

I am not so familiar with Bison, and I am getting a bit busy these days. So, I cannot find time to take a close look. Sorry.

If Simon (or someone else) could follow it up, that'd be nice.

BTW, if you have already figured out that conf_parse() is the cause of the problem,
you do not have to invoke Bison.

Bison does not touch the C part.
conf_parse() is just copied verbatim from zconf.y to zconf.tab.c_shipped.

You can modify conf_parse() exactly in the same way in both of them.

Hi Masahiro,

Quoted 113 lines · Masahiro Yamada

Hi, Simon, Stefan,

2015-05-12 7:41 GMT+09:00 Simon Glass <[email protected]>:

Quoted 98 lines

Hi Stefan,

Quoted 84 lines · Stefan Roese

Hi Simon, Hi Masahiro,

Quoted 60 lines · Stefan Roese

Quoted 57 lines · Simon Glass

Quoted 42 lines · Stefan Roese

I might have missed something, but I failed to use the escape char '\'
in strings. To pass a printf format string like "foo %d bar\n" via Kconfig to the code.

Right now its not possible to use the escape character '\' in Kconfig string values correctly to e.g. set this string value "test output\n".
The '\n' will be converted to 'n'.

The current implementation removes some of the '\' chars from the input
string in conf_set_sym_val(). Examples:

'\'     -> ''
'\\'    -> '\'
'\\\'   -> '\'
'\\\\'  -> '\\'

...

And then doubles the backslash chars in the output string in sym_escape_string_value(). Example:

'\'     -> ''   -> ''
'\\'    -> '\'  -> '\\'
'\\\'   -> '\'  -> '\\'
'\\\\'  -> '\\' -> '\\\\'

...

As you see in these examples, its impossible to generate a single '\' charater in the output string as its needed for something like '\n'.

This patch now changes this behavior to not drop some backslashes in conf_set_sym_val() and to not add new backslashes in the resulting output string. Removing the function sym_escape_string_value() completely as its not needed anymore.

Signed-off-by Stefan Roese <[email protected]>

Cc Masahiro Yamada <[email protected]>

Cc Simon Glass <[email protected]>

Quoted 6 lines

---

   scripts/kconfig/confdata.c | 20 +++++++++-----------
   scripts/kconfig/symbol.c   | 43
-------------------------------------------
   2 files changed, 9 insertions(+), 54 deletions(-)

This looks right to me. But I do see one problem - the default string for CONFIG_AUTOBOOT_PROMPT appears as:

Quoted 7 lines

Quoted 3 lines

"Autoboot in %d secondsn"

so something is still removing the \ in the Kconfig default;

Right. Thanks for spotting. I'll fix this in v3.

I could easily change the default string in the Kconfig file to "Autoboot in
%d seconds\\n". This works. But its a different syntax regarding using the
escape character backslash compared to editing the .config file or editing
the string in "make menuconfig etc...". So I hesitate to "fix" it this way.

Quoted 8 lines

Unfortunately fixing this issue in the code is not that easy. At least not
for me. As the default values of the "string values" are set in the conf_parse() function (in scripts/kconfig/zconf.y). And I really have absolutely no experience with yacc / bison. Perhaps one of you guys has a
quick fix to make this default value of strings compatible again so that this additional '\' is not needed in the Kconfig file?

Quoted 2 lines

Well I am familiar with those tools but I think Masahiro probably knows a lot more here.

I am not so familiar with Bison, and I am getting a bit busy these days. So, I cannot find time to take a close look. Sorry.

If Simon (or someone else) could follow it up, that'd be nice.

Quoted 8 lines

BTW, if you have already figured out that conf_parse() is the cause of the problem,
you do not have to invoke Bison.

Bison does not touch the C part.
conf_parse() is just copied verbatim from zconf.y to zconf.tab.c_shipped.

You can modify conf_parse() exactly in the same way in both of them.

Thanks. Did it and found that zconfparse() is responsible for this default value configuration / parsing. I must be missing something, but I fail to see where this function is really implemented:

$ git grep zconfparse
scripts/kconfig/lkc.h:int zconfparse(void);
scripts/kconfig/zconf.tab.c_shipped:#define yyparse         zconfparse
scripts/kconfig/zconf.tab.c_shipped:    zconfparse();
scripts/kconfig/zconf.y:        zconfparse();

These defines for a 2nd autoboot stop and delay string are nearly unused. Only sc3 defines CONFIG_AUTOBOOT_DELAY_STR2. And a patch to remove this most likely unmaintained board is also posted to the list.

By removing these defines the code will become cleaner and moving the remaining compile options to Kconfig will get easier.

Signed-off-by Stefan Roese <[email protected]>

Cc Simon Glass <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Heiko Schocher <[email protected]>

---

 README              |  2 --
 common/autoboot.c   | 14 ++------------
 doc/README.autoboot | 10 ----------
 3 files changed, 2 insertions(+), 24 deletions(-)

These defines for a 2nd autoboot stop and delay string are nearly unused. Only sc3 defines CONFIG_AUTOBOOT_DELAY_STR2. And a patch to remove this most likely unmaintained board is also posted to the list.

By removing these defines the code will become cleaner and moving the remaining compile options to Kconfig will get easier.

Signed-off-by Stefan Roese <[email protected]>

Cc Simon Glass <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Heiko Schocher <[email protected]>

This patch moves the following config options to Kconfig:

CONFIG_AUTOBOOT_KEYED
CONFIG_AUTOBOOT_PROMPT
CONFIG_AUTOBOOT_DELAY_STR
CONFIG_AUTOBOOT_STOP_STR
AUTOBOOT_KEYED_CTRLC

Signed-off-by Stefan Roese <[email protected]>

Cc Masahiro Yamada <[email protected]>

Cc Simon Glass <[email protected]>

---

 common/Kconfig                           | 64 ++++++++++++++++++++++++++++++++
 common/autoboot.c                        |  6 ++-
 configs/CPCI4052_defconfig               |  3 ++
 configs/O2DNT2_RAMBOOT_defconfig         |  3 ++
 configs/O2DNT2_defconfig                 |  3 ++
 configs/PLU405_defconfig                 |  3 ++
 configs/PMC405DE_defconfig               |  3 ++
 configs/PMC440_defconfig                 |  3 ++
 configs/UCP1020_SPIFLASH_defconfig       |  3 ++
 configs/UCP1020_defconfig                |  3 ++
 configs/a4m072_defconfig                 |  3 ++
 configs/atngw100_defconfig               |  4 ++
 configs/atngw100mkii_defconfig           |  4 ++
 configs/atstk1002_defconfig              |  4 ++
 configs/atstk1003_defconfig              |  4 ++
 configs/atstk1004_defconfig              |  4 ++
 configs/atstk1006_defconfig              |  4 ++
 configs/calimain_defconfig               |  2 +
 configs/cpuat91_defconfig                |  4 ++
 configs/cpuat91_ram_defconfig            |  3 ++
 configs/digsy_mtc_RAMBOOT_defconfig      |  3 ++
 configs/digsy_mtc_defconfig              |  3 ++
 configs/digsy_mtc_rev5_RAMBOOT_defconfig |  3 ++
 configs/digsy_mtc_rev5_defconfig         |  3 ++
 configs/dlvision-10g_defconfig           |  2 +
 configs/draco_defconfig                  |  3 ++
 configs/dxr2_defconfig                   |  3 ++
 configs/favr-32-ezkit_defconfig          |  4 ++
 configs/gdppc440etx_defconfig            |  2 +
 configs/grasshopper_defconfig            |  4 ++
 configs/hammerhead_defconfig             |  4 ++
 configs/highbank_defconfig               |  3 ++
 configs/hrcon_defconfig                  |  2 +
 configs/ids8313_defconfig                |  3 ++
 configs/intip_defconfig                  |  2 +
 configs/io64_defconfig                   |  2 +
 configs/io_defconfig                     |  2 +
 configs/iocon_defconfig                  |  2 +
 configs/ip04_defconfig                   |  1 +
 configs/motionpro_defconfig              |  3 ++
 configs/nokia_rx51_defconfig             |  1 +
 configs/omap3_mvblx_defconfig            |  2 +
 configs/ph1_ld4_defconfig                |  4 ++
 configs/ph1_pro4_defconfig               |  4 ++
 configs/ph1_sld8_defconfig               |  4 ++
 configs/pm9263_defconfig                 |  1 +
 configs/pxm2_defconfig                   |  3 ++
 configs/rut_defconfig                    |  3 ++
 configs/spear600_defconfig               |  3 ++
 configs/stv0991_defconfig                |  3 ++
 configs/x600_defconfig                   |  3 ++
 configs/zmx25_defconfig                  |  4 ++
 include/configs/CPCI4052.h               |  6 ---
 include/configs/PLU405.h                 |  9 -----
 include/configs/PMC405DE.h               |  6 ---
 include/configs/PMC440.h                 |  6 ---
 include/configs/UCP1020.h                | 11 ------
 include/configs/a4m072.h                 |  4 --
 include/configs/atngw100.h               | 10 -----
 include/configs/atngw100mkii.h           | 10 -----
 include/configs/atstk1002.h              | 10 -----
 include/configs/atstk1003.h              | 10 -----
 include/configs/atstk1004.h              | 10 -----
 include/configs/atstk1006.h              | 10 -----
 include/configs/bf537-stamp.h            |  4 --
 include/configs/calimain.h               |  2 -
 include/configs/cpuat91.h                |  6 ---
 include/configs/digsy_mtc.h              |  4 --
 include/configs/dlvision-10g.h           |  2 -
 include/configs/favr-32-ezkit.h          | 10 -----
 include/configs/gdppc440etx.h            |  2 -
 include/configs/grasshopper.h            | 10 -----
 include/configs/hammerhead.h             | 10 -----
 include/configs/highbank.h               |  4 +-
 include/configs/hrcon.h                  |  2 -
 include/configs/ids8313.h                |  4 --
 include/configs/intip.h                  |  2 -
 include/configs/io.h                     |  2 -
 include/configs/io64.h                   |  2 -
 include/configs/iocon.h                  |  2 -
 include/configs/ip04.h                   |  1 -
 include/configs/motionpro.h              |  6 ---
 include/configs/nokia_rx51.h             |  1 -
 include/configs/o2dnt-common.h           | 12 ------
 include/configs/omap3_mvblx.h            |  2 -
 include/configs/pm9263.h                 |  1 -
 include/configs/siemens-am33x-common.h   |  6 ---
 include/configs/spear-common.h           |  4 --
 include/configs/stv0991.h                |  4 --
 include/configs/uniphier.h               |  5 ---
 include/configs/x600.h                   |  4 --
 include/configs/zmx25.h                  |  4 --
 92 files changed, 219 insertions(+), 220 deletions(-)

common/Kconfig +6 -0

index 15759f7..ff150f0 100644
@@ -17,6 +17,70 @@ config SYS_HUSH_PARSER
        help
          Backward compatibility.
 
+menu "Autoboot options"
+
+config AUTOBOOT_KEYED
+       bool "Stop autobooting via specific input key / string"
+       default n
+       help

Hi Stefan,

Quoted 11 lines · Stefan Roese

This patch moves the following config options to Kconfig:

CONFIG_AUTOBOOT_KEYED
CONFIG_AUTOBOOT_PROMPT
CONFIG_AUTOBOOT_DELAY_STR
CONFIG_AUTOBOOT_STOP_STR
AUTOBOOT_KEYED_CTRLC

Signed-off-by Stefan Roese <[email protected]>

Cc Masahiro Yamada <[email protected]>

Cc Simon Glass <[email protected]>

2015-05-08 8:51 GMT+09:00 Simon Glass <[email protected]>:

Quoted 11 lines

Hi Stefan,

Quoted 8 lines · Stefan Roese

This patch moves the following config options to Kconfig:

CONFIG_AUTOBOOT_KEYED
CONFIG_AUTOBOOT_PROMPT
CONFIG_AUTOBOOT_DELAY_STR
CONFIG_AUTOBOOT_STOP_STR
AUTOBOOT_KEYED_CTRLC

Quoted 3 lines

Quoted 3 lines

Signed-off-by Stefan Roese <[email protected]>

Cc Masahiro Yamada <[email protected]>

Cc Simon Glass <[email protected]>

Thanks for working on a task requiring much effort.

I am just wondering if we need not move the prompt messages verbatim to Kconfig.

I know CONFIG_AUTOBOOT_PROMPT provides us the best flexibility, but the messages are most likely "autoboot in %d seconds" or "Press ...".

Can we put the message directly into common/autoboot.c like this?

  #ifdef CONFIG_SHOW_AUTOBOOT_PROMPT
         printf("Autoboot in %d seconds\n", CONFIG_BOOTDELAY);
         printf("Press %c to abort in %d seconds\n", CONFIG_AUTOBOOT_STOP_STR);
  #endif

I think I am missing some things here:
- Those boards that require a password do not want to show it
- We need to convert " " to user-visible "<SPACE>" if
CONFIG_AUTOBOOT_STOP_STP == " "

Any ideas?

Quoted 13 lines · Stefan Roese

This patch moves the following config options to Kconfig:

CONFIG_AUTOBOOT_KEYED
CONFIG_AUTOBOOT_PROMPT
CONFIG_AUTOBOOT_DELAY_STR
CONFIG_AUTOBOOT_STOP_STR
AUTOBOOT_KEYED_CTRLC

Signed-off-by Stefan Roese <[email protected]>

Cc Masahiro Yamada <[email protected]>

Cc Simon Glass <[email protected]>

---

Quoted 19 lines

common/Kconfig +11 -0

index 15759f7..ff150f0 100644
@@ -17,6 +17,70 @@ config SYS_HUSH_PARSER
         help
           Backward compatibility.
 
+menu "Autoboot options"
+
+config AUTOBOOT_KEYED
+       bool "Stop autobooting via specific input key / string"
+       default n
+       help
+         This option enables stopping (aborting) of the automatic
+         boot feature only by issuing a specific input key or
+         string. If not enabled, any input key will abort the
+         U-Boot automatic booting process and bring the device
+         to the U-Boot prompt for user input.

common/Kconfig config SYS_HUSH_PARSER · line 35

Quoted 5 lines

common/Kconfig +5 -0

+
+config AUTOBOOT_PROMPT
+       string "Autoboot stop prompt"
+       depends on AUTOBOOT_KEYED
+       default "Autoboot in %d seconds\n"

Doesn't this mean that the autoboot message will always be printed? I wonder if we need a separate 'AUTOBOOT' to enable the feature?

Hi Simon,

Quoted 16 lines · Simon Glass

Quoted 14 lines · Stefan Roese

This patch moves the following config options to Kconfig:

CONFIG_AUTOBOOT_KEYED
CONFIG_AUTOBOOT_PROMPT
CONFIG_AUTOBOOT_DELAY_STR
CONFIG_AUTOBOOT_STOP_STR
AUTOBOOT_KEYED_CTRLC

Signed-off-by Stefan Roese <[email protected]>

Cc Masahiro Yamada <[email protected]>

Cc Simon Glass <[email protected]>

---

<snip>

Quoted 20 lines

Quoted 20 lines

common/Kconfig +12 -0

index 15759f7..ff150f0 100644
@@ -17,6 +17,70 @@ config SYS_HUSH_PARSER
         help
           Backward compatibility.
 
+menu "Autoboot options"
+
+config AUTOBOOT_KEYED
+       bool "Stop autobooting via specific input key / string"
+       default n
+       help
+         This option enables stopping (aborting) of the automatic
+         boot feature only by issuing a specific input key or
+         string. If not enabled, any input key will abort the
+         U-Boot automatic booting process and bring the device
+         to the U-Boot prompt for user input.
+

Quoted 8 lines

common/Kconfig config SYS_HUSH_PARSER · line 35

Quoted 4 lines

common/Kconfig +4 -0

+config AUTOBOOT_PROMPT
+       string "Autoboot stop prompt"
+       depends on AUTOBOOT_KEYED
+       default "Autoboot in %d seconds\n"

Doesn't this mean that the autoboot message will always be printed? I wonder if we need a separate 'AUTOBOOT' to enable the feature?

AUTOBOOT_PROMPT is enabled now via AUTOBOOT_KEYED. Most boards don't enable this option, so nothing is changed for those boards.

This patch adds the feature to only stop the autobooting, and therefor boot into the U-Boot prompt, when the input string / password matches a values that is encypted via a SHA256 hash and saved in the environment.

This feature is enabled by defined these config options:
CONFIG_AUTOBOOT_KEYED CONFIG_AUTOBOOT_STOP_STR_SHA256

common/autoboot.c +20 -0

+       /*
+        * Generate the binary value from the environment hash value
+        * so that we can compare this value with the computed hash
+        * from the user input
+        */
+       for (i = 0; i < SHA256_SUM_LEN; i++) {
+               char chr[3];
+
+               strncpy(chr, &sha_env_str[i * 2], 2);
+               sha_env[i] = simple_strtoul(chr, NULL, 16);
+       }
+
+       /*
+        * We don't know how long the stop-string is, so we need to
+        * generate the sha256 hash upon each input character and
+        * compare the value with the one saved in the environment
+        */
+       do {
+               if (tstc()) {
+                       presskey[presskey_len++] = getc();

This patch adds the feature to only stop the autobooting, and therefor boot into the U-Boot prompt, when the input string / password matches a values that is encypted via a SHA256 hash and saved in the environment.

This feature is enabled by defined these config options:
CONFIG_AUTOBOOT_KEYED CONFIG_AUTOBOOT_STOP_STR_SHA256

Signed-off-by Stefan Roese <[email protected]>

Cc Simon Glass <[email protected]>

Cc Magnus Lilja <[email protected]>

---
v2:
- AUTOBOOT_STOP_STR_SHA256 is a string and not bool
- Add input key length check as suggested by Magnus
- Add "constant-length" time compare function as suggested by Magnus

 common/Kconfig    |  20 +++++++--
 common/autoboot.c | 132 +++++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 128 insertions(+), 24 deletions(-)

common/Kconfig +17 -3

index ff150f0..71c5c10 100644
@@ -45,9 +45,14 @@ config AUTOBOOT_PROMPT
          the responsibility of the user to select only such arguments
          that are valid in the given context.
 
+config AUTOBOOT_ENCRYPTION
+       bool "Enable encryption in autoboot stopping"
+       depends on AUTOBOOT_KEYED
+       default n
+
 config AUTOBOOT_DELAY_STR
        string "Delay autobooting via specific input key / string"
-       depends on AUTOBOOT_KEYED
+       depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
        help
          This option delays the automatic boot feature by issuing
          a specific input key or string. If CONFIG_AUTOBOOT_DELAY_STR

@@ -59,7 +64,7 @@ config AUTOBOOT_DELAY_STR
 
 config AUTOBOOT_STOP_STR
        string "Stop autobooting via specific input key / string"
-       depends on AUTOBOOT_KEYED
+       depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
        help
          This option enables stopping (aborting) of the automatic
          boot feature only by issuing a specific input key or

@@ -71,7 +76,7 @@ config AUTOBOOT_STOP_STR
 
 config AUTOBOOT_KEYED_CTRLC
        bool "Enable Ctrl-C autoboot interruption"
-       depends on AUTOBOOT_KEYED
+       depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
        default n
        help
          This option allows for the boot sequence to be interrupted

@@ -79,6 +84,15 @@ config AUTOBOOT_KEYED_CTRLC
          Setting this variable provides an escape sequence from the
          limited "password" strings.
 
+config AUTOBOOT_STOP_STR_SHA256
+       string "Stop autobooting via SHA256 encrypted password"
+       depends on AUTOBOOT_KEYED && AUTOBOOT_ENCRYPTION
+       help
+         This option adds the feature to only stop the autobooting,
+         and therefore boot into the U-Boot prompt, when the input
+         string / password matches a values that is encypted via
+         a SHA256 hash and saved in the environment.
+
 endmenu
 
 comment "Commands"

common/autoboot.c +35 -5

index f72eb18..dde3d04 100644
@@ -12,6 +12,7 @@
 #include <fdtdec.h>
 #include <menu.h>
 #include <post.h>
+#include <u-boot/sha256.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

@@ -26,15 +27,80 @@ DECLARE_GLOBAL_DATA_PTR;
 /* Stored value of bootdelay, used by autoboot_command() */
 static int stored_bootdelay;
 
-/***************************************************************************
- * Watch for 'delay' seconds for autoboot stop or autoboot delay string.
- * returns: 0 -  no key string, allow autoboot 1 - got key string, abort
+#if defined(CONFIG_AUTOBOOT_KEYED)
+#if defined(CONFIG_AUTOBOOT_STOP_STR_SHA256)
+
+/*
+ * Use a "constant-length" time compare function for this
+ * hash compare:
+ *
+ * https://crackstation.net/hashing-security.htm
  */
-# if defined(CONFIG_AUTOBOOT_KEYED)
-static int abortboot_keyed(int bootdelay)
+static int slow_equals(u8 *a, u8 *b, int len)
+{
+       int diff = 0;
+       int i;
+
+       for (i = 0; i < len; i++)
+               diff |= a[i] ^ b[i];
+
+       return diff == 0;
+}
+
+static int passwd_abort(uint64_t etime)
+{
+       const char *sha_env_str = getenv("bootstopkeysha256");
+       u8 sha_env[SHA256_SUM_LEN];
+       u8 sha[SHA256_SUM_LEN];
+       char presskey[MAX_DELAY_STOP_STR];
+       u_int presskey_len = 0;
+       int i;
+       int abort = 0;
+
+       if (sha_env_str == NULL)
+               sha_env_str = CONFIG_AUTOBOOT_STOP_STR_SHA256;
+
+       /*
+        * Generate the binary value from the environment hash value

common/autoboot.c +6 -0

+       /*
+        * We don't know how long the stop-string is, so we need to
+        * generate the sha256 hash upon each input character and
+        * compare the value with the one saved in the environment
+        */
+       do {

common/autoboot.c +50 -17

+
+                       /* And check if sha matches saved value in env */
+                       if (slow_equals(sha, sha_env, SHA256_SUM_LEN))
+                               abort = 1;
+               }
+       } while (!abort && get_ticks() <= etime);
+
+       return abort;
+}
+#else
+static int passwd_abort(uint64_t etime)
 {
        int abort = 0;
-       uint64_t etime = endtick(bootdelay);
        struct {
                char *str;
                u_int len;

@@ -42,7 +108,9 @@ static int abortboot_keyed(int bootdelay)
        }
        delaykey[] = {
                { .str = getenv("bootdelaykey"),  .retry = 1 },
+               { .str = getenv("bootdelaykey2"), .retry = 1 },
                { .str = getenv("bootstopkey"),   .retry = 0 },
+               { .str = getenv("bootstopkey2"),  .retry = 0 },
        };
 
        char presskey[MAX_DELAY_STOP_STR];

@@ -50,26 +118,21 @@ static int abortboot_keyed(int bootdelay)
        u_int presskey_max = 0;
        u_int i;
 
-#ifndef CONFIG_ZERO_BOOTDELAY_CHECK
-       if (bootdelay == 0)
-               return 0;
-#endif
-
-#  ifdef CONFIG_AUTOBOOT_PROMPT
-       /*
-        * CONFIG_AUTOBOOT_PROMPT includes the %d for all boards.
-        * To print the bootdelay value upon bootup.
-        */
-       printf(CONFIG_AUTOBOOT_PROMPT, bootdelay);
-#  endif
-
 #  ifdef CONFIG_AUTOBOOT_DELAY_STR
        if (delaykey[0].str == NULL)
                delaykey[0].str = CONFIG_AUTOBOOT_DELAY_STR;
 #  endif
-#  ifdef CONFIG_AUTOBOOT_STOP_STR
+#  ifdef CONFIG_AUTOBOOT_DELAY_STR2
        if (delaykey[1].str == NULL)
-               delaykey[1].str = CONFIG_AUTOBOOT_STOP_STR;
+               delaykey[1].str = CONFIG_AUTOBOOT_DELAY_STR2;
+#  endif
+#  ifdef CONFIG_AUTOBOOT_STOP_STR
+       if (delaykey[2].str == NULL)
+               delaykey[2].str = CONFIG_AUTOBOOT_STOP_STR;
+#  endif
+#  ifdef CONFIG_AUTOBOOT_STOP_STR2
+       if (delaykey[3].str == NULL)
+               delaykey[3].str = CONFIG_AUTOBOOT_STOP_STR2;
 #  endif
 
        for (i = 0; i < sizeof(delaykey) / sizeof(delaykey[0]); i++) {

@@ -119,6 +182,33 @@ static int abortboot_keyed(int bootdelay)
                }
        } while (!abort && get_ticks() <= etime);
 
+       return abort;
+}
+#endif
+
+/***************************************************************************
+ * Watch for 'delay' seconds for autoboot stop or autoboot delay string.
+ * returns: 0 -  no key string, allow autoboot 1 - got key string, abort
+ */
+static int abortboot_keyed(int bootdelay)
+{
+       int abort;
+       uint64_t etime = endtick(bootdelay);
+
+#ifndef CONFIG_ZERO_BOOTDELAY_CHECK
+       if (bootdelay == 0)
+               return 0;
+#endif
+
+#  ifdef CONFIG_AUTOBOOT_PROMPT
+       /*
+        * CONFIG_AUTOBOOT_PROMPT includes the %d for all boards.
+        * To print the bootdelay value upon bootup.
+        */
+       printf(CONFIG_AUTOBOOT_PROMPT, bootdelay);
+#  endif
+
+       abort = passwd_abort(etime);
        if (!abort)
                debug_bootkeys("key timeout\n");
 
--

2.4.0

This patch adds the feature to only stop the autobooting, and therefor boot into the U-Boot prompt, when the input string / password matches a values that is encypted via a SHA256 hash and saved in the environment.

This feature is enabled by defined these config options:
CONFIG_AUTOBOOT_KEYED CONFIG_AUTOBOOT_STOP_STR_SHA256

Signed-off-by Stefan Roese <[email protected]>

Cc Simon Glass <[email protected]>

Cc Magnus Lilja <[email protected]>

---
v2:
- AUTOBOOT_STOP_STR_SHA256 is a string and not bool
- Add input key length check as suggested by Magnus
- Add "constant-length" time compare function as suggested by Magnus

 common/Kconfig    |  20 +++++++--
 common/autoboot.c | 132 +++++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 128 insertions(+), 24 deletions(-)

common/autoboot.c +5 -15

@@ -42,7 +108,9 @@ static int abortboot_keyed(int bootdelay)
 	}
 	delaykey[] = {
 		{ .str = getenv("bootdelaykey"),  .retry = 1 },
+		{ .str = getenv("bootdelaykey2"), .retry = 1 },
 		{ .str = getenv("bootstopkey"),   .retry = 0 },
+		{ .str = getenv("bootstopkey2"),  .retry = 0 },
 	};
 
 	char presskey[MAX_DELAY_STOP_STR];

@@ -50,26 +118,21 @@ static int abortboot_keyed(int bootdelay)
 	u_int presskey_max = 0;
 	u_int i;
 
-#ifndef CONFIG_ZERO_BOOTDELAY_CHECK
-	if (bootdelay == 0)
-		return 0;
-#endif
-
-#  ifdef CONFIG_AUTOBOOT_PROMPT
-	/*
-	 * CONFIG_AUTOBOOT_PROMPT includes the %d for all boards.
-	 * To print the bootdelay value upon bootup.
-	 */
-	printf(CONFIG_AUTOBOOT_PROMPT, bootdelay);
-#  endif
-
 #  ifdef CONFIG_AUTOBOOT_DELAY_STR
 	if (delaykey[0].str == NULL)
 		delaykey[0].str = CONFIG_AUTOBOOT_DELAY_STR;
 #  endif
-#  ifdef CONFIG_AUTOBOOT_STOP_STR
+#  ifdef CONFIG_AUTOBOOT_DELAY_STR2
 	if (delaykey[1].str == NULL)
-		delaykey[1].str = CONFIG_AUTOBOOT_STOP_STR;
+		delaykey[1].str = CONFIG_AUTOBOOT_DELAY_STR2;
+#  endif

Quoted 19 lines

  #  ifdef CONFIG_AUTOBOOT_DELAY_STR
  	if (delaykey[0].str == NULL)
  		delaykey[0].str = CONFIG_AUTOBOOT_DELAY_STR;
  #  endif

common/autoboot.c +10 -2

-#  ifdef CONFIG_AUTOBOOT_STOP_STR
+#  ifdef CONFIG_AUTOBOOT_DELAY_STR2
  	if (delaykey[1].str == NULL)
-		delaykey[1].str = CONFIG_AUTOBOOT_STOP_STR;
+		delaykey[1].str = CONFIG_AUTOBOOT_DELAY_STR2;
+#  endif
+#  ifdef CONFIG_AUTOBOOT_STOP_STR
+	if (delaykey[2].str == NULL)
+		delaykey[2].str = CONFIG_AUTOBOOT_STOP_STR;
+#  endif
+#  ifdef CONFIG_AUTOBOOT_STOP_STR2
+	if (delaykey[3].str == NULL)
+		delaykey[3].str = CONFIG_AUTOBOOT_STOP_STR2;
  #  endif

Quoted 1 line

  	for (i = 0; i < sizeof(delaykey) / sizeof(delaykey[0]); i++) {

isn't this part removed before in 2/4 'autoboot.c: Remove CONFIG_AUTOBOOT_STOP_STR2 and CONFIG_AUTOBOOT_DELAY_STR2'?

This patch adds the feature to only stop the autobooting, and therefor boot into the U-Boot prompt, when the input string / password matches a values that is encypted via a SHA256 hash and saved in the environment.

This feature is enabled by defined these config options:
CONFIG_AUTOBOOT_KEYED CONFIG_AUTOBOOT_STOP_STR_SHA256

Signed-off-by Stefan Roese <[email protected]>

Cc Simon Glass <[email protected]>

Cc Magnus Lilja <[email protected]>

---
v2:
- AUTOBOOT_STOP_STR_SHA256 is a string and not bool
- Add input key length check as suggested by Magnus
- Add "constant-length" time compare function as suggested by Magnus

Quoted 11 lines · Stefan Roese

This patch adds the feature to only stop the autobooting, and therefor boot into the U-Boot prompt, when the input string / password matches a values that is encypted via a SHA256 hash and saved in the environment.

This feature is enabled by defined these config options:
CONFIG_AUTOBOOT_KEYED CONFIG_AUTOBOOT_STOP_STR_SHA256

Signed-off-by Stefan Roese <[email protected]>

Cc Simon Glass <[email protected]>

Cc Magnus Lilja <[email protected]>

Quoted 6 lines

---
v2:
- AUTOBOOT_STOP_STR_SHA256 is a string and not bool
- Add input key length check as suggested by Magnus
- Add "constant-length" time compare function as suggested by Magnus

May I ask why you don't go all the way and use the salt mechanism instead of just hashing the password?