External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

qemu: Change from SecretIV or _IV to SecretAES or _AES

Browse Source 
The preferred name will be AES not IV, change current references

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2016-05-11 16:57:54 -04:00
parent 28675d633b
commit 677b94f487
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_command.c
View File

@ -638,7 +638,7 @@ qemuBuildGeneralSecinfoURI(virURIPtr uri,
}
break;
case VIR_DOMAIN_SECRET_INFO_TYPE_IV:
case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
case VIR_DOMAIN_SECRET_INFO_TYPE_LAST:
return -1;
}
@ -676,7 +676,7 @@ qemuBuildRBDSecinfoURI(virBufferPtr buf,
secinfo->s.plain.secret);
break;
case VIR_DOMAIN_SECRET_INFO_TYPE_IV:
case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
case VIR_DOMAIN_SECRET_INFO_TYPE_LAST:
return -1;
}

6
src/qemu/qemu_domain.c
View File

@ -737,7 +737,7 @@ qemuDomainSecretPlainFree(qemuDomainSecretPlain secret)
static void
qemuDomainSecretIVFree(qemuDomainSecretIV secret)
qemuDomainSecretAESFree(qemuDomainSecretAES secret)
{
VIR_FREE(secret.username);
VIR_FREE(secret.alias);
@ -757,8 +757,8 @@ qemuDomainSecretInfoFree(qemuDomainSecretInfoPtr *secinfo)
qemuDomainSecretPlainFree((*secinfo)->s.plain);
break;
case VIR_DOMAIN_SECRET_INFO_TYPE_IV:
qemuDomainSecretIVFree((*secinfo)->s.iv);
case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
qemuDomainSecretAESFree((*secinfo)->s.aes);
break;
case VIR_DOMAIN_SECRET_INFO_TYPE_LAST:

14
src/qemu/qemu_domain.h
View File

@ -242,7 +242,7 @@ struct _qemuDomainObjPrivate {
/* Type of domain secret */
typedef enum {
VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN = 0,
VIR_DOMAIN_SECRET_INFO_TYPE_IV,
VIR_DOMAIN_SECRET_INFO_TYPE_AES, /* utilize GNUTLS_CIPHER_AES_256_CBC */
VIR_DOMAIN_SECRET_INFO_TYPE_LAST
} qemuDomainSecretInfoType;
@ -254,11 +254,11 @@ struct _qemuDomainSecretPlain {
char *secret;
};
# define QEMU_DOMAIN_IV_KEY_LEN 16 /* 16 bytes for 128 bit random */
/* initialization vector key */
typedef struct _qemuDomainSecretIV qemuDomainSecretIV;
typedef struct _qemuDomainSecretIV *qemuDomainSecretIVPtr;
struct _qemuDomainSecretIV {
# define QEMU_DOMAIN_AES_IV_KEY_LEN 16 /* 16 bytes for 128 bit random */
/* initialization vector */
typedef struct _qemuDomainSecretAES qemuDomainSecretAES;
typedef struct _qemuDomainSecretAES *qemuDomainSecretAESPtr;
struct _qemuDomainSecretAES {
char *username;
char *alias; /* generated alias for secret */
char *iv; /* base64 encoded initialization vector */
@ -271,7 +271,7 @@ struct _qemuDomainSecretInfo {
qemuDomainSecretInfoType type;
union {
qemuDomainSecretPlain plain;
qemuDomainSecretIV iv;
qemuDomainSecretAES aes;
} s;
};