Patches 1&2 alter the virRandomBytes to accomodate the lone holdout code that was using /dev/urandom directly to add a range of bytes that are acceptible returns for the caller. Patches 3&4 modify the virCryptoEncryptData algorithm to "A" (hopefully) build right in a non gnutls environment and "B" make it so there future adjustments won't be doing cut, copy, & paste based on the key size and whether the iv is required. If AES192CBC were added the first two parameters to the DO_CRYPT macro would be 24, 16, while AES192CBC would have 16, 16. John Ferlan (4): util: Add range parameters to virRandomBytes storage: Use virRandomBytes for virStorageGenerateQcowPassphrase util: Alter virCryptoEncryptData for non GNUTLS builds util: Adjust virCryptoEncryptData code to use macros src/storage/storage_backend.c | 10 +++-- src/util/vircrypto.c | 88 +++++++++++++++++++++++++---------------- src/util/virrandom.c | 13 ++++-- src/util/virrandom.h | 3 +- src/util/virstorageencryption.c | 42 +++++++------------- src/util/virstorageencryption.h | 4 +- src/util/viruuid.c | 2 +- tests/qemuxml2argvmock.c | 2 +- tests/vircryptotest.c | 4 +- tests/virrandommock.c | 10 +++-- tests/virrandomtest.c | 32 +++++++++++---- 11 files changed, 124 insertions(+), 86 deletions(-) -- 2.5.5 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list