net+crypto: Use vmalloc for zlib inflate buffers.

[linux-2.6.git] / crypto / proc.c

diff --git a/crypto/proc.c b/crypto/proc.c
index 8543b7a157d6a8a77069f11b2aed5c0d8cc1f9f2..58fef67d4f4dbe9cb351c202be7518b003dfe893 100644 (file)
--- a/crypto/proc.c
+++ b/crypto/proc.c
@@ -19,28 +19,56 @@
 #include <linux/rwsem.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/sysctl.h>
 #include "internal.h"
 
-static void *c_start(struct seq_file *m, loff_t *pos)
+#ifdef CONFIG_CRYPTO_FIPS
+static struct ctl_table crypto_sysctl_table[] = {
+       {
+               .procname       = "fips_enabled",
+               .data           = &fips_enabled,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = proc_dointvec
+       },
+       {}
+};
+
+static struct ctl_table crypto_dir_table[] = {
+       {
+               .procname       = "crypto",
+               .mode           = 0555,
+               .child          = crypto_sysctl_table
+       },
+       {}
+};
+
+static struct ctl_table_header *crypto_sysctls;
+
+static void crypto_proc_fips_init(void)
 {
-       struct list_head *v;
-       loff_t n = *pos;
+       crypto_sysctls = register_sysctl_table(crypto_dir_table);
+}
+
+static void crypto_proc_fips_exit(void)
+{
+       if (crypto_sysctls)
+               unregister_sysctl_table(crypto_sysctls);
+}
+#else
+#define crypto_proc_fips_init()
+#define crypto_proc_fips_exit()
+#endif
 
+static void *c_start(struct seq_file *m, loff_t *pos)
+{
        down_read(&crypto_alg_sem);
-       list_for_each(v, &crypto_alg_list)
-               if (!n--)
-                       return list_entry(v, struct crypto_alg, cra_list);
-       return NULL;
+       return seq_list_start(&crypto_alg_list, *pos);
 }
 
 static void *c_next(struct seq_file *m, void *p, loff_t *pos)
 {
-       struct list_head *v = p;
-       
-       (*pos)++;
-       v = v->next;
-       return (v == &crypto_alg_list) ?
-               NULL : list_entry(v, struct crypto_alg, cra_list);
+       return seq_list_next(p, &crypto_alg_list, pos);
 }
 
 static void c_stop(struct seq_file *m, void *p)
@@ -50,15 +78,29 @@ static void c_stop(struct seq_file *m, void *p)
 
 static int c_show(struct seq_file *m, void *p)
 {
-       struct crypto_alg *alg = (struct crypto_alg *)p;
+       struct crypto_alg *alg = list_entry(p, struct crypto_alg, cra_list);
        
        seq_printf(m, "name         : %s\n", alg->cra_name);
        seq_printf(m, "driver       : %s\n", alg->cra_driver_name);
        seq_printf(m, "module       : %s\n", module_name(alg->cra_module));
        seq_printf(m, "priority     : %d\n", alg->cra_priority);
        seq_printf(m, "refcnt       : %d\n", atomic_read(&alg->cra_refcnt));
+       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) {
+       switch (alg->cra_flags & (CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_LARVAL)) {
        case CRYPTO_ALG_TYPE_CIPHER:
                seq_printf(m, "type         : cipher\n");
                seq_printf(m, "blocksize    : %u\n", alg->cra_blocksize);
@@ -67,13 +109,6 @@ static int c_show(struct seq_file *m, void *p)
                seq_printf(m, "max keysize  : %u\n",
                                        alg->cra_cipher.cia_max_keysize);
                break;
-               
-       case CRYPTO_ALG_TYPE_DIGEST:
-               seq_printf(m, "type         : digest\n");
-               seq_printf(m, "blocksize    : %u\n", alg->cra_blocksize);
-               seq_printf(m, "digestsize   : %u\n",
-                          alg->cra_digest.dia_digestsize);
-               break;
        case CRYPTO_ALG_TYPE_COMPRESS:
                seq_printf(m, "type         : compression\n");
                break;
@@ -82,11 +117,12 @@ static int c_show(struct seq_file *m, void *p)
                break;
        }
 
+out:
        seq_putc(m, '\n');
        return 0;
 }
 
-static struct seq_operations crypto_seq_ops = {
+static const struct seq_operations crypto_seq_ops = {
        .start          = c_start,
        .next           = c_next,
        .stop           = c_stop,
@@ -98,7 +134,7 @@ static int crypto_info_open(struct inode *inode, struct file *file)
        return seq_open(file, &crypto_seq_ops);
 }
         
-static struct file_operations proc_crypto_ops = {
+static const struct file_operations proc_crypto_ops = {
        .open           = crypto_info_open,
        .read           = seq_read,
        .llseek         = seq_lseek,
@@ -107,9 +143,12 @@ static struct file_operations proc_crypto_ops = {
 
 void __init crypto_init_proc(void)
 {
-       struct proc_dir_entry *proc;
-       
-       proc = create_proc_entry("crypto", 0, NULL);
-       if (proc)
-               proc->proc_fops = &proc_crypto_ops;
+       proc_create("crypto", 0, NULL, &proc_crypto_ops);
+       crypto_proc_fips_init();
+}
+
+void __exit crypto_exit_proc(void)
+{
+       crypto_proc_fips_exit();
+       remove_proc_entry("crypto", NULL);
 }