diff for duplicates of <20190326125842.24110-6-vt@altlinux.org> diff --git a/a/1.txt b/N1/1.txt index 834cd43..734e65f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -74,7 +74,7 @@ index 402fc34ca044..d95d7ec50e5a 100644 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; @@ -83,7 +83,7 @@ index 402fc34ca044..d95d7ec50e5a 100644 + 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); @@ -107,7 +107,7 @@ index 402fc34ca044..d95d7ec50e5a 100644 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]; @@ -116,7 +116,7 @@ index 402fc34ca044..d95d7ec50e5a 100644 + 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); @@ -140,7 +140,7 @@ index 402fc34ca044..d95d7ec50e5a 100644 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 33093b7bcc47..77e0ae7840ff 100644 @@ -211,7 +211,7 @@ index 33093b7bcc47..77e0ae7840ff 100644 + kfree(key); error_free_tfm: crypto_free_akcipher(tfm); - pr_devel("<=%s() = %d\n", __func__, ret); + pr_devel("<==%s() = %d\n", __func__, ret); @@ -155,6 +173,7 @@ static int software_key_eds_op(struct kernel_pkey_params *params, struct crypto_wait cwait; struct scatterlist in_sg, out_sg; @@ -219,7 +219,7 @@ index 33093b7bcc47..77e0ae7840ff 100644 + char *key, *ptr; int ret; - pr_devel("=>%s()\n", __func__); + pr_devel("==>%s()\n", __func__); @@ -173,14 +192,23 @@ static int software_key_eds_op(struct kernel_pkey_params *params, if (!req) goto error_free_tfm; @@ -250,7 +250,7 @@ index 33093b7bcc47..77e0ae7840ff 100644 sg_init_one(&in_sg, in, params->in_len); sg_init_one(&out_sg, out, params->out_len); @@ -210,6 +238,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: @@ -265,7 +265,7 @@ index 33093b7bcc47..77e0ae7840ff 100644 + char *key, *ptr; int ret; - pr_devel("=>%s()\n", __func__); + pr_devel("==>%s()\n", __func__); @@ -252,14 +283,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 764c51a..a3ff8c0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020190326125842.24110-1-vt@altlinux.org\0" "From\0Vitaly Chikunov <vt@altlinux.org>\0" "Subject\0[PATCH v8 05/10] X.509: parse public key parameters from x509 for akcipher\0" - "Date\0Tue, 26 Mar 2019 12:58:37 +0000\0" + "Date\0Tue, 26 Mar 2019 15:58:37 +0300\0" "To\0Herbert Xu <herbert@gondor.apana.org.au>" David Howells <dhowells@redhat.com> Mimi Zohar <zohar@linux.ibm.com> @@ -88,7 +88,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" @@ -97,7 +97,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" @@ -121,7 +121,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" @@ -130,7 +130,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" @@ -154,7 +154,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 33093b7bcc47..77e0ae7840ff 100644\n" @@ -225,7 +225,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" "@@ -155,6 +173,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" @@ -233,7 +233,7 @@ "+\tchar *key, *ptr;\n" " \tint ret;\n" " \n" - " \tpr_devel(\"=>%s()\\n\", __func__);\n" + " \tpr_devel(\"==>%s()\\n\", __func__);\n" "@@ -173,14 +192,23 @@ static int software_key_eds_op(struct kernel_pkey_params *params,\n" " \tif (!req)\n" " \t\tgoto error_free_tfm;\n" @@ -264,7 +264,7 @@ " \tsg_init_one(&in_sg, in, params->in_len);\n" " \tsg_init_one(&out_sg, out, params->out_len);\n" "@@ -210,6 +238,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" @@ -279,7 +279,7 @@ "+\tchar *key, *ptr;\n" " \tint ret;\n" " \n" - " \tpr_devel(\"=>%s()\\n\", __func__);\n" + " \tpr_devel(\"==>%s()\\n\", __func__);\n" "@@ -252,14 +283,23 @@ int public_key_verify_signature(const struct public_key *pkey,\n" " \tif (!req)\n" " \t\tgoto error_free_tfm;\n" @@ -549,4 +549,4 @@ "-- \n" 2.11.0 -a52370ec2ce8ed63838ec6850de885801e501f01a8b5f8821e4e15ce0d4094c7 +a638858e20a4cb55803e7e25a3cd5bca84d99381a841658eec97793a2c63bab9
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.