Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (57 commits)
  crypto: aes - Precompute tables
  crypto: talitos - Ack done interrupt in isr instead of tasklet
  crypto: testmgr - Correct comment about deflate parameters
  crypto: salsa20 - Remove private wrappers around various operations
  crypto: des3_ede - permit weak keys unless REQ_WEAK_KEY set
  crypto: sha512 - Switch to shash 
  crypto: sha512 - Move message schedule W[80] to static percpu area
  crypto: michael_mic - Switch to shash
  crypto: wp512 - Switch to shash
  crypto: tgr192 - Switch to shash
  crypto: sha256 - Switch to shash
  crypto: md5 - Switch to shash
  crypto: md4 - Switch to shash
  crypto: sha1 - Switch to shash
  crypto: rmd320 - Switch to shash
  crypto: rmd256 - Switch to shash
  crypto: rmd160 - Switch to shash
  crypto: rmd128 - Switch to shash
  crypto: null - Switch to shash
  crypto: hash - Make setkey optional
  ...

1 files changed, 13 insertions, 7 deletions

diff --git a/crypto/proc.c b/crypto/proc.c
index 37a13d05636d..5dc07e442fca 100644
--- a/crypto/proc.c
+++ b/crypto/proc.c
@@ -94,6 +94,17 @@ static int c_show(struct seq_file *m, void *p)
         seq_printf(m, "selftest     : %s\n",
                    (alg->cra_flags & CRYPTO_ALG_TESTED) ?
                    "passed" : "unknown");
+
+        if (alg->cra_flags & CRYPTO_ALG_LARVAL) {
+                seq_printf(m, "type         : larval\n");
+                seq_printf(m, "flags        : 0x%x\n", alg->cra_flags);
+                goto out;
+        }
+
+        if (alg->cra_type && alg->cra_type->show) {
+                alg->cra_type->show(m, alg);
+                goto out;
+        }
         
         switch (alg->cra_flags & (CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_LARVAL)) {
         case CRYPTO_ALG_TYPE_CIPHER:
@@ -115,16 +126,11 @@ static int c_show(struct seq_file *m, void *p)
                 seq_printf(m, "type         : compression\n");
                 break;
         default:
-                if (alg->cra_flags & CRYPTO_ALG_LARVAL) {
-                        seq_printf(m, "type         : larval\n");
-                        seq_printf(m, "flags        : 0x%x\n", alg->cra_flags);
-                } else if (alg->cra_type && alg->cra_type->show)
-                        alg->cra_type->show(m, alg);
-                else
-                        seq_printf(m, "type         : unknown\n");
+                seq_printf(m, "type         : unknown\n");
                 break;
         }
 
+out:
         seq_putc(m, '\n');
         return 0;
 }