diff for duplicates of <20190322194231.ih6itzctanyheoi4@altlinux.org> diff --git a/a/1.txt b/N1/1.txt index 8e9fe52..a2b7ea3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -82,7 +82,7 @@ On Fri, Mar 01, 2019 at 08:59:13PM +0300, Vitaly Chikunov wrote: > error_free_tfm: > + kfree(pkey); > crypto_free_akcipher(tfm); -> pr_devel("<=%s() = %d\n", __func__, ret); +> pr_devel("<==%s() = %d\n", __func__, ret); > return ret; > @@ -460,6 +477,7 @@ static int tpm_key_encrypt(struct tpm_key *tk, > struct scatterlist in_sg, out_sg; @@ -91,7 +91,7 @@ On Fri, Mar 01, 2019 at 08:59:13PM +0300, Vitaly Chikunov wrote: > + u8 *pkey, *ptr; > int ret; > -> pr_devel("=>%s()\n", __func__); +> pr_devel("==>%s()\n", __func__); > @@ -475,7 +493,15 @@ static int tpm_key_encrypt(struct tpm_key *tk, > der_pub_key_len = derive_pub_key(tk->pub_key, tk->pub_key_len, > der_pub_key); @@ -115,7 +115,7 @@ On Fri, Mar 01, 2019 at 08:59:13PM +0300, Vitaly Chikunov wrote: > error_free_tfm: > + kfree(pkey); > crypto_free_akcipher(tfm); -> pr_devel("<=%s() = %d\n", __func__, ret); +> pr_devel("<==%s() = %d\n", __func__, ret); > return ret; > @@ -748,6 +775,7 @@ static int tpm_key_verify_signature(const struct key *key, > char alg_name[CRYPTO_MAX_ALG_NAME]; @@ -124,7 +124,7 @@ On Fri, Mar 01, 2019 at 08:59:13PM +0300, Vitaly Chikunov wrote: > + u8 *pkey, *ptr; > int ret; > -> pr_devel("=>%s()\n", __func__); +> pr_devel("==>%s()\n", __func__); > @@ -770,7 +798,15 @@ static int tpm_key_verify_signature(const struct key *key, > der_pub_key_len = derive_pub_key(tk->pub_key, tk->pub_key_len, > der_pub_key); @@ -148,7 +148,7 @@ On Fri, Mar 01, 2019 at 08:59:13PM +0300, Vitaly Chikunov wrote: > error_free_tfm: > + kfree(pkey); > crypto_free_akcipher(tfm); -> pr_devel("<=%s() = %d\n", __func__, ret); +> pr_devel("<==%s() = %d\n", __func__, ret); > if (WARN_ON_ONCE(ret > 0)) > diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c > index 4dcfe281b898..0564951f8760 100644 @@ -219,7 +219,7 @@ On Fri, Mar 01, 2019 at 08:59:13PM +0300, Vitaly Chikunov wrote: > + kfree(key); > error_free_tfm: > crypto_free_akcipher(tfm); -> pr_devel("<=%s() = %d\n", __func__, ret); +> pr_devel("<==%s() = %d\n", __func__, ret); > @@ -161,6 +179,7 @@ static int software_key_eds_op(struct kernel_pkey_params *params, > struct crypto_wait cwait; > struct scatterlist in_sg, out_sg; @@ -227,7 +227,7 @@ On Fri, Mar 01, 2019 at 08:59:13PM +0300, Vitaly Chikunov wrote: > + char *key, *ptr; > int ret; > -> pr_devel("=>%s()\n", __func__); +> pr_devel("==>%s()\n", __func__); > @@ -179,14 +198,23 @@ static int software_key_eds_op(struct kernel_pkey_params *params, > if (!req) > goto error_free_tfm; @@ -258,7 +258,7 @@ On Fri, Mar 01, 2019 at 08:59:13PM +0300, Vitaly Chikunov wrote: > sg_init_one(&in_sg, in, params->in_len); > sg_init_one(&out_sg, out, params->out_len); > @@ -216,6 +244,8 @@ static int software_key_eds_op(struct kernel_pkey_params *params, -> if (ret = 0) +> if (ret == 0) > ret = req->dst_len; > > +error_free_key: @@ -273,7 +273,7 @@ On Fri, Mar 01, 2019 at 08:59:13PM +0300, Vitaly Chikunov wrote: > + char *key, *ptr; > int ret; > -> pr_devel("=>%s()\n", __func__); +> pr_devel("==>%s()\n", __func__); > @@ -258,14 +289,23 @@ int public_key_verify_signature(const struct public_key *pkey, > if (!req) > goto error_free_tfm; diff --git a/a/content_digest b/N1/content_digest index 50336b7..43dccea 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020190301175918.29694-7-vt@altlinux.org\0" "From\0Vitaly Chikunov <vt@altlinux.org>\0" "Subject\0Re: [PATCH v7 06/11] X.509: parse public key parameters from x509 for akcipher\0" - "Date\0Fri, 22 Mar 2019 19:42:31 +0000\0" + "Date\0Fri, 22 Mar 2019 22:42:31 +0300\0" "To\0David Howells <dhowells@redhat.com>" " keyrings@vger.kernel.org\0" "Cc\0Herbert Xu <herbert@gondor.apana.org.au>" @@ -94,7 +94,7 @@ "> error_free_tfm:\n" "> +\tkfree(pkey);\n" "> \tcrypto_free_akcipher(tfm);\n" - "> \tpr_devel(\"<=%s() = %d\\n\", __func__, ret);\n" + "> \tpr_devel(\"<==%s() = %d\\n\", __func__, ret);\n" "> \treturn ret;\n" "> @@ -460,6 +477,7 @@ static int tpm_key_encrypt(struct tpm_key *tk,\n" "> \tstruct scatterlist in_sg, out_sg;\n" @@ -103,7 +103,7 @@ "> +\tu8 *pkey, *ptr;\n" "> \tint ret;\n" "> \n" - "> \tpr_devel(\"=>%s()\\n\", __func__);\n" + "> \tpr_devel(\"==>%s()\\n\", __func__);\n" "> @@ -475,7 +493,15 @@ static int tpm_key_encrypt(struct tpm_key *tk,\n" "> \tder_pub_key_len = derive_pub_key(tk->pub_key, tk->pub_key_len,\n" "> \t\t\t\t\t der_pub_key);\n" @@ -127,7 +127,7 @@ "> error_free_tfm:\n" "> +\tkfree(pkey);\n" "> \tcrypto_free_akcipher(tfm);\n" - "> \tpr_devel(\"<=%s() = %d\\n\", __func__, ret);\n" + "> \tpr_devel(\"<==%s() = %d\\n\", __func__, ret);\n" "> \treturn ret;\n" "> @@ -748,6 +775,7 @@ static int tpm_key_verify_signature(const struct key *key,\n" "> \tchar alg_name[CRYPTO_MAX_ALG_NAME];\n" @@ -136,7 +136,7 @@ "> +\tu8 *pkey, *ptr;\n" "> \tint ret;\n" "> \n" - "> \tpr_devel(\"=>%s()\\n\", __func__);\n" + "> \tpr_devel(\"==>%s()\\n\", __func__);\n" "> @@ -770,7 +798,15 @@ static int tpm_key_verify_signature(const struct key *key,\n" "> \tder_pub_key_len = derive_pub_key(tk->pub_key, tk->pub_key_len,\n" "> \t\t\t\t\t der_pub_key);\n" @@ -160,7 +160,7 @@ "> error_free_tfm:\n" "> +\tkfree(pkey);\n" "> \tcrypto_free_akcipher(tfm);\n" - "> \tpr_devel(\"<=%s() = %d\\n\", __func__, ret);\n" + "> \tpr_devel(\"<==%s() = %d\\n\", __func__, ret);\n" "> \tif (WARN_ON_ONCE(ret > 0))\n" "> diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c\n" "> index 4dcfe281b898..0564951f8760 100644\n" @@ -231,7 +231,7 @@ "> +\tkfree(key);\n" "> error_free_tfm:\n" "> \tcrypto_free_akcipher(tfm);\n" - "> \tpr_devel(\"<=%s() = %d\\n\", __func__, ret);\n" + "> \tpr_devel(\"<==%s() = %d\\n\", __func__, ret);\n" "> @@ -161,6 +179,7 @@ static int software_key_eds_op(struct kernel_pkey_params *params,\n" "> \tstruct crypto_wait cwait;\n" "> \tstruct scatterlist in_sg, out_sg;\n" @@ -239,7 +239,7 @@ "> +\tchar *key, *ptr;\n" "> \tint ret;\n" "> \n" - "> \tpr_devel(\"=>%s()\\n\", __func__);\n" + "> \tpr_devel(\"==>%s()\\n\", __func__);\n" "> @@ -179,14 +198,23 @@ static int software_key_eds_op(struct kernel_pkey_params *params,\n" "> \tif (!req)\n" "> \t\tgoto error_free_tfm;\n" @@ -270,7 +270,7 @@ "> \tsg_init_one(&in_sg, in, params->in_len);\n" "> \tsg_init_one(&out_sg, out, params->out_len);\n" "> @@ -216,6 +244,8 @@ static int software_key_eds_op(struct kernel_pkey_params *params,\n" - "> \tif (ret = 0)\n" + "> \tif (ret == 0)\n" "> \t\tret = req->dst_len;\n" "> \n" "> +error_free_key:\n" @@ -285,7 +285,7 @@ "> +\tchar *key, *ptr;\n" "> \tint ret;\n" "> \n" - "> \tpr_devel(\"=>%s()\\n\", __func__);\n" + "> \tpr_devel(\"==>%s()\\n\", __func__);\n" "> @@ -258,14 +289,23 @@ int public_key_verify_signature(const struct public_key *pkey,\n" "> \tif (!req)\n" "> \t\tgoto error_free_tfm;\n" @@ -555,4 +555,4 @@ "> -- \n" > 2.11.0 -0f9e3853fc4ac7a1a79cee0c5a559253b753958fac98dfe6ec31f4a133831a2c +44448b048fc7f9aec8f372c18df0a6105288ea75e5e24ddf5c8c78eefe9c9152
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.