* [PATCH 1/2] common: state: fix typo
@ 2019-02-06 10:34 Ulrich Ölmann
2019-02-06 10:34 ` [PATCH 2/2] state: Documentation: " Ulrich Ölmann
2019-02-07 7:54 ` [PATCH 1/2] common: state: " Sascha Hauer
0 siblings, 2 replies; 3+ messages in thread
From: Ulrich Ölmann @ 2019-02-06 10:34 UTC (permalink / raw)
To: Barebox List
Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
---
common/state/backend_format_raw.c | 4 ++--
common/state/state.c | 2 +-
common/state/state.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/state/backend_format_raw.c b/common/state/backend_format_raw.c
index 4369f76e376f..5a71149d3443 100644
--- a/common/state/backend_format_raw.c
+++ b/common/state/backend_format_raw.c
@@ -127,7 +127,7 @@ static int backend_format_raw_verify(struct state_backend_format *format,
return -EINVAL;
}
- if (backend_raw->algo && !(flags & STATE_FLAG_NO_AUTHENTIFICATION)) {
+ if (backend_raw->algo && !(flags & STATE_FLAG_NO_AUTHENTICATION)) {
ret = backend_raw_digest_init(backend_raw);
if (ret)
return ret;
@@ -153,7 +153,7 @@ static int backend_format_raw_verify(struct state_backend_format *format,
*lenp = header->data_len + sizeof(*header);
- if (backend_raw->algo && !(flags & STATE_FLAG_NO_AUTHENTIFICATION)) {
+ if (backend_raw->algo && !(flags & STATE_FLAG_NO_AUTHENTICATION)) {
const void *hmac = data + header->data_len;
/* hmac over header and data */
diff --git a/common/state/state.c b/common/state/state.c
index 54c57232e626..d3e048b99078 100644
--- a/common/state/state.c
+++ b/common/state/state.c
@@ -128,7 +128,7 @@ int state_load(struct state *state)
int state_load_no_auth(struct state *state)
{
- return state_do_load(state, STATE_FLAG_NO_AUTHENTIFICATION);
+ return state_do_load(state, STATE_FLAG_NO_AUTHENTICATION);
}
static int state_format_init(struct state *state, const char *backend_format,
diff --git a/common/state/state.h b/common/state/state.h
index 3a0662fd2594..912d6d484823 100644
--- a/common/state/state.h
+++ b/common/state/state.h
@@ -6,7 +6,7 @@ struct state;
struct mtd_info_user;
enum state_flags {
- STATE_FLAG_NO_AUTHENTIFICATION = (1 << 0),
+ STATE_FLAG_NO_AUTHENTICATION = (1 << 0),
};
enum state_variable_type {
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 2/2] state: Documentation: fix typo
2019-02-06 10:34 [PATCH 1/2] common: state: fix typo Ulrich Ölmann
@ 2019-02-06 10:34 ` Ulrich Ölmann
2019-02-07 7:54 ` [PATCH 1/2] common: state: " Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: Ulrich Ölmann @ 2019-02-06 10:34 UTC (permalink / raw)
To: Barebox List
Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
---
Documentation/devicetree/bindings/barebox/barebox,state.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/barebox/barebox,state.rst b/Documentation/devicetree/bindings/barebox/barebox,state.rst
index 2893937820d7..390e148a2879 100644
--- a/Documentation/devicetree/bindings/barebox/barebox,state.rst
+++ b/Documentation/devicetree/bindings/barebox/barebox,state.rst
@@ -52,7 +52,7 @@ Optional Properties
``circular`` or ``noncircular``. If the backend memory needs to be erased
prior a write it defaults to the ``circular`` storage backend type, for backend
memories like RAMs or EEPROMs it defaults to the ``direct`` storage backend type.
-* ``algo``: A HMAC algorithm used to detect manipulation of the data
+* ``algo``: An HMAC algorithm used to detect manipulation of the data
or header, sensible values follow this pattern ``hmac(<HASH>)``,
e.g. ``hmac(sha256)``. Only available for the ``backend-type`` ``raw``.
* ``keep-previous-content``: Check if a the bucket meta magic field contains
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] common: state: fix typo
2019-02-06 10:34 [PATCH 1/2] common: state: fix typo Ulrich Ölmann
2019-02-06 10:34 ` [PATCH 2/2] state: Documentation: " Ulrich Ölmann
@ 2019-02-07 7:54 ` Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2019-02-07 7:54 UTC (permalink / raw)
To: Ulrich Ölmann; +Cc: Barebox List
On Wed, Feb 06, 2019 at 11:34:02AM +0100, Ulrich Ölmann wrote:
> Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
> ---
> common/state/backend_format_raw.c | 4 ++--
> common/state/state.c | 2 +-
> common/state/state.h | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/common/state/backend_format_raw.c b/common/state/backend_format_raw.c
> index 4369f76e376f..5a71149d3443 100644
> --- a/common/state/backend_format_raw.c
> +++ b/common/state/backend_format_raw.c
> @@ -127,7 +127,7 @@ static int backend_format_raw_verify(struct state_backend_format *format,
> return -EINVAL;
> }
>
> - if (backend_raw->algo && !(flags & STATE_FLAG_NO_AUTHENTIFICATION)) {
> + if (backend_raw->algo && !(flags & STATE_FLAG_NO_AUTHENTICATION)) {
> ret = backend_raw_digest_init(backend_raw);
> if (ret)
> return ret;
> @@ -153,7 +153,7 @@ static int backend_format_raw_verify(struct state_backend_format *format,
>
> *lenp = header->data_len + sizeof(*header);
>
> - if (backend_raw->algo && !(flags & STATE_FLAG_NO_AUTHENTIFICATION)) {
> + if (backend_raw->algo && !(flags & STATE_FLAG_NO_AUTHENTICATION)) {
> const void *hmac = data + header->data_len;
>
> /* hmac over header and data */
> diff --git a/common/state/state.c b/common/state/state.c
> index 54c57232e626..d3e048b99078 100644
> --- a/common/state/state.c
> +++ b/common/state/state.c
> @@ -128,7 +128,7 @@ int state_load(struct state *state)
>
> int state_load_no_auth(struct state *state)
> {
> - return state_do_load(state, STATE_FLAG_NO_AUTHENTIFICATION);
> + return state_do_load(state, STATE_FLAG_NO_AUTHENTICATION);
> }
>
> static int state_format_init(struct state *state, const char *backend_format,
> diff --git a/common/state/state.h b/common/state/state.h
> index 3a0662fd2594..912d6d484823 100644
> --- a/common/state/state.h
> +++ b/common/state/state.h
> @@ -6,7 +6,7 @@ struct state;
> struct mtd_info_user;
>
> enum state_flags {
> - STATE_FLAG_NO_AUTHENTIFICATION = (1 << 0),
> + STATE_FLAG_NO_AUTHENTICATION = (1 << 0),
> };
>
> enum state_variable_type {
> --
> 2.20.1
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-07 7:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-06 10:34 [PATCH 1/2] common: state: fix typo Ulrich Ölmann
2019-02-06 10:34 ` [PATCH 2/2] state: Documentation: " Ulrich Ölmann
2019-02-07 7:54 ` [PATCH 1/2] common: state: " Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox