OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

crypto/rsakey-builtin.c.inc: Clean up two error paths

Browse Source 
When qcrypto_builtin_rsa_public_key_parse() is about to fail, but no
error has been set, it makes one up.  Actually, there's just one way
to fail without setting an error.  Set it there instead.

Same for qcrypto_builtin_rsa_private_key_parse().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Markus Armbruster 2023-09-01 14:32:26 +02:00 committed by Daniel P. Berrangé
parent 462ad017ed
commit e158f8e92d
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/rsakey-builtin.c.inc
View File

@ -88,15 +88,13 @@ static QCryptoAkCipherRSAKey *qcrypto_builtin_rsa_public_key_parse(
goto error; goto error;
} }
if (seq_length != 0) { if (seq_length != 0) {
error_setg(errp, "Invalid RSA public key");
goto error; goto error;
} }
return rsa; return rsa;
error: error:
if (errp && !*errp) {
error_setg(errp, "Invalid RSA public key");
}
qcrypto_akcipher_rsakey_free(rsa); qcrypto_akcipher_rsakey_free(rsa);
return NULL; return NULL;
} }
@ -169,15 +167,13 @@ static QCryptoAkCipherRSAKey *qcrypto_builtin_rsa_private_key_parse(
return rsa; return rsa;
} }
if (seq_length != 0) { if (seq_length != 0) {
error_setg(errp, "Invalid RSA private key");
goto error; goto error;
} }
return rsa; return rsa;
error: error:
if (errp && !*errp) {
error_setg(errp, "Invalid RSA private key");
}
qcrypto_akcipher_rsakey_free(rsa); qcrypto_akcipher_rsakey_free(rsa);
return NULL; return NULL;
} }