Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[platform/kernel/linux-starfive.git] / drivers / net / ppp / ppp_mppe.c

diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c
index 66c8e65..bd3c80b 100644 (file)
--- a/drivers/net/ppp/ppp_mppe.c
+++ b/drivers/net/ppp/ppp_mppe.c
@@ -42,9 +42,10 @@
  *                    deprecated in 2.6
  */
 
+#include <crypto/arc4.h>
 #include <crypto/hash.h>
-#include <crypto/skcipher.h>
 #include <linux/err.h>
+#include <linux/fips.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -66,13 +67,6 @@ MODULE_ALIAS("ppp-compress-" __stringify(CI_MPPE));
 MODULE_SOFTDEP("pre: arc4");
 MODULE_VERSION("1.0.2");
 
-static unsigned int
-setup_sg(struct scatterlist *sg, const void *address, unsigned int length)
-{
-       sg_set_buf(sg, address, length);
-       return length;
-}
-
 #define SHA1_PAD_SIZE 40
 
 /*
@@ -96,7 +90,7 @@ static inline void sha_pad_init(struct sha_pad *shapad)
  * State for an MPPE (de)compressor.
  */
 struct ppp_mppe_state {
-       struct crypto_sync_skcipher *arc4;
+       struct arc4_ctx arc4;
        struct shash_desc *sha1;
        unsigned char *sha1_digest;
        unsigned char master_key[MPPE_MAX_KEY_LEN];
@@ -155,24 +149,11 @@ static void get_new_key_from_sha(struct ppp_mppe_state * state)
  */
 static void mppe_rekey(struct ppp_mppe_state * state, int initial_key)
 {
-       struct scatterlist sg_in[1], sg_out[1];
-       SYNC_SKCIPHER_REQUEST_ON_STACK(req, state->arc4);
-
-       skcipher_request_set_sync_tfm(req, state->arc4);
-       skcipher_request_set_callback(req, 0, NULL, NULL);
-
        get_new_key_from_sha(state);
        if (!initial_key) {
-               crypto_sync_skcipher_setkey(state->arc4, state->sha1_digest,
-                                           state->keylen);
-               sg_init_table(sg_in, 1);
-               sg_init_table(sg_out, 1);
-               setup_sg(sg_in, state->sha1_digest, state->keylen);
-               setup_sg(sg_out, state->session_key, state->keylen);
-               skcipher_request_set_crypt(req, sg_in, sg_out, state->keylen,
-                                          NULL);
-               if (crypto_skcipher_encrypt(req))
-                   printk(KERN_WARNING "mppe_rekey: cipher_encrypt failed\n");
+               arc4_setkey(&state->arc4, state->sha1_digest, state->keylen);
+               arc4_crypt(&state->arc4, state->session_key, state->sha1_digest,
+                          state->keylen);
        } else {
                memcpy(state->session_key, state->sha1_digest, state->keylen);
        }
@@ -182,9 +163,7 @@ static void mppe_rekey(struct ppp_mppe_state * state, int initial_key)
                state->session_key[1] = 0x26;
                state->session_key[2] = 0x9e;
        }
-       crypto_sync_skcipher_setkey(state->arc4, state->session_key,
-                                   state->keylen);
-       skcipher_request_zero(req);
+       arc4_setkey(&state->arc4, state->session_key, state->keylen);
 }
 
 /*
@@ -197,7 +176,8 @@ static void *mppe_alloc(unsigned char *options, int optlen)
        unsigned int digestsize;
 
        if (optlen != CILEN_MPPE + sizeof(state->master_key) ||
-           options[0] != CI_MPPE || options[1] != CILEN_MPPE)
+           options[0] != CI_MPPE || options[1] != CILEN_MPPE ||
+           fips_enabled)
                goto out;
 
        state = kzalloc(sizeof(*state), GFP_KERNEL);
@@ -205,12 +185,6 @@ static void *mppe_alloc(unsigned char *options, int optlen)
                goto out;
 
 
-       state->arc4 = crypto_alloc_sync_skcipher("ecb(arc4)", 0, 0);
-       if (IS_ERR(state->arc4)) {
-               state->arc4 = NULL;
-               goto out_free;
-       }
-
        shash = crypto_alloc_shash("sha1", 0, 0);
        if (IS_ERR(shash))
                goto out_free;
@@ -251,7 +225,6 @@ out_free:
                crypto_free_shash(state->sha1->tfm);
                kzfree(state->sha1);
        }
-       crypto_free_sync_skcipher(state->arc4);
        kfree(state);
 out:
        return NULL;
@@ -267,8 +240,7 @@ static void mppe_free(void *arg)
                kfree(state->sha1_digest);
                crypto_free_shash(state->sha1->tfm);
                kzfree(state->sha1);
-               crypto_free_sync_skcipher(state->arc4);
-               kfree(state);
+               kzfree(state);
        }
 }
 
@@ -367,10 +339,7 @@ mppe_compress(void *arg, unsigned char *ibuf, unsigned char *obuf,
              int isize, int osize)
 {
        struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg;
-       SYNC_SKCIPHER_REQUEST_ON_STACK(req, state->arc4);
        int proto;
-       int err;
-       struct scatterlist sg_in[1], sg_out[1];
 
        /*
         * Check that the protocol is in the range we handle.
@@ -421,21 +390,7 @@ mppe_compress(void *arg, unsigned char *ibuf, unsigned char *obuf,
        ibuf += 2;              /* skip to proto field */
        isize -= 2;
 
