Merge tag 'r8169-upstream-20061204-00' of git://electric-eye.fr.zoreil.com/home/romie...

[pandora-kernel.git] / net / sunrpc / auth_gss / gss_spkm3_mech.c

diff --git a/net/sunrpc/auth_gss/gss_spkm3_mech.c b/net/sunrpc/auth_gss/gss_spkm3_mech.c
index 3d0432a..d57f608 100644 (file)
--- a/net/sunrpc/auth_gss/gss_spkm3_mech.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_mech.c
@@ -34,6 +34,7 @@
  *
  */
 
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
@@ -75,18 +76,18 @@ simple_get_netobj(const void *p, const void *end, struct xdr_netobj *res)
        q = (const void *)((const char *)p + len);
        if (unlikely(q > end || q < p))
                return ERR_PTR(-EFAULT);
-       res->data = kmalloc(len, GFP_KERNEL);
+       res->data = kmemdup(p, len, GFP_KERNEL);
        if (unlikely(res->data == NULL))
                return ERR_PTR(-ENOMEM);
-       memcpy(res->data, p, len);
        return q;
 }
 
 static inline const void *
-get_key(const void *p, const void *end, struct crypto_tfm **res, int *resalg)
+get_key(const void *p, const void *end, struct crypto_blkcipher **res,
+       int *resalg)
 {
        struct xdr_netobj       key = { 0 };
-       int                     alg_mode,setkey = 0;
+       int                     setkey = 0;
        char                    *alg_name;
 
        p = simple_get_bytes(p, end, resalg, sizeof(*resalg));
@@ -98,14 +99,12 @@ get_key(const void *p, const void *end, struct crypto_tfm **res, int *resalg)
 
        switch (*resalg) {
                case NID_des_cbc:
-                       alg_name = "des";
-                       alg_mode = CRYPTO_TFM_MODE_CBC;
+                       alg_name = "cbc(des)";
                        setkey = 1;
                        break;
                case NID_cast5_cbc:
                        /* XXXX here in name only, not used */
-                       alg_name = "cast5";
-                       alg_mode = CRYPTO_TFM_MODE_CBC;
+                       alg_name = "cbc(cast5)";
                        setkey = 0; /* XXX will need to set to 1 */
                        break;
                case NID_md5:
@@ -113,19 +112,20 @@ get_key(const void *p, const void *end, struct crypto_tfm **res, int *resalg)
                                dprintk("RPC: SPKM3 get_key: NID_md5 zero Key length\n");
                        }
                        alg_name = "md5";
-                       alg_mode = 0;
                        setkey = 0;
                        break;
                default:
                        dprintk("gss_spkm3_mech: unsupported algorithm %d\n", *resalg);
                        goto out_err_free_key;
        }
-       if (!(*res = crypto_alloc_tfm(alg_name, alg_mode))) {
+       *res = crypto_alloc_blkcipher(alg_name, 0, CRYPTO_ALG_ASYNC);
+       if (IS_ERR(*res)) {
                printk("gss_spkm3_mech: unable to initialize crypto algorthm %s\n", alg_name);
+               *res = NULL;
                goto out_err_free_key;
        }
        if (setkey) {
-               if (crypto_cipher_setkey(*res, key.data, key.len)) {
+               if (crypto_blkcipher_setkey(*res, key.data, key.len)) {
                        printk("gss_spkm3_mech: error setting key for crypto algorthm %s\n", alg_name);
                        goto out_err_free_tfm;
                }
@@ -136,7 +136,7 @@ get_key(const void *p, const void *end, struct crypto_tfm **res, int *resalg)
        return p;
 
 out_err_free_tfm:
-       crypto_free_tfm(*res);
+       crypto_free_blkcipher(*res);
 out_err_free_key:
        if(key.len > 0)
                kfree(key.data);
@@ -152,9 +152,8 @@ gss_import_sec_context_spkm3(const void *p, size_t len,
        const void *end = (const void *)((const char *)p + len);
        struct  spkm3_ctx *ctx;
 
-       if (!(ctx = kmalloc(sizeof(*ctx), GFP_KERNEL)))
+       if (!(ctx = kzalloc(sizeof(*ctx), GFP_KERNEL)))
                goto out_err;
-       memset(ctx, 0, sizeof(*ctx));
 
        p = simple_get_netobj(p, end, &ctx->ctx_id);
        if (IS_ERR(p))
@@ -205,9 +204,9 @@ gss_import_sec_context_spkm3(const void *p, size_t len,
        return 0;
 
 out_err_free_key2:
-       crypto_free_tfm(ctx->derived_integ_key);
+       crypto_free_blkcipher(ctx->derived_integ_key);
 out_err_free_key1:
-       crypto_free_tfm(ctx->derived_conf_key);
+       crypto_free_blkcipher(ctx->derived_conf_key);
 out_err_free_s_key:
        kfree(ctx->share_key.data);
 out_err_free_mech:
@@ -224,8 +223,8 @@ static void
 gss_delete_sec_context_spkm3(void *internal_ctx) {
        struct spkm3_ctx *sctx = internal_ctx;
 
-       crypto_free_tfm(sctx->derived_integ_key);
-       crypto_free_tfm(sctx->derived_conf_key);
+       crypto_free_blkcipher(sctx->derived_integ_key);
+       crypto_free_blkcipher(sctx->derived_conf_key);
        kfree(sctx->share_key.data);
        kfree(sctx->mech_used.data);
        kfree(sctx);