ipc/sem.c: fully initialize sem_array before making it visible

[pandora-kernel.git] / crypto / shash.c

diff --git a/crypto/shash.c b/crypto/shash.c
index ea8a9c6..f507294 100644 (file)
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -524,12 +524,14 @@ static unsigned int crypto_shash_extsize(struct crypto_alg *alg)
        return alg->cra_ctxsize;
 }
 
+#ifdef CONFIG_NET
 static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg)
 {
        struct crypto_report_hash rhash;
        struct shash_alg *salg = __crypto_shash_alg(alg);
 
-       snprintf(rhash.type, CRYPTO_MAX_ALG_NAME, "%s", "shash");
+       strncpy(rhash.type, "shash", sizeof(rhash.type));
+
        rhash.blocksize = alg->cra_blocksize;
        rhash.digestsize = salg->digestsize;
 
@@ -541,6 +543,12 @@ static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg)
 nla_put_failure:
        return -EMSGSIZE;
 }
+#else
+static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg)
+{
+       return -ENOSYS;
+}
+#endif
 
 static void crypto_shash_show(struct seq_file *m, struct crypto_alg *alg)
        __attribute__ ((unused));