[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/5] crypto: fix getter of a QCryptoSecret's property
From: |
Daniel P . Berrangé |
Subject: |
[PULL 1/5] crypto: fix getter of a QCryptoSecret's property |
Date: |
Thu, 7 May 2020 12:57:59 +0100 |
From: Tong Ho <address@hidden>
This fixes the condition-check done by the "loaded" property
getter, such that the property returns true even when the
secret is loaded by the 'file' option.
Signed-off-by: Tong Ho <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>
---
crypto/secret.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/crypto/secret.c b/crypto/secret.c
index 1cf0ad0ce8..5fb6bbe59c 100644
--- a/crypto/secret.c
+++ b/crypto/secret.c
@@ -221,6 +221,7 @@ qcrypto_secret_prop_set_loaded(Object *obj,
secret->rawlen = inputlen;
} else {
g_free(secret->rawdata);
+ secret->rawdata = NULL;
secret->rawlen = 0;
}
}
@@ -231,7 +232,7 @@ qcrypto_secret_prop_get_loaded(Object *obj,
Error **errp G_GNUC_UNUSED)
{
QCryptoSecret *secret = QCRYPTO_SECRET(obj);
- return secret->data != NULL;
+ return secret->rawdata != NULL;
}
--
2.26.2
- [PULL 0/5] Misc crypto subsystem fixes, Daniel P . Berrangé, 2020/05/07
- [PULL 1/5] crypto: fix getter of a QCryptoSecret's property,
Daniel P . Berrangé <=
- [PULL 3/5] crypto: Redundant type conversion for AES_KEY pointer, Daniel P . Berrangé, 2020/05/07
- [PULL 2/5] crypto/secret: fix inconsequential errors., Daniel P . Berrangé, 2020/05/07
- [PULL 5/5] crypto: extend hash benchmark to cover more algorithms, Daniel P . Berrangé, 2020/05/07
- [PULL 4/5] block: luks: better error message when creating too large files, Daniel P . Berrangé, 2020/05/07
- Re: [PULL 0/5] Misc crypto subsystem fixes, Peter Maydell, 2020/05/07