diff -r 721a5e5fe251 -r 9b5a3a9fddf8 crypto/weakcryptospi/test/tpadding/tpaddingPKCS1.cpp --- a/crypto/weakcryptospi/test/tpadding/tpaddingPKCS1.cpp Tue Jan 26 13:18:49 2010 +0200 +++ b/crypto/weakcryptospi/test/tpadding/tpaddingPKCS1.cpp Sat Feb 20 00:36:18 2010 +0200 @@ -18,6 +18,7 @@ #include #include +#include #include "tpaddingPKCS1.h" CTestPadPKCS1::CTestPadPKCS1() @@ -281,7 +282,10 @@ in[0] = 0; in[1] = 2; TBuf8<256> rnd(256); - GenerateRandomBytesL(rnd); + TRAPD(err, GenerateRandomBytesL(rnd)); + if((err != KErrNone) && (err != KErrNotSecure)) + User::Leave(err); + TInt k = 2; TInt j = 0; @@ -294,7 +298,9 @@ if (++j%256 == 0) { - GenerateRandomBytesL(rnd); + TRAP(err, GenerateRandomBytesL(rnd)); + if((err != KErrNone) && (err != KErrNotSecure)) + User::Leave(err); } } in[endOfPadding] = 0; // delimiter @@ -306,7 +312,7 @@ comp.Append(text); } - TRAPD(err, padding->UnPadL(in, out)); + TRAP(err, padding->UnPadL(in, out)); TEST(err == KErrNone); TEST(out == comp);