On Wednesday 29 April 2009 09:34:31 Jarod Wilson wrote: > On Wednesday 29 April 2009 09:26:46 Herbert Xu wrote: > > On Wed, Apr 29, 2009 at 09:18:37AM -0400, Jarod Wilson wrote: > > > On Wednesday 29 April 2009 09:15:07 Herbert Xu wrote: > > > > On Tue, Apr 28, 2009 at 09:11:51PM -0400, Jarod Wilson wrote: > > > > > > > > > > +notest: > > > > > + printk(KERN_INFO "alg: No test for %s (%s)\n", alg, driver); > > > > > > > > Can notest ever get here with rc != 0? > > > > > > Nope. > > > > So why do we need to move it? > > Oh. Hrm. Upon looking a bit harder at it, I think the only reason > would be if we wanted to print out a message claiming success in > testing ctr(aes). > > There's also a devious ulterior motive for this patch, which is > to make the cryptodev tree look identical(er) to the Red Hat > Enterprise Linux 5.x kernel tree w/in alg_test()...
Version 2, streamlined and simplified, RHEL5 be damned. Signed-off-by: Jarod Wilson <[email protected]> --- crypto/testmgr.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/crypto/testmgr.c b/crypto/testmgr.c index 0161cc2..f39c148 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -2220,7 +2220,8 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask) if (i < 0) goto notest; - return alg_test_cipher(alg_test_descs + i, driver, type, mask); + rc = alg_test_cipher(alg_test_descs + i, driver, type, mask); + goto test_done; } i = alg_find_test(alg); @@ -2229,6 +2230,7 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask) rc = alg_test_descs[i].test(alg_test_descs + i, driver, type, mask); +test_done: if (fips_enabled && rc) panic("%s: %s alg self test failed in fips mode!\n", driver, alg); -- Jarod Wilson [email protected] -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
