david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge qcrypto 2017/02/27 v1

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJYtCueAAoJEL6G67QVEE/fSywQAJd1OBIUZvWfawyJTCmEAPdk
 9ehtjg+kIh98t4msmqYJ7qTfz/r/HzUrz7+RXsiE6wjvf9/4oRvWuNrnhpPjdlKo
 LPOYKql6FLgetk8UZJwyQBYiKRiK7N14w7zXWkURXSsXr8WesJOqdtK6BtZBhsvn
 oslaYjfJ8V72zB1fwU8d/KZnsxdpiYrdS4lEwl7x3J6AyKhYckq+muydUmMnuZyk
 aiyOprc+YTJ0oaqBeKn4GUellxwbGCDqi4N5JgTaXI4WpnHdq/sgIVQdM/l9GwP1
 eo2te4Ent4j3cW4JrNUsUuZQlC/zNx0acHlZMYeQ0mhRVzHVRza3A7e2Mk6mOmGA
 9gOLwck6hvKG7Sr4XC/2YJEdXROhlkVFNfygd39yoS6RuBrUiZI1lqKHZFp1uMws
 O0tt2D2Jd+XzF9gjPuN1zcTP0/OQT5V9lMQsNJ0SK/hgfo4HCydu/NkaqWCTJpdl
 QZeQlJtyt7Yv/24TWwscrot3RDBZZQCKR6/GbTeQHstmZJN6Pgr5aSaf3wWJ/OpI
 ONkH8PS39x6dxeu1UaADUS3CN6P1NFtTfH/fy831fZ1X89LsBgs+1zydjc9cGWJw
 9mA7/P2J7ALrrWft10tpQvJ1m4KJ5nfzE0lCsGdNzeVbF7RIQ+soFraWRhjK6WZn
 j5zmZaxovMcXluLBwcKL
 =6O+4
 -----END PGP SIGNATURE-----

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

Merge qcrypto 2017/02/27 v1

# gpg: Signature made Mon 27 Feb 2017 13:37:34 GMT
# gpg:                using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/pull-qcrypto-2017-02-27-1:
  crypto: assert cipher algorithm is always valid
  crypto: fix leak in ivgen essiv init

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-02-27 15:33:21 +00:00
commit 8f2d7c3411
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/cipher.c
View File

@ -63,18 +63,14 @@ static bool mode_need_iv[QCRYPTO_CIPHER_MODE__MAX] = {
size_t qcrypto_cipher_get_block_len(QCryptoCipherAlgorithm alg) size_t qcrypto_cipher_get_block_len(QCryptoCipherAlgorithm alg)
{ {
if (alg >= G_N_ELEMENTS(alg_key_len)) { assert(alg < G_N_ELEMENTS(alg_key_len));
return 0;
}
return alg_block_len[alg]; return alg_block_len[alg];
} }
size_t qcrypto_cipher_get_key_len(QCryptoCipherAlgorithm alg) size_t qcrypto_cipher_get_key_len(QCryptoCipherAlgorithm alg)
{ {
if (alg >= G_N_ELEMENTS(alg_key_len)) { assert(alg < G_N_ELEMENTS(alg_key_len));
return 0;
}
return alg_key_len[alg]; return alg_key_len[alg];
} }

1
crypto/ivgen-essiv.c
View File

@ -48,6 +48,7 @@ static int qcrypto_ivgen_essiv_init(QCryptoIVGen *ivgen,
&salt, &nhash, &salt, &nhash,
errp) < 0) { errp) < 0) {
g_free(essiv); g_free(essiv);
g_free(salt);
return -1; return -1;
} }