mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge qcrypto-next 2016/2/2 v1

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJWsKthAAoJEL6G67QVEE/fAg4QAKh1JDyTl6G0+7aOE17dKW9f
 mGXKMWnNYQCV4spONbIVvuT+d/rplM2PZYUyllp+tK3bXZSK0RusPMiQxQ4Ioe/4
 jc9N56FU1hywCgmkRJr4BKbcZc7ufxbckdk+V02NSDmMJPSqfQLNKAjsz2moO0H/
 UwUvC9kK5FzTLpPF6Quh3oT8jyNMfwMapyFh60vlyWcQmL1sB5gdqW+V4GzP98Lb
 A/Hw55DJOZ2f7ptyxWGEoYbiNt/UhLYm/V2fIq4w1ZYgz4C3Ii8VwiPNlEZoPBXh
 7z1XR1fo3iu/WWpUWDYAAb/AeGws+6GpzmQOH0//PVFAEWq+nSYHJYZgCV9xIx1o
 b/Lm2hyeKv57xvPg5zZs5L2bmuaYK+QQSC9Uqc5nZFadnAgKvvainJ41amImV1py
 vv1j5+bH/6rwCmn9r6rE/x5vEuoT4gph1aaK1aV0Wmc9iaFJwvOqPTfGzEnG3ZTd
 dgRFFgwUjInWVfRiWsVdtBHamO6PRw7VB+YQ1Bi9pdsAkx2L/UsVWlmiwLptS0HD
 a5qdlxWKBWbxW8BMseWXifIdVuUzQCghaIHE66vKklo+jIsY6ypsyhjhOFb1o39q
 EipzUgHOz+n4zodou72kUgzCO7l1+6n/hugjjYbvfihxdG8k1f4PmDdo06BqZ3sg
 SBCX2EOapcWEGA4fIqyT
 =OjHY
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-next-2016-02-02-1' into staging

Merge qcrypto-next 2016/2/2 v1

# gpg: Signature made Tue 02 Feb 2016 13:13:05 GMT using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"

* remotes/berrange/tags/pull-qcrypto-next-2016-02-02-1:
  crypto: ensure qcrypto_hash_digest_len is always defined
  crypto: register properties against the class instead of object
  crypto: fix description of @errp parameter initialization

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2016-02-02 15:55:01 +00:00
commit d2ea854c38
8 changed files with 97 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
crypto/hash.c
View File

