diff -r 721a5e5fe251 -r 9b5a3a9fddf8 cryptoservices/asnpkcs/test/tpkcs8enc/pkcs8Tester.cpp --- a/cryptoservices/asnpkcs/test/tpkcs8enc/pkcs8Tester.cpp Tue Jan 26 13:18:49 2010 +0200 +++ b/cryptoservices/asnpkcs/test/tpkcs8enc/pkcs8Tester.cpp Sat Feb 20 00:36:18 2010 +0200 @@ -30,9 +30,9 @@ #include #include #include -#include - +#include #include +#include #include "pkcs8tester.h" @@ -157,7 +157,9 @@ HBufC8* saltc = HBufC8::NewMaxLC(16); TPtr8 salt(saltc->Des()); salt.FillZ(); - rand->GenerateBytesL(salt); + TRAPD(err, rand->GenerateBytesL(salt)); + if((err != KErrNone) && (err != KErrNotSecure)) + User::Leave(err); HBufC8* ivc = HBufC8::NewMaxLC(8); @@ -229,13 +231,17 @@ HBufC8* saltc = HBufC8::NewMaxLC(16); TPtr8 salt(saltc->Des()); salt.FillZ(); - rand->GenerateBytesL(salt); + TRAPD(err, rand->GenerateBytesL(salt)); + if((err != KErrNone) && (err != KErrNotSecure)) + User::Leave(err); HBufC8* ivc = HBufC8::NewMaxLC(8); TPtr8 iv(ivc->Des()); iv.FillZ(); - rand->GenerateBytesL(iv); + TRAP(err, rand->GenerateBytesL(iv)); + if((err != KErrNone) && (err != KErrNotSecure)) + User::Leave(err); CPBEncryptParms* params = CPBEncryptParms::NewLC(ECipher3DES_CBC, salt, iv, 2048); CPBEncryptElement* encryptElement = CPBEncryptElement::NewLC(pass, *params);