diff for duplicates of <20180314135313.GX27351@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index e02bb7f..28a33f8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -72,9 +72,9 @@ Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > > /* First search associations set of endpoint pair shared keys */ > key_for_each(key, &asoc->endpoint_shared_keys) { -> - if (key->key_id = key_id) +> - if (key->key_id == key_id) > - return key; -> + if (key->key_id = key_id) { +> + if (key->key_id == key_id) { > + if (!key->deactivated) > + return key; > + break; @@ -107,19 +107,19 @@ Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > + * The key identifier MUST correst to an existing key > + */ > + if (asoc) { -> + if (asoc->active_key_id = key_id) +> + if (asoc->active_key_id == key_id) > + return -EINVAL; > + > + sh_keys = &asoc->endpoint_shared_keys; > + } else { -> + if (ep->active_key_id = key_id) +> + if (ep->active_key_id == key_id) > + return -EINVAL; > + > + sh_keys = &ep->endpoint_shared_keys; > + } > + > + key_for_each(key, sh_keys) { -> + if (key->key_id = key_id) { +> + if (key->key_id == key_id) { > + found = 1; > + break; > + } diff --git a/a/content_digest b/N1/content_digest index 3fd044e..afb7c25 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\0e958480a6da52ad0947e319a2890fb034a473570.1521025473.git.lucien.xin@gmail.com\0" "From\0Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>\0" "Subject\0Re: [PATCH net-next 3/5] sctp: add sockopt SCTP_AUTH_DEACTIVATE_KEY\0" - "Date\0Wed, 14 Mar 2018 13:53:13 +0000\0" + "Date\0Wed, 14 Mar 2018 10:53:13 -0300\0" "To\0Xin Long <lucien.xin@gmail.com>\0" "Cc\0network dev <netdev@vger.kernel.org>" linux-sctp@vger.kernel.org @@ -84,9 +84,9 @@ "> \n" "> \t/* First search associations set of endpoint pair shared keys */\n" "> \tkey_for_each(key, &asoc->endpoint_shared_keys) {\n" - "> -\t\tif (key->key_id = key_id)\n" + "> -\t\tif (key->key_id == key_id)\n" "> -\t\t\treturn key;\n" - "> +\t\tif (key->key_id = key_id) {\n" + "> +\t\tif (key->key_id == key_id) {\n" "> +\t\t\tif (!key->deactivated)\n" "> +\t\t\t\treturn key;\n" "> +\t\t\tbreak;\n" @@ -119,19 +119,19 @@ "> +\t * The key identifier MUST correst to an existing key\n" "> +\t */\n" "> +\tif (asoc) {\n" - "> +\t\tif (asoc->active_key_id = key_id)\n" + "> +\t\tif (asoc->active_key_id == key_id)\n" "> +\t\t\treturn -EINVAL;\n" "> +\n" "> +\t\tsh_keys = &asoc->endpoint_shared_keys;\n" "> +\t} else {\n" - "> +\t\tif (ep->active_key_id = key_id)\n" + "> +\t\tif (ep->active_key_id == key_id)\n" "> +\t\t\treturn -EINVAL;\n" "> +\n" "> +\t\tsh_keys = &ep->endpoint_shared_keys;\n" "> +\t}\n" "> +\n" "> +\tkey_for_each(key, sh_keys) {\n" - "> +\t\tif (key->key_id = key_id) {\n" + "> +\t\tif (key->key_id == key_id) {\n" "> +\t\t\tfound = 1;\n" "> +\t\t\tbreak;\n" "> +\t\t}\n" @@ -204,4 +204,4 @@ "> 2.1.0\n" > -8f09402596fd72c38d5df4ea877d8844e9564e530f7d6666223be75bae1a0482 +176abb9a30755169f152b7bec44fbcbd0c11fc7389e4b9550aeb07b590f75cce
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.