@ -24,12 +24,8 @@
#ifdef CONFIG_GNUTLS_HASH #ifdef CONFIG_GNUTLS_HASH
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>
#include <gnutls/crypto.h> #include <gnutls/crypto.h>
#endif
static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = {
[QCRYPTO_HASH_ALG_MD5] = GNUTLS_DIG_MD5,
[QCRYPTO_HASH_ALG_SHA1] = GNUTLS_DIG_SHA1,
[QCRYPTO_HASH_ALG_SHA256] = GNUTLS_DIG_SHA256,
};
static size_t qcrypto_hash_alg_size[QCRYPTO_HASH_ALG__MAX] = { static size_t qcrypto_hash_alg_size[QCRYPTO_HASH_ALG__MAX] = {
[QCRYPTO_HASH_ALG_MD5] = 16, [QCRYPTO_HASH_ALG_MD5] = 16,
@ -37,6 +33,22 @@ static size_t qcrypto_hash_alg_size[QCRYPTO_HASH_ALG__MAX] = {
[QCRYPTO_HASH_ALG_SHA256] = 32, [QCRYPTO_HASH_ALG_SHA256] = 32,
}; };
size_t qcrypto_hash_digest_len(QCryptoHashAlgorithm alg)
{
if (alg >= G_N_ELEMENTS(qcrypto_hash_alg_size)) {
return 0;
}
return qcrypto_hash_alg_size[alg];
}
#ifdef CONFIG_GNUTLS_HASH
static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = {
[QCRYPTO_HASH_ALG_MD5] = GNUTLS_DIG_MD5,
[QCRYPTO_HASH_ALG_SHA1] = GNUTLS_DIG_SHA1,
[QCRYPTO_HASH_ALG_SHA256] = GNUTLS_DIG_SHA256,
};
gboolean qcrypto_hash_supports(QCryptoHashAlgorithm alg) gboolean qcrypto_hash_supports(QCryptoHashAlgorithm alg)
{ {
if (alg < G_N_ELEMENTS(qcrypto_hash_alg_map)) { if (alg < G_N_ELEMENTS(qcrypto_hash_alg_map)) {
@ -45,14 +57,6 @@ gboolean qcrypto_hash_supports(QCryptoHashAlgorithm alg)
return false; return false;
} }
size_t qcrypto_hash_digest_len(QCryptoHashAlgorithm alg)
{
if (alg >= G_N_ELEMENTS(qcrypto_hash_alg_size)) {
return 0;
}
return qcrypto_hash_alg_size[alg];
}
int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg, int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
const struct iovec *iov, const struct iovec *iov,

60
crypto/secret.c
View File

@ -352,38 +352,6 @@ qcrypto_secret_complete(UserCreatable *uc, Error **errp)
} }
static void
qcrypto_secret_init(Object *obj)
{
object_property_add_bool(obj, "loaded",
qcrypto_secret_prop_get_loaded,
qcrypto_secret_prop_set_loaded,
NULL);
object_property_add_enum(obj, "format",
"QCryptoSecretFormat",
QCryptoSecretFormat_lookup,
qcrypto_secret_prop_get_format,
qcrypto_secret_prop_set_format,
NULL);
object_property_add_str(obj, "data",
qcrypto_secret_prop_get_data,
qcrypto_secret_prop_set_data,
NULL);
object_property_add_str(obj, "file",
qcrypto_secret_prop_get_file,
qcrypto_secret_prop_set_file,
NULL);
object_property_add_str(obj, "keyid",
qcrypto_secret_prop_get_keyid,
qcrypto_secret_prop_set_keyid,
NULL);
object_property_add_str(obj, "iv",
qcrypto_secret_prop_get_iv,
qcrypto_secret_prop_set_iv,
NULL);
}
static void static void
qcrypto_secret_finalize(Object *obj) qcrypto_secret_finalize(Object *obj)
{ {
@ -402,6 +370,33 @@ qcrypto_secret_class_init(ObjectClass *oc, void *data)
UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc); UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
ucc->complete = qcrypto_secret_complete; ucc->complete = qcrypto_secret_complete;
object_class_property_add_bool(oc, "loaded",
qcrypto_secret_prop_get_loaded,
qcrypto_secret_prop_set_loaded,
NULL);
object_class_property_add_enum(oc, "format",
"QCryptoSecretFormat",
QCryptoSecretFormat_lookup,
qcrypto_secret_prop_get_format,
qcrypto_secret_prop_set_format,
NULL);
object_class_property_add_str(oc, "data",
qcrypto_secret_prop_get_data,
qcrypto_secret_prop_set_data,
NULL);
object_class_property_add_str(oc, "file",
qcrypto_secret_prop_get_file,
qcrypto_secret_prop_set_file,
NULL);
object_class_property_add_str(oc, "keyid",
qcrypto_secret_prop_get_keyid,
qcrypto_secret_prop_set_keyid,
NULL);
object_class_property_add_str(oc, "iv",
qcrypto_secret_prop_get_iv,
qcrypto_secret_prop_set_iv,
NULL);
} }
@ -493,7 +488,6 @@ static const TypeInfo qcrypto_secret_info = {
.parent = TYPE_OBJECT, .parent = TYPE_OBJECT,
.name = TYPE_QCRYPTO_SECRET, .name = TYPE_QCRYPTO_SECRET,
.instance_size = sizeof(QCryptoSecret), .instance_size = sizeof(QCryptoSecret),
.instance_init = qcrypto_secret_init,
.instance_finalize = qcrypto_secret_finalize, .instance_finalize = qcrypto_secret_finalize,
.class_size = sizeof(QCryptoSecretClass), .class_size = sizeof(QCryptoSecretClass),
.class_init = qcrypto_secret_class_init, .class_init = qcrypto_secret_class_init,

36
crypto/tlscreds.c
View File

@ -198,27 +198,32 @@ qcrypto_tls_creds_prop_get_endpoint(Object *obj,
} }
static void
qcrypto_tls_creds_class_init(ObjectClass *oc, void *data)
{
object_class_property_add_bool(oc, "verify-peer",
qcrypto_tls_creds_prop_get_verify,
qcrypto_tls_creds_prop_set_verify,
NULL);
object_class_property_add_str(oc, "dir",
qcrypto_tls_creds_prop_get_dir,
qcrypto_tls_creds_prop_set_dir,
NULL);
object_class_property_add_enum(oc, "endpoint",
"QCryptoTLSCredsEndpoint",
QCryptoTLSCredsEndpoint_lookup,
qcrypto_tls_creds_prop_get_endpoint,
qcrypto_tls_creds_prop_set_endpoint,
NULL);
}
static void static void
qcrypto_tls_creds_init(Object *obj) qcrypto_tls_creds_init(Object *obj)
{ {
QCryptoTLSCreds *creds = QCRYPTO_TLS_CREDS(obj); QCryptoTLSCreds *creds = QCRYPTO_TLS_CREDS(obj);
creds->verifyPeer = true; creds->verifyPeer = true;
object_property_add_bool(obj, "verify-peer",
qcrypto_tls_creds_prop_get_verify,
qcrypto_tls_creds_prop_set_verify,
NULL);
object_property_add_str(obj, "dir",
qcrypto_tls_creds_prop_get_dir,
qcrypto_tls_creds_prop_set_dir,
NULL);
object_property_add_enum(obj, "endpoint",
"QCryptoTLSCredsEndpoint",
QCryptoTLSCredsEndpoint_lookup,
qcrypto_tls_creds_prop_get_endpoint,
qcrypto_tls_creds_prop_set_endpoint,
NULL);
} }
@ -237,6 +242,7 @@ static const TypeInfo qcrypto_tls_creds_info = {
.instance_size = sizeof(QCryptoTLSCreds), .instance_size = sizeof(QCryptoTLSCreds),
.instance_init = qcrypto_tls_creds_init, .instance_init = qcrypto_tls_creds_init,
.instance_finalize = qcrypto_tls_creds_finalize, .instance_finalize = qcrypto_tls_creds_finalize,
.class_init = qcrypto_tls_creds_class_init,
.class_size = sizeof(QCryptoTLSCredsClass), .class_size = sizeof(QCryptoTLSCredsClass),
.abstract = true, .abstract = true,
}; };

