yarrow: prevent access to NULL pointer

This commit is contained in:
Steffen Jaeckel 2012-05-04 01:01:24 +02:00
parent 9c4fc762fc
commit 77860ba866

View File

@ -343,11 +343,13 @@ int yarrow_test(void)
}
/* now let's test the hash/cipher that was chosen */
if ((err = cipher_descriptor[prng.yarrow.cipher].test()) != CRYPT_OK) {
return err;
if (cipher_descriptor[prng.yarrow.cipher].test &&
((err = cipher_descriptor[prng.yarrow.cipher].test()) != CRYPT_OK)) {
return err;
}
if ((err = hash_descriptor[prng.yarrow.hash].test()) != CRYPT_OK) {
return err;
if (hash_descriptor[prng.yarrow.hash].test &&
((err = hash_descriptor[prng.yarrow.hash].test()) != CRYPT_OK)) {
return err;
}
return CRYPT_OK;