Re: [OpenWrt-Devel] [PATCH 3/3] lantiq: ltq-deu: Remove the "DEU test manager"

2016-01-17 Thread Felix Fietkau
On 2016-01-11 15:25, Martin Blumenstingl wrote:
> Remove the "DEU test manager" code which has not been used for more than
> two years (as the kernel module is not installed anymore since
> aa65888e08ec7279cfecc24c5bfe71cf9a016b91).
> This fixes compilation on kernel 4.3 (which removes
> aead_request_set_assoc) and newer.
> 
> Signed-off-by: Martin Blumenstingl 
> ---
This patch doesn't apply for me.

- Felix
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH 3/3] lantiq: ltq-deu: Remove the "DEU test manager"

2016-01-11 Thread Martin Blumenstingl
Remove the "DEU test manager" code which has not been used for more than
two years (as the kernel module is not installed anymore since
aa65888e08ec7279cfecc24c5bfe71cf9a016b91).
This fixes compilation on kernel 4.3 (which removes
aead_request_set_assoc) and newer.

Signed-off-by: Martin Blumenstingl 
---
 package/kernel/lantiq/ltq-deu/src/Makefile |2 -
 .../kernel/lantiq/ltq-deu/src/ltq_deu_testmgr.c| 3961 
 2 files changed, 3963 deletions(-)
 delete mode 100644 package/kernel/lantiq/ltq-deu/src/ltq_deu_testmgr.c

diff --git a/package/kernel/lantiq/ltq-deu/src/Makefile 
b/package/kernel/lantiq/ltq-deu/src/Makefile
index f6cb9c9..555f0f6 100644
--- a/package/kernel/lantiq/ltq-deu/src/Makefile
+++ b/package/kernel/lantiq/ltq-deu/src/Makefile
@@ -22,5 +22,3 @@ ifeq ($(BUILD_VARIANT),vr9)
   ltq_deu_vr9-objs = ifxmips_deu.o ifxmips_deu_vr9.o ifxmips_des.o 
ifxmips_aes.o ifxmips_arc4.o \
ifxmips_sha1.o ifxmips_md5.o ifxmips_sha1_hmac.o 
ifxmips_md5_hmac.o
 endif
-
-obj-m += ltq_deu_testmgr.o
diff --git a/package/kernel/lantiq/ltq-deu/src/ltq_deu_testmgr.c 
b/package/kernel/lantiq/ltq-deu/src/ltq_deu_testmgr.c
deleted file mode 100644
index 054cac3..000
--- a/package/kernel/lantiq/ltq-deu/src/ltq_deu_testmgr.c
+++ /dev/null
@@ -1,3961 +0,0 @@
-/*
- * Algorithm testing framework and tests.
- *
- * Copyright (c) 2002 James Morris 
- * Copyright (c) 2002 Jean-Francois Dive 
- * Copyright (c) 2007 Nokia Siemens Networks
- * Copyright (c) 2008 Herbert Xu 
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- */
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "internal.h"
-#include "ifxmips_testmgr.h"
-#include "ifxmips_tcrypt.h"
-#include "ifxmips_deu.h"
-
-/* changes for LQ ablkcipher speedtest */
-#include 
-#include 
-#include 
-
-/*
- * Need slab memory for testing (size in number of pages).
- */
-#define XBUFSIZE   8
-
-/*
- * Indexes into the xbuf to simulate cross-page access.
- */
-#define IDX1   32
-#define IDX2   32400
-#define IDX3   1
-#define IDX4   8193
-#define IDX5   2
-#define IDX6   17101
-#define IDX7   27333
-#define IDX8   3000
-
-/*
-* Used by test_cipher()
-*/
-#define ENCRYPT 1
-#define DECRYPT 0
-
-/*
- * Need slab memory for testing (size in number of pages).
- */
-#define TVMEMSIZE  4
-
-/*
-* Used by test_cipher_speed()
-*/
-#define ENCRYPT 1
-#define DECRYPT 0
-
-/*
- * Used by test_cipher_speed()
- */
-
-#ifndef INIT_COMPLETION
-#define INIT_COMPLETION(a) reinit_completion(&a)
-#endif
-
-
-static unsigned int sec;
-
-static char *alg = NULL;
-static u32 type;
-static u32 mask;
-static int mode;
-static char *tvmem[TVMEMSIZE];
-
-static char *check[] = {
-   "des", "md5", "des3_ede", "rot13", "sha1", "sha224", "sha256",
-   "blowfish", "twofish", "serpent", "sha384", "sha512", "md4", "aes",
-   "cast6", "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea",
-   "khazad", "wp512", "wp384", "wp256", "tnepres", "xeta",  "fcrypt",
-   "camellia", "seed", "salsa20", "rmd128", "rmd160", "rmd256", "rmd320",
-   "lzo", "cts", "zlib", NULL
-};
-struct tcrypt_result {
-   struct completion completion;
-   int err;
-};
-
-struct aead_test_suite {
-   struct {
-   struct aead_testvec *vecs;
-   unsigned int count;
-   } enc, dec;
-};
-
-struct cipher_test_suite {
-   struct {
-   struct cipher_testvec *vecs;
-   unsigned int count;
-   } enc, dec;
-};
-
-struct comp_test_suite {
-   struct {
-   struct comp_testvec *vecs;
-   unsigned int count;
-   } comp, decomp;
-};
-
-struct pcomp_test_suite {
-   struct {
-   struct pcomp_testvec *vecs;
-   unsigned int count;
-   } comp, decomp;
-};
-
-struct hash_test_suite {
-   struct hash_testvec *vecs;
-   unsigned int count;
-};
-
-struct cprng_test_suite {
-   struct cprng_testvec *vecs;
-   unsigned int count;
-};
-
-struct alg_test_desc {
-   const char *alg;
-   int (*test)(const struct alg_test_desc *desc, const char *driver,
-   u32 type, u32 mask);
-   int fips_allowed;   /* set if alg is allowed in fips mode */
-
-   union {
-   struct aead_test_suite aead;
-   struct cipher_test_suite cipher;
-   struct comp_test_suite comp;
-   struct pcomp_test_suite pcomp;
-   struct hash_test_suite hash;
-   struct cprng_test_suite cprng;
-   } suite;
-};
-
-static unsigned int IDX[8] = { IDX1, IDX2, IDX3, IDX4, IDX5, I