16
crypto/tlscredsanon.c
View File

@ -171,16 +171,6 @@ qcrypto_tls_creds_anon_complete(UserCreatable *uc, Error **errp)
} }
static void
qcrypto_tls_creds_anon_init(Object *obj)
{
object_property_add_bool(obj, "loaded",
qcrypto_tls_creds_anon_prop_get_loaded,
qcrypto_tls_creds_anon_prop_set_loaded,
NULL);
}
static void static void
qcrypto_tls_creds_anon_finalize(Object *obj) qcrypto_tls_creds_anon_finalize(Object *obj)
{ {
@ -196,6 +186,11 @@ qcrypto_tls_creds_anon_class_init(ObjectClass *oc, void *data)
UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc); UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
ucc->complete = qcrypto_tls_creds_anon_complete; ucc->complete = qcrypto_tls_creds_anon_complete;
object_class_property_add_bool(oc, "loaded",
qcrypto_tls_creds_anon_prop_get_loaded,
qcrypto_tls_creds_anon_prop_set_loaded,
NULL);
} }
@ -203,7 +198,6 @@ static const TypeInfo qcrypto_tls_creds_anon_info = {
.parent = TYPE_QCRYPTO_TLS_CREDS, .parent = TYPE_QCRYPTO_TLS_CREDS,
.name = TYPE_QCRYPTO_TLS_CREDS_ANON, .name = TYPE_QCRYPTO_TLS_CREDS_ANON,
.instance_size = sizeof(QCryptoTLSCredsAnon), .instance_size = sizeof(QCryptoTLSCredsAnon),
.instance_init = qcrypto_tls_creds_anon_init,
.instance_finalize = qcrypto_tls_creds_anon_finalize, .instance_finalize = qcrypto_tls_creds_anon_finalize,
.class_size = sizeof(QCryptoTLSCredsAnonClass), .class_size = sizeof(QCryptoTLSCredsAnonClass),
.class_init = qcrypto_tls_creds_anon_class_init, .class_init = qcrypto_tls_creds_anon_class_init,

26
crypto/tlscredsx509.c
View File

@ -804,19 +804,6 @@ qcrypto_tls_creds_x509_init(Object *obj)
QCryptoTLSCredsX509 *creds = QCRYPTO_TLS_CREDS_X509(obj); QCryptoTLSCredsX509 *creds = QCRYPTO_TLS_CREDS_X509(obj);
creds->sanityCheck = true; creds->sanityCheck = true;
object_property_add_bool(obj, "loaded",
qcrypto_tls_creds_x509_prop_get_loaded,
qcrypto_tls_creds_x509_prop_set_loaded,
NULL);
object_property_add_bool(obj, "sanity-check",
qcrypto_tls_creds_x509_prop_get_sanity,
qcrypto_tls_creds_x509_prop_set_sanity,
NULL);
object_property_add_str(obj, "passwordid",
qcrypto_tls_creds_x509_prop_get_passwordid,
qcrypto_tls_creds_x509_prop_set_passwordid,
NULL);
} }
@ -836,6 +823,19 @@ qcrypto_tls_creds_x509_class_init(ObjectClass *oc, void *data)
UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc); UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
ucc->complete = qcrypto_tls_creds_x509_complete; ucc->complete = qcrypto_tls_creds_x509_complete;
object_class_property_add_bool(oc, "loaded",
qcrypto_tls_creds_x509_prop_get_loaded,
qcrypto_tls_creds_x509_prop_set_loaded,
NULL);
object_class_property_add_bool(oc, "sanity-check",
qcrypto_tls_creds_x509_prop_get_sanity,
qcrypto_tls_creds_x509_prop_set_sanity,
NULL);
object_class_property_add_str(oc, "passwordid",
qcrypto_tls_creds_x509_prop_get_passwordid,
qcrypto_tls_creds_x509_prop_set_passwordid,
NULL);
} }

