ocf-linux: version bump to 20110720

[15.05/openwrt.git] / target / linux / generic / files / crypto / ocf / safe / safe.c

diff --git a/target/linux/generic/files/crypto/ocf/safe/safe.c b/target/linux/generic/files/crypto/ocf/safe/safe.c
index de77431..189b95f 100644 (file)
--- a/target/linux/generic/files/crypto/ocf/safe/safe.c
+++ b/target/linux/generic/files/crypto/ocf/safe/safe.c
@@ -32,10 +32,8 @@ __FBSDID("$FreeBSD: src/sys/dev/safe/safe.c,v 1.18 2007/03/21 03:42:50 sam Exp $
  */
 
 #include <linux/version.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
-#include <generated/autoconf.h>
-#else
-#include <linux/autoconf.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
 #endif
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -49,7 +47,6 @@ __FBSDID("$FreeBSD: src/sys/dev/safe/safe.c,v 1.18 2007/03/21 03:42:50 sam Exp $
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
 #include <linux/random.h>
-#include <linux/version.h>
 #include <linux/skbuff.h>
 #include <asm/io.h>
 
@@ -80,40 +77,11 @@ __FBSDID("$FreeBSD: src/sys/dev/safe/safe.c,v 1.18 2007/03/21 03:42:50 sam Exp $
  */
 #define HMAC_HACK 1
 #ifdef HMAC_HACK
-#define LITTLE_ENDIAN 1234
-#define BIG_ENDIAN 4321
-#ifdef __LITTLE_ENDIAN
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-#ifdef __BIG_ENDIAN
-#define BYTE_ORDER BIG_ENDIAN
-#endif
+#include <safe/hmachack.h>
 #include <safe/md5.h>
 #include <safe/md5.c>
 #include <safe/sha1.h>
 #include <safe/sha1.c>
-
-u_int8_t hmac_ipad_buffer[64] = {
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36
-};
-
-u_int8_t hmac_opad_buffer[64] = {
-    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
-    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
-    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
-    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
-    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
-    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
-    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
-    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C
-};
 #endif /* HMAC_HACK */
 
 /* add proc entry for this */
@@ -564,10 +532,6 @@ safe_newsession(device_t dev, u_int32_t *sidp, struct cryptoini *cri)
        ses->ses_used = 1;
 
        if (encini) {
-               /* get an IV */
-               /* XXX may read fewer than requested */
-               read_random(ses->ses_iv, sizeof(ses->ses_iv));
-
                ses->ses_klen = encini->cri_klen;
                if (encini->cri_key != NULL)
                        safe_setup_enckey(ses, encini->cri_key);
@@ -630,7 +594,7 @@ safe_process(device_t dev, struct cryptop *crp, int hint)
        struct safe_ringentry *re;
        struct safe_sarec *sa;
        struct safe_pdesc *pd;
-       u_int32_t cmd0, cmd1, staterec;
+       u_int32_t cmd0, cmd1, staterec, rand_iv[4];
        unsigned long flags;
 
        DPRINTF(("%s()\n", __FUNCTION__));
@@ -779,7 +743,7 @@ safe_process(device_t dev, struct cryptop *crp, int hint)
                        if (enccrd->crd_flags & CRD_F_IV_EXPLICIT)
                                iv = enccrd->crd_iv;
                        else
-                               iv = (caddr_t) ses->ses_iv;
+                               read_random((iv = (caddr_t) &rand_iv[0]), sizeof(rand_iv));
                        if ((enccrd->crd_flags & CRD_F_IV_PRESENT) == 0) {
                                crypto_copyback(crp->crp_flags, crp->crp_buf,
                                    enccrd->crd_inject, ivsize, iv);
@@ -1129,31 +1093,6 @@ safe_callback(struct safe_softc *sc, struct safe_ringentry *re)
                return;
        }
 
-       if (re->re_flags & SAFE_QFLAGS_COPYOUTIV) {
-               /* copy out IV for future use */
-               for (crd = crp->crp_desc; crd; crd = crd->crd_next) {
-                       int i;
-                       int ivsize;
-
-                       if (crd->crd_alg == CRYPTO_DES_CBC ||
-                           crd->crd_alg == CRYPTO_3DES_CBC) {
-                               ivsize = 2*sizeof(u_int32_t);
-                       } else if (crd->crd_alg == CRYPTO_AES_CBC) {
-                               ivsize = 4*sizeof(u_int32_t);
-                       } else
-                               continue;
-                       crypto_copydata(crp->crp_flags, crp->crp_buf,
-                           crd->crd_skip + crd->crd_len - ivsize, ivsize,
-                           (caddr_t)sc->sc_sessions[re->re_sesn].ses_iv);
-                       for (i = 0;
-                                       i < ivsize/sizeof(sc->sc_sessions[re->re_sesn].ses_iv[0]);
-                                       i++)
-                               sc->sc_sessions[re->re_sesn].ses_iv[i] =
-                                       cpu_to_le32(sc->sc_sessions[re->re_sesn].ses_iv[i]);
-                       break;
-               }
-       }
-
        if (re->re_flags & SAFE_QFLAGS_COPYOUTICV) {
                /* copy out ICV result */
                for (crd = crp->crp_desc; crd; crd = crd->crd_next) {
@@ -2005,10 +1944,12 @@ static int safe_probe(struct pci_dev *dev, const struct pci_device_id *ent)
                return(-ENODEV);
        }
 
+#ifdef HAVE_PCI_SET_MWI
        if (pci_set_mwi(dev)) {
                printk("safe: pci_set_mwi failed!");
                return(-ENODEV);
        }
+#endif
 
        sc = (struct safe_softc *) kmalloc(sizeof(*sc), GFP_KERNEL);
        if (!sc)