summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2003-11-09 19:52:25 +0000
committerLennart Poettering <lennart@poettering.net>2003-11-09 19:52:25 +0000
commitf88306f35c301ee09d7b31238c0ce0c954a86c4d (patch)
tree6d8ed1994d9bb888bcacafc6fb0a65b444b9e951
parent1a4fc731c54a7ab8830febd3f8b7c9ad9423ea70 (diff)
cipher selection fixes
git-svn-id: file:///home/lennart/svn/public/seppl/trunk@14 91a2fd9b-5dcb-0310-a70a-d71e310228e6
-rwxr-xr-xbootstrap.sh2
-rw-r--r--kernel/seppl.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/bootstrap.sh b/bootstrap.sh
index 148356b..3fb6593 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: bootstrap.sh 58 2003-10-20 21:57:59Z lennart $
+# $Id$
# This file is part of seppl.
#
diff --git a/kernel/seppl.c b/kernel/seppl.c
index de59eb1..6b23ca3 100644
--- a/kernel/seppl.c
+++ b/kernel/seppl.c
@@ -1,4 +1,4 @@
-/* $Id: newmail.c 31 2003-10-22 22:59:07Z lennart $ */
+/* $Id$ */
/***
This file is part of seppl
@@ -55,8 +55,8 @@ struct cipher_info {
#define CIPHER_DICT_MAX 2
static const struct cipher_info cipher_dict[CIPHER_DICT_MAX] = {
- { "aes-cbc", 128 },
- { "aes-cbc", 192 }
+ { "aes", 128 },
+ { "aes", 192 }
};
const struct cipher_info *seppl_find_cipher(u8 id) {
@@ -172,7 +172,7 @@ int seppl_add_key(u8 algorithm, const char *name, const u8 *key_data) {
atomic_set(&key->usage, 0);
spin_lock_init(&key->iv_spinlock);
- if (!(key->tfm = crypto_alloc_tfm("aes", CRYPTO_TFM_MODE_CBC))) {
+ if (!(key->tfm = crypto_alloc_tfm(cinfo->name, CRYPTO_TFM_MODE_CBC))) {
printk(KERN_ERR "SEPPL: Failed to load cipher.\n");
goto cleanup;
}