8
include/crypto/cipher.h
View File

@ -138,7 +138,7 @@ size_t qcrypto_cipher_get_iv_len(QCryptoCipherAlgorithm alg,
* @mode: the cipher usage mode * @mode: the cipher usage mode
* @key: the private key bytes * @key: the private key bytes
* @nkey: the length of @key * @nkey: the length of @key
* @errp: pointer to an uninitialized error object * @errp: pointer to a NULL-initialized error object
* *
* Creates a new cipher object for encrypting/decrypting * Creates a new cipher object for encrypting/decrypting
* data with the algorithm @alg in the usage mode @mode. * data with the algorithm @alg in the usage mode @mode.
@ -174,7 +174,7 @@ void qcrypto_cipher_free(QCryptoCipher *cipher);
* @in: buffer holding the plain text input data * @in: buffer holding the plain text input data
* @out: buffer to fill with the cipher text output data * @out: buffer to fill with the cipher text output data
* @len: the length of @in and @out buffers * @len: the length of @in and @out buffers
* @errp: pointer to an uninitialized error object * @errp: pointer to a NULL-initialized error object
* *
* Encrypts the plain text stored in @in, filling * Encrypts the plain text stored in @in, filling
* @out with the resulting ciphered text. Both the * @out with the resulting ciphered text. Both the
@ -196,7 +196,7 @@ int qcrypto_cipher_encrypt(QCryptoCipher *cipher,
* @in: buffer holding the cipher text input data * @in: buffer holding the cipher text input data
* @out: buffer to fill with the plain text output data * @out: buffer to fill with the plain text output data
* @len: the length of @in and @out buffers * @len: the length of @in and @out buffers
* @errp: pointer to an uninitialized error object * @errp: pointer to a NULL-initialized error object
* *
* Decrypts the cipher text stored in @in, filling * Decrypts the cipher text stored in @in, filling
* @out with the resulting plain text. Both the * @out with the resulting plain text. Both the
@ -216,7 +216,7 @@ int qcrypto_cipher_decrypt(QCryptoCipher *cipher,
* @cipher: the cipher object * @cipher: the cipher object
* @iv: the initialization vector bytes * @iv: the initialization vector bytes
* @niv: the length of @iv * @niv: the length of @iv
* @errpr: pointer to an uninitialized error object * @errpr: pointer to a NULL-initialized error object
* *
* If the @cipher object is setup to use a mode that requires * If the @cipher object is setup to use a mode that requires
* initialization vectors, this sets the initialization vector * initialization vectors, this sets the initialization vector

12
include/crypto/hash.h
View File

@ -55,7 +55,7 @@ size_t qcrypto_hash_digest_len(QCryptoHashAlgorithm alg);
* @niov: the length of @iov * @niov: the length of @iov
* @result: pointer to hold output hash * @result: pointer to hold output hash
* @resultlen: pointer to hold length of @result * @resultlen: pointer to hold length of @result
* @errp: pointer to uninitialized error object * @errp: pointer to a NULL-initialized error object
* *
* Computes the hash across all the memory regions * Computes the hash across all the memory regions
* present in @iov. The @result pointer will be * present in @iov. The @result pointer will be
@ -80,7 +80,7 @@ int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
* @len: the length of @buf * @len: the length of @buf
* @result: pointer to hold output hash * @result: pointer to hold output hash
* @resultlen: pointer to hold length of @result * @resultlen: pointer to hold length of @result
* @errp: pointer to uninitialized error object * @errp: pointer to a NULL-initialized error object
* *
* Computes the hash across all the memory region * Computes the hash across all the memory region
* @buf of length @len. The @result pointer will be * @buf of length @len. The @result pointer will be
@ -104,7 +104,7 @@ int qcrypto_hash_bytes(QCryptoHashAlgorithm alg,
* @iov: the array of memory regions to hash * @iov: the array of memory regions to hash
* @niov: the length of @iov * @niov: the length of @iov
* @digest: pointer to hold output hash * @digest: pointer to hold output hash
* @errp: pointer to uninitialized error object * @errp: pointer to a NULL-initialized error object
* *
* Computes the hash across all the memory regions * Computes the hash across all the memory regions
* present in @iov. The @digest pointer will be * present in @iov. The @digest pointer will be
@ -127,7 +127,7 @@ int qcrypto_hash_digestv(QCryptoHashAlgorithm alg,
* @buf: the memory region to hash * @buf: the memory region to hash
* @len: the length of @buf * @len: the length of @buf
* @digest: pointer to hold output hash * @digest: pointer to hold output hash
* @errp: pointer to uninitialized error object * @errp: pointer to a NULL-initialized error object
* *
* Computes the hash across all the memory region * Computes the hash across all the memory region
* @buf of length @len. The @digest pointer will be * @buf of length @len. The @digest pointer will be
@ -150,7 +150,7 @@ int qcrypto_hash_digest(QCryptoHashAlgorithm alg,
* @iov: the array of memory regions to hash * @iov: the array of memory regions to hash
* @niov: the length of @iov * @niov: the length of @iov
* @base64: pointer to hold output hash * @base64: pointer to hold output hash
* @errp: pointer to uninitialized error object * @errp: pointer to a NULL-initialized error object
* *
* Computes the hash across all the memory regions * Computes the hash across all the memory regions
* present in @iov. The @base64 pointer will be * present in @iov. The @base64 pointer will be
@ -173,7 +173,7 @@ int qcrypto_hash_base64v(QCryptoHashAlgorithm alg,
* @buf: the memory region to hash * @buf: the memory region to hash
* @len: the length of @buf * @len: the length of @buf
* @base64: pointer to hold output hash * @base64: pointer to hold output hash
* @errp: pointer to uninitialized error object * @errp: pointer to a NULL-initialized error object
* *
* Computes the hash across all the memory region * Computes the hash across all the memory region
* @buf of length @len. The @base64 pointer will be * @buf of length @len. The @base64 pointer will be

8
include/crypto/tlssession.h
View File

@ -114,7 +114,7 @@ typedef struct QCryptoTLSSession QCryptoTLSSession;
* @hostname: optional hostname to validate * @hostname: optional hostname to validate
* @aclname: optional ACL to validate peer credentials against * @aclname: optional ACL to validate peer credentials against
* @endpoint: role of the TLS session, client or server * @endpoint: role of the TLS session, client or server
* @errp: pointer to an uninitialized error object * @errp: pointer to a NULL-initialized error object
* *
* Create a new TLS session object that will be used to * Create a new TLS session object that will be used to
* negotiate a TLS session over an arbitrary data channel. * negotiate a TLS session over an arbitrary data channel.
@ -163,7 +163,7 @@ void qcrypto_tls_session_free(QCryptoTLSSession *sess);
/** /**
* qcrypto_tls_session_check_credentials: * qcrypto_tls_session_check_credentials:
* @sess: the TLS session object * @sess: the TLS session object
* @errp: pointer to an uninitialized error object * @errp: pointer to a NULL-initialized error object
* *
* Validate the peer's credentials after a successful * Validate the peer's credentials after a successful
* TLS handshake. It is an error to call this before * TLS handshake. It is an error to call this before
@ -249,7 +249,7 @@ ssize_t qcrypto_tls_session_read(QCryptoTLSSession *sess,
/** /**
* qcrypto_tls_session_handshake: * qcrypto_tls_session_handshake:
* @sess: the TLS session object * @sess: the TLS session object
* @errp: pointer to an uninitialized error object * @errp: pointer to a NULL-initialized error object
* *
* Start, or continue, a TLS handshake sequence. If * Start, or continue, a TLS handshake sequence. If
* the underlying data channel is non-blocking, then * the underlying data channel is non-blocking, then
@ -292,7 +292,7 @@ qcrypto_tls_session_get_handshake_status(QCryptoTLSSession *sess);
/** /**
* qcrypto_tls_session_get_key_size: * qcrypto_tls_session_get_key_size:
* @sess: the TLS session object * @sess: the TLS session object
* @errp: pointer to an uninitialized error object * @errp: pointer to a NULL-initialized error object
* *
* Check the size of the data channel encryption key * Check the size of the data channel encryption key
* *