提交 677b94f4 编写于 作者: J John Ferlan

qemu: Change from SecretIV or _IV to SecretAES or _AES

The preferred name will be AES not IV, change current references
Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
上级 28675d63
...@@ -638,7 +638,7 @@ qemuBuildGeneralSecinfoURI(virURIPtr uri, ...@@ -638,7 +638,7 @@ qemuBuildGeneralSecinfoURI(virURIPtr uri,
} }
break; break;
case VIR_DOMAIN_SECRET_INFO_TYPE_IV: case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
case VIR_DOMAIN_SECRET_INFO_TYPE_LAST: case VIR_DOMAIN_SECRET_INFO_TYPE_LAST:
return -1; return -1;
} }
...@@ -676,7 +676,7 @@ qemuBuildRBDSecinfoURI(virBufferPtr buf, ...@@ -676,7 +676,7 @@ qemuBuildRBDSecinfoURI(virBufferPtr buf,
secinfo->s.plain.secret); secinfo->s.plain.secret);
break; break;
case VIR_DOMAIN_SECRET_INFO_TYPE_IV: case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
case VIR_DOMAIN_SECRET_INFO_TYPE_LAST: case VIR_DOMAIN_SECRET_INFO_TYPE_LAST:
return -1; return -1;
} }
......
...@@ -737,7 +737,7 @@ qemuDomainSecretPlainFree(qemuDomainSecretPlain secret) ...@@ -737,7 +737,7 @@ qemuDomainSecretPlainFree(qemuDomainSecretPlain secret)
static void static void
qemuDomainSecretIVFree(qemuDomainSecretIV secret) qemuDomainSecretAESFree(qemuDomainSecretAES secret)
{ {
VIR_FREE(secret.username); VIR_FREE(secret.username);
VIR_FREE(secret.alias); VIR_FREE(secret.alias);
...@@ -757,8 +757,8 @@ qemuDomainSecretInfoFree(qemuDomainSecretInfoPtr *secinfo) ...@@ -757,8 +757,8 @@ qemuDomainSecretInfoFree(qemuDomainSecretInfoPtr *secinfo)
qemuDomainSecretPlainFree((*secinfo)->s.plain); qemuDomainSecretPlainFree((*secinfo)->s.plain);
break; break;
case VIR_DOMAIN_SECRET_INFO_TYPE_IV: case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
qemuDomainSecretIVFree((*secinfo)->s.iv); qemuDomainSecretAESFree((*secinfo)->s.aes);
break; break;
case VIR_DOMAIN_SECRET_INFO_TYPE_LAST: case VIR_DOMAIN_SECRET_INFO_TYPE_LAST:
......
...@@ -242,7 +242,7 @@ struct _qemuDomainObjPrivate { ...@@ -242,7 +242,7 @@ struct _qemuDomainObjPrivate {
/* Type of domain secret */ /* Type of domain secret */
typedef enum { typedef enum {
VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN = 0, 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 VIR_DOMAIN_SECRET_INFO_TYPE_LAST
} qemuDomainSecretInfoType; } qemuDomainSecretInfoType;
...@@ -254,11 +254,11 @@ struct _qemuDomainSecretPlain { ...@@ -254,11 +254,11 @@ struct _qemuDomainSecretPlain {
char *secret; char *secret;
}; };
# define QEMU_DOMAIN_IV_KEY_LEN 16 /* 16 bytes for 128 bit random */ # define QEMU_DOMAIN_AES_IV_KEY_LEN 16 /* 16 bytes for 128 bit random */
/* initialization vector key */ /* initialization vector */
typedef struct _qemuDomainSecretIV qemuDomainSecretIV; typedef struct _qemuDomainSecretAES qemuDomainSecretAES;
typedef struct _qemuDomainSecretIV *qemuDomainSecretIVPtr; typedef struct _qemuDomainSecretAES *qemuDomainSecretAESPtr;
struct _qemuDomainSecretIV { struct _qemuDomainSecretAES {
char *username; char *username;
char *alias; /* generated alias for secret */ char *alias; /* generated alias for secret */
char *iv; /* base64 encoded initialization vector */ char *iv; /* base64 encoded initialization vector */
...@@ -271,7 +271,7 @@ struct _qemuDomainSecretInfo { ...@@ -271,7 +271,7 @@ struct _qemuDomainSecretInfo {
qemuDomainSecretInfoType type; qemuDomainSecretInfoType type;
union { union {
qemuDomainSecretPlain plain; qemuDomainSecretPlain plain;
qemuDomainSecretIV iv; qemuDomainSecretAES aes;
} s; } s;
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册