vircrypto: Drop virCryptoGenerateRandom

Now that virCryptoGenerateRandom() is plain wrapper over
virRandomBytes() we can drop it in favour of the latter.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 206107befd9065b1bc0e9b792e39ac77ebe9a4ce..5540391fe894cb0d8cc3c042b56b61515956f5d3 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1653,7 +1653,6 @@ virConfWriteMem;
 
 # util/vircrypto.h
 virCryptoEncryptData;
-virCryptoGenerateRandom;
 virCryptoHashBuf;
 virCryptoHashString;
 virCryptoHaveCipher;

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index c4c25e95d01dab03cb6337c4d37cf68d14d70dbd..2dd4e5ef5f86dd297c3ea4e4f5c3423638235b1d 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -51,6 +51,7 @@
 #include "viratomic.h"
 #include "virprocess.h"
 #include "vircrypto.h"
+#include "virrandom.h"
 #include "virsystemd.h"
 #include "secret_util.h"
 #include "logging/log_manager.h"
@@ -934,7 +935,7 @@ qemuDomainMasterKeyCreate(virDomainObjPtr vm)
         return -1;
     priv->masterKeyLen = QEMU_DOMAIN_MASTER_KEY_LEN;
 
-    if (virCryptoGenerateRandom(priv->masterKey, priv->masterKeyLen) < 0) {
+    if (virRandomBytes(priv->masterKey, priv->masterKeyLen) < 0) {
         VIR_DISPOSE_N(priv->masterKey, priv->masterKeyLen);
         return -1;
     }
@@ -1288,7 +1289,7 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv,
         goto cleanup;
 
     /* Create a random initialization vector */
-    if (virCryptoGenerateRandom(raw_iv, ivlen) < 0)
+    if (virRandomBytes(raw_iv, ivlen) < 0)
         goto cleanup;
 
     /* Encode the IV and save that since qemu will need it */

diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c
index 3f3ba0267a4f1d980dd3071d54a22080c50522e4..d734ce6ad73c2fca84086b0a167aaa77152ba872 100644 (file)
--- a/src/util/vircrypto.c
+++ b/src/util/vircrypto.c
@@ -314,21 +314,3 @@ virCryptoEncryptData(virCryptoCipher algorithm,
     return -1;
 }
 #endif
-
-/* virCryptoGenerateRandom:
- * @buf: Pointer to location to store bytes
- * @buflen: Number of bytes to store
- *
- * Generate a random stream of @buflen length and store it into @buf.
- *
- * Since the gnutls_rnd could be missing, provide an alternate less
- * secure mechanism to at least have something.
- *
- * Returns 0 on success or -1 on failure (with error reported)
- */
-int
-virCryptoGenerateRandom(unsigned char *buf,
-                        size_t buflen)
-{
-    return virRandomBytes(buf, buflen);
-}

diff --git a/src/util/vircrypto.h b/src/util/vircrypto.h
index 649ceff1a156a802dc11c0d55ffb752e7d688a79..e3c70d7d9a10b87817cabff3f2a910d1b76874f6 100644 (file)
--- a/src/util/vircrypto.h
+++ b/src/util/vircrypto.h
@@ -65,7 +65,4 @@ int virCryptoEncryptData(virCryptoCipher algorithm,
     ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(6)
     ATTRIBUTE_NONNULL(8) ATTRIBUTE_NONNULL(9) ATTRIBUTE_RETURN_CHECK;
 
-int virCryptoGenerateRandom(unsigned char *buf,
-                            size_t buflen) ATTRIBUTE_NOINLINE;
-
 #endif /* __VIR_CRYPTO_H__ */

diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c
index cc3bf2095cb1c86c3ec82417801e9a0115e32d12..a4de7f0c462d82cb9d6d03cddcb87aaf9c4a6cd0 100644 (file)
--- a/tests/qemuxml2argvmock.c
+++ b/tests/qemuxml2argvmock.c
@@ -190,13 +190,6 @@ virCommandPassFD(virCommandPtr cmd ATTRIBUTE_UNUSED,
     /* nada */
 }
 
-int
-virCryptoGenerateRandom(unsigned char *buf,
-                        size_t buflen)
-{
-    return virRandomBytes(buf, buflen);
-}
-
 int
 virNetDevOpenvswitchGetVhostuserIfname(const char *path ATTRIBUTE_UNUSED,
                                        char **ifname)