qemu: Remove VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN and associated code

There's no code which could set it any more so we can remove the
generators.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 39659fe4f64a26f1198ff738d84de55c61dcd186..6e8699a3c6f225c327d02f486a1ff4a73903a3ea 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -760,28 +760,13 @@ qemuBuildObjectSecretCommandLine(virCommand *cmd,
  * -1 and error message if fail to add secret information
  */
 static int
-qemuBuildGeneralSecinfoURI(virURI *uri,
+qemuBuildGeneralSecinfoURI(virURI *uri G_GNUC_UNUSED,
                            qemuDomainSecretInfo *secinfo)
 {
     if (!secinfo)
         return 0;
 
     switch ((qemuDomainSecretInfoType) secinfo->type) {
-    case VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN:
-        if (secinfo->s.plain.secret) {
-            if (!virStringBufferIsPrintable(secinfo->s.plain.secret,
-                                            secinfo->s.plain.secretlen)) {
-                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                               _("found non printable characters in secret"));
-                return -1;
-            }
-            uri->user = g_strdup_printf("%s:%s", secinfo->s.plain.username,
-                                        secinfo->s.plain.secret);
-        } else {
-            uri->user = g_strdup(secinfo->s.plain.username);
-        }
-        break;
-
     case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
     case VIR_DOMAIN_SECRET_INFO_TYPE_LAST:
         return -1;
@@ -806,24 +791,12 @@ static int
 qemuBuildRBDSecinfoURI(virBuffer *buf,
                        qemuDomainSecretInfo *secinfo)
 {
-    g_autofree char *base64secret = NULL;
-
     if (!secinfo) {
         virBufferAddLit(buf, ":auth_supported=none");
         return 0;
     }
 
     switch ((qemuDomainSecretInfoType) secinfo->type) {
-    case VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN:
-        base64secret = g_base64_encode(secinfo->s.plain.secret,
-                                       secinfo->s.plain.secretlen);
-        virBufferEscape(buf, '\\', ":", ":id=%s", secinfo->s.plain.username);
-        virBufferEscape(buf, '\\', ":",
-                        ":key=%s:auth_supported=cephx\\;none",
-                        base64secret);
-        virSecureEraseString(base64secret);
-        break;
-
     case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
         virBufferEscape(buf, '\\', ":", ":id=%s:auth_supported=cephx\\;none",
                         secinfo->s.aes.username);

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 73e69d15581a9578d9ea4b402eb8e9c8c3d233d5..e9c1f3eacb0750edc240849602da03179c836d6c 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -657,15 +657,6 @@ qemuDomainMasterKeyCreate(virDomainObj *vm)
 }
 
 
-static void
-qemuDomainSecretPlainClear(struct _qemuDomainSecretPlain *secret)
-{
-    VIR_FREE(secret->username);
-    virSecureErase(secret->secret, secret->secretlen);
-    g_clear_pointer(&secret->secret, g_free);
-}
-
-
 static void
 qemuDomainSecretAESClear(struct _qemuDomainSecretAES *secret,
                          bool keepAlias)
@@ -687,10 +678,6 @@ qemuDomainSecretInfoClear(qemuDomainSecretInfo *secinfo,
         return;
 
     switch ((qemuDomainSecretInfoType) secinfo->type) {
-    case VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN:
-        qemuDomainSecretPlainClear(&secinfo->s.plain);
-        break;
-
     case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
         qemuDomainSecretAESClear(&secinfo->s.aes, keepAlias);
         break;

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 08f33f0f9e49f1b2795d40a2642e73197d3b9f47..cb5c665766d135bb11915bd5002fa4c0fbeb7141 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -92,19 +92,11 @@ struct _qemuDomainUnpluggingDevice {
 
 /* Type of domain secret */
 typedef enum {
-    VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN = 0,
     VIR_DOMAIN_SECRET_INFO_TYPE_AES,  /* utilize GNUTLS_CIPHER_AES_256_CBC */
 
     VIR_DOMAIN_SECRET_INFO_TYPE_LAST
 } qemuDomainSecretInfoType;
 
-typedef struct _qemuDomainSecretPlain qemuDomainSecretPlain;
-struct _qemuDomainSecretPlain {
-    char *username;
-    uint8_t *secret;
-    size_t secretlen;
-};
-
 #define QEMU_DOMAIN_AES_IV_LEN 16   /* 16 bytes for 128 bit random */
                                     /*    initialization vector */
 typedef struct _qemuDomainSecretAES qemuDomainSecretAES;
@@ -119,7 +111,6 @@ typedef struct _qemuDomainSecretInfo qemuDomainSecretInfo;
 struct _qemuDomainSecretInfo {
     qemuDomainSecretInfoType type;
     union {
-        qemuDomainSecretPlain plain;
         qemuDomainSecretAES aes;
     } s;
 };