-       /* Encrypt packet */
-       sg_init_table(sg_in, 1);
-       sg_init_table(sg_out, 1);
-       setup_sg(sg_in, ibuf, isize);
-       setup_sg(sg_out, obuf, osize);
-
-       skcipher_request_set_sync_tfm(req, state->arc4);
-       skcipher_request_set_callback(req, 0, NULL, NULL);
-       skcipher_request_set_crypt(req, sg_in, sg_out, isize, NULL);
-       err = crypto_skcipher_encrypt(req);
-       skcipher_request_zero(req);
-       if (err) {
-               printk(KERN_DEBUG "crypto_cypher_encrypt failed\n");
-               return -1;
-       }
+       arc4_crypt(&state->arc4, obuf, ibuf, isize);
 
        state->stats.unc_bytes += isize;
        state->stats.unc_packets++;
@@ -481,10 +436,8 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf,
                int osize)
 {
        struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg;
-       SYNC_SKCIPHER_REQUEST_ON_STACK(req, state->arc4);
        unsigned ccount;
        int flushed = MPPE_BITS(ibuf) & MPPE_BIT_FLUSHED;
-       struct scatterlist sg_in[1], sg_out[1];
 
        if (isize <= PPP_HDRLEN + MPPE_OVHD) {
                if (state->debug)
@@ -611,19 +564,7 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf,
         * Decrypt the first byte in order to check if it is
         * a compressed or uncompressed protocol field.
         */
-       sg_init_table(sg_in, 1);
-       sg_init_table(sg_out, 1);
-       setup_sg(sg_in, ibuf, 1);
-       setup_sg(sg_out, obuf, 1);
-
-       skcipher_request_set_sync_tfm(req, state->arc4);
-       skcipher_request_set_callback(req, 0, NULL, NULL);
-       skcipher_request_set_crypt(req, sg_in, sg_out, 1, NULL);
-       if (crypto_skcipher_decrypt(req)) {
-               printk(KERN_DEBUG "crypto_cypher_decrypt failed\n");
-               osize = DECOMP_ERROR;
-               goto out_zap_req;
-       }
+       arc4_crypt(&state->arc4, obuf, ibuf, 1);
 
        /*
         * Do PFC decompression.
@@ -638,14 +579,7 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf,
        }
 
        /* And finally, decrypt the rest of the packet. */
-       setup_sg(sg_in, ibuf + 1, isize - 1);
-       setup_sg(sg_out, obuf + 1, osize - 1);
-       skcipher_request_set_crypt(req, sg_in, sg_out, isize - 1, NULL);
-       if (crypto_skcipher_decrypt(req)) {
-               printk(KERN_DEBUG "crypto_cypher_decrypt failed\n");
-               osize = DECOMP_ERROR;
-               goto out_zap_req;
-       }
+       arc4_crypt(&state->arc4, obuf + 1, ibuf + 1, isize - 1);
 
        state->stats.unc_bytes += osize;
        state->stats.unc_packets++;
@@ -655,8 +589,6 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf,
        /* good packet credit */
        state->sanity_errors >>= 1;
 
-out_zap_req:
-       skcipher_request_zero(req);
        return osize;
 
 sanity_error:
@@ -729,8 +661,7 @@ static struct compressor ppp_mppe = {
 static int __init ppp_mppe_init(void)
 {
        int answer;
-       if (!(crypto_has_skcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC) &&
-             crypto_has_ahash("sha1", 0, CRYPTO_ALG_ASYNC)))
+       if (fips_enabled || !crypto_has_ahash("sha1", 0, CRYPTO_ALG_ASYNC))
                return -ENODEV;
 
        sha_pad = kmalloc(sizeof(struct sha_pad), GFP_KERNEL);