tpm2_rsa(enc/dec)rypt: Report error message on invalid scheme

idesai · idesai · commit a09b9bb787d0 · 2021-05-20T09:36:07.000-07:00
Fixes #2729 Signed-off-by: Imran Desai <imran.desai@intel.com>
diff --git a/tools/tpm2_rsadecrypt.c b/tools/tpm2_rsadecrypt.c
@@ -91,6 +91,7 @@ static bool on_option(char key, char *value) {
         ctx.scheme.scheme = tpm2_alg_util_from_optarg(value,
                 tpm2_alg_util_flags_rsa_scheme);
         if (ctx.scheme.scheme == TPM2_ALG_ERROR) {
+            LOG_ERR("Invalid scheme.");
             return false;
         }
         ctx.scheme.details.oaep.hashAlg = ctx.scheme.scheme == TPM2_ALG_OAEP ?
diff --git a/tools/tpm2_rsaencrypt.c b/tools/tpm2_rsaencrypt.c
@@ -66,6 +66,7 @@ static bool on_option(char key, char *value) {
         ctx.scheme.scheme = tpm2_alg_util_from_optarg(value,
                 tpm2_alg_util_flags_rsa_scheme);
         if (ctx.scheme.scheme == TPM2_ALG_ERROR) {
+            LOG_ERR("Invalid scheme.");
             return false;
         }
         ctx.scheme.details.oaep.hashAlg = ctx.scheme.scheme == TPM2_ALG_OAEP ?

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ static bool on_option(char key, char *value) {`
`91`	`91`	`ctx.scheme.scheme = tpm2_alg_util_from_optarg(value,`
`92`	`92`	`tpm2_alg_util_flags_rsa_scheme);`
`93`	`93`	`if (ctx.scheme.scheme == TPM2_ALG_ERROR) {`
	`94`	`+ LOG_ERR("Invalid scheme.");`
`94`	`95`	`return false;`
`95`	`96`	`}`
`96`	`97`	`ctx.scheme.details.oaep.hashAlg = ctx.scheme.scheme == TPM2_ALG_OAEP ?`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ static bool on_option(char key, char *value) {`
`66`	`66`	`ctx.scheme.scheme = tpm2_alg_util_from_optarg(value,`
`67`	`67`	`tpm2_alg_util_flags_rsa_scheme);`
`68`	`68`	`if (ctx.scheme.scheme == TPM2_ALG_ERROR) {`
	`69`	`+ LOG_ERR("Invalid scheme.");`
`69`	`70`	`return false;`
`70`	`71`	`}`
`71`	`72`	`ctx.scheme.details.oaep.hashAlg = ctx.scheme.scheme == TPM2_ALG_OAEP ?`