mailarchive of the pengutronix oss-tools mailing list
 help / color / mirror / Atom feed
* [OSS-Tools] [PATCH dt-utils] state: fix typo
@ 2019-02-07  9:23 Ulrich Ölmann
  2019-02-07 11:37 ` Roland Hieber
  0 siblings, 1 reply; 2+ messages in thread
From: Ulrich Ölmann @ 2019-02-07  9:23 UTC (permalink / raw)
  To: Pengutronix Public Open-Source-Development; +Cc: Ulrich Ölmann

This ports the following barebox commit:

| commit 69b16bcc850c9eef0f399f531d0b0cfdacb9b4e4
| Author: Ulrich Ölmann <u.oelmann@pengutronix.de>
| Date:   Wed Feb 6 11:34:02 2019 +0100
|
|     common: state: fix typo
|
|     Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
|     Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
|
| M       common/state/backend_format_raw.c
| M       common/state/state.c
| M       common/state/state.h

Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
---
 src/barebox-state/backend_format_raw.c | 4 ++--
 src/barebox-state/state.c              | 2 +-
 src/barebox-state/state.h              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/barebox-state/backend_format_raw.c b/src/barebox-state/backend_format_raw.c
index 4369f76e376f..5a71149d3443 100644
--- a/src/barebox-state/backend_format_raw.c
+++ b/src/barebox-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/src/barebox-state/state.c b/src/barebox-state/state.c
index fd3cbbc54505..e95f91e29cd5 100644
--- a/src/barebox-state/state.c
+++ b/src/barebox-state/state.c
@@ -127,7 +127,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/src/barebox-state/state.h b/src/barebox-state/state.h
index 3a0662fd2594..912d6d484823 100644
--- a/src/barebox-state/state.h
+++ b/src/barebox-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


_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [OSS-Tools] [PATCH dt-utils] state: fix typo
  2019-02-07  9:23 [OSS-Tools] [PATCH dt-utils] state: fix typo Ulrich Ölmann
@ 2019-02-07 11:37 ` Roland Hieber
  0 siblings, 0 replies; 2+ messages in thread
From: Roland Hieber @ 2019-02-07 11:37 UTC (permalink / raw)
  To: Ulrich Ölmann; +Cc: Pengutronix Public Open-Source-Development

On Thu, Feb 07, 2019 at 10:23:10AM +0100, Ulrich Ölmann wrote:
> This ports the following barebox commit:
> 
> | commit 69b16bcc850c9eef0f399f531d0b0cfdacb9b4e4
> | Author: Ulrich Ölmann <u.oelmann@pengutronix.de>
> | Date:   Wed Feb 6 11:34:02 2019 +0100
> |
> |     common: state: fix typo
> |
> |     Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
> |     Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> |
> | M       common/state/backend_format_raw.c
> | M       common/state/state.c
> | M       common/state/state.h
> 
> Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
> ---
>  src/barebox-state/backend_format_raw.c | 4 ++--
>  src/barebox-state/state.c              | 2 +-
>  src/barebox-state/state.h              | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)

Applied to next, thanks.

 - Roland

> 
> diff --git a/src/barebox-state/backend_format_raw.c b/src/barebox-state/backend_format_raw.c
> index 4369f76e376f..5a71149d3443 100644
> --- a/src/barebox-state/backend_format_raw.c
> +++ b/src/barebox-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/src/barebox-state/state.c b/src/barebox-state/state.c
> index fd3cbbc54505..e95f91e29cd5 100644
> --- a/src/barebox-state/state.c
> +++ b/src/barebox-state/state.c
> @@ -127,7 +127,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/src/barebox-state/state.h b/src/barebox-state/state.h
> index 3a0662fd2594..912d6d484823 100644
> --- a/src/barebox-state/state.h
> +++ b/src/barebox-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
> 
> 
> _______________________________________________
> OSS-Tools mailing list
> OSS-Tools@pengutronix.de

-- 
Roland Hieber                     | r.hieber@pengutronix.de     |
Pengutronix e.K.                  | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |

_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-02-07 11:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-07  9:23 [OSS-Tools] [PATCH dt-utils] state: fix typo Ulrich Ölmann
2019-02-07 11:37 ` Roland Hieber

mailarchive of the pengutronix oss-tools mailing list

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://lore.pengutronix.de/oss-tools/0 oss-tools/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 oss-tools oss-tools/ https://lore.pengutronix.de/oss-tools \
		oss-tools@pengutronix.de
	public-inbox-index oss-tools

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git