Permalink
Browse files

ocf-linux: version bump to 20110720

Fixes problem with TFM allocation in cryptosoft.c


Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

Hauke:
 * remove ubsec_ssb package and take it from ocf-linux
 * use patches from ocf-linux package
 * refresh all patches
 * readd some build fixes for OpenWrt.
 * readd CRYPTO_MANAGER dependency


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27753 3c298f89-4303-0410-b956-a3cf2f4a3e73
  • Loading branch information...
1 parent c3cc545 commit 32dec7075aae5cc6ef1e4394dc94fed1767b848e hauke committed Jul 24, 2011
Showing with 1,264 additions and 2,768 deletions.
  1. +16 −0 package/kernel/modules/crypto.mk
  2. +1 −1 package/ocf-crypto-headers/Makefile
  3. +5 −3 package/ocf-crypto-headers/src/cryptodev.h
  4. +0 −48 package/ubsec_ssb/Makefile
  5. +0 −19 package/ubsec_ssb/src/Makefile
  6. +0 −478 package/ubsec_ssb/src/cryptodev.h
  7. +0 −308 package/ubsec_ssb/src/md5.c
  8. +0 −76 package/ubsec_ssb/src/md5.h
  9. +0 −270 package/ubsec_ssb/src/ocf-compat.h
  10. +0 −279 package/ubsec_ssb/src/sha1.c
  11. +0 −72 package/ubsec_ssb/src/sha1.h
  12. +0 −54 package/ubsec_ssb/src/uio.h
  13. +1 −0 target/linux/generic/config-2.6.30
  14. +1 −0 target/linux/generic/config-2.6.31
  15. +1 −0 target/linux/generic/config-2.6.32
  16. +1 −0 target/linux/generic/config-2.6.36
  17. +1 −0 target/linux/generic/config-2.6.37
  18. +1 −0 target/linux/generic/config-2.6.38
  19. +1 −0 target/linux/generic/config-2.6.39
  20. +1 −0 target/linux/generic/config-3.0
  21. +2 −0 target/linux/generic/files/crypto/ocf/Config.in
  22. +6 −0 target/linux/generic/files/crypto/ocf/Kconfig
  23. +61 −40 target/linux/generic/files/crypto/ocf/Makefile
  24. +195 −116 target/linux/generic/files/crypto/ocf/README
  25. +2 −4 target/linux/generic/files/crypto/ocf/criov.c
  26. +58 −79 target/linux/generic/files/crypto/ocf/crypto.c
  27. +20 −22 target/linux/generic/files/crypto/ocf/cryptocteon/cryptocteon.c
  28. +2 −5 target/linux/generic/files/crypto/ocf/cryptodev.c
  29. +2 −1 target/linux/generic/files/crypto/ocf/cryptodev.h
  30. +138 −31 target/linux/generic/files/crypto/ocf/cryptosoft.c
  31. +6 −31 target/linux/generic/files/crypto/ocf/hifn/hifn7751.c
  32. +0 −1 target/linux/generic/files/crypto/ocf/hifn/hifn7751var.h
  33. +3 −6 target/linux/generic/files/crypto/ocf/hifn/hifnHIPP.c
  34. +24 −12 target/linux/generic/files/crypto/ocf/ixp4xx/ixp4xx.c
  35. +123 −0 target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAesBoxes.dat
  36. +3 −5 target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c
  37. +105 −30 target/linux/generic/files/crypto/ocf/ocf-bench.c
  38. +71 −0 target/linux/generic/files/crypto/ocf/ocf-compat.h
  39. +2 −4 target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c
  40. +4 −9 target/linux/generic/files/crypto/ocf/pasemi/pasemi.c
  41. +2 −10 target/linux/generic/files/crypto/ocf/random.c
  42. +2 −5 target/linux/generic/files/crypto/ocf/rndtest.c
  43. +0 −1 {package/ubsec_ssb/src → target/linux/generic/files/crypto/ocf/safe}/hmachack.h
  44. +7 −66 target/linux/generic/files/crypto/ocf/safe/safe.c
  45. +0 −1 target/linux/generic/files/crypto/ocf/safe/safevar.h
  46. +5 −12 target/linux/generic/files/crypto/ocf/talitos/talitos.c
  47. +0 −1 target/linux/generic/files/crypto/ocf/talitos/talitos_soft.h
  48. +12 −0 target/linux/generic/files/crypto/ocf/ubsec_ssb/Makefile
  49. 0 {package/ubsec_ssb/src → target/linux/generic/files/crypto/ocf/ubsec_ssb}/bsdqueue.h
  50. +11 −9 {package/ubsec_ssb/src → target/linux/generic/files/crypto/ocf/ubsec_ssb}/ubsec_ssb.c
  51. 0 {package/ubsec_ssb/src → target/linux/generic/files/crypto/ocf/ubsec_ssb}/ubsecreg.h
  52. 0 {package/ubsec_ssb/src → target/linux/generic/files/crypto/ocf/ubsec_ssb}/ubsecvar.h
  53. +132 −0 target/linux/generic/patches-2.6.30/971-ocf_20110720.patch
  54. +7 −46 target/linux/generic/patches-2.6.31/{971-ocf_20100325.patch → 971-ocf_20110720.patch}
  55. +6 −45 target/linux/generic/patches-2.6.32/{971-ocf_20100325.patch → 971-ocf_20110720.patch}
  56. +1 −1 target/linux/generic/patches-2.6.36/970-ocf_kbuild_integration.patch
  57. +0 −170 target/linux/generic/patches-2.6.36/971-ocf_20100325.patch
  58. +17 −44 target/linux/generic/{patches-2.6.30/971-ocf_20100325.patch → patches-2.6.36/971-ocf_20110720.patch}
  59. +24 −61 target/linux/generic/patches-2.6.37/{941-ocf_20100325.patch → 941-ocf_20110720.patch}
  60. +24 −61 target/linux/generic/patches-2.6.38/{941-ocf_20100325.patch → 941-ocf_20110720.patch}
  61. +24 −61 target/linux/generic/patches-2.6.39/{941-ocf_20100325.patch → 941-ocf_20110720.patch}
  62. +0 −170 target/linux/generic/patches-3.0/941-ocf_20100325.patch
  63. +133 −0 target/linux/generic/patches-3.0/941-ocf_20110720.patch
@@ -455,3 +455,19 @@ define KernelPackage/crypto-mv-cesa
endef
$(eval $(call KernelPackage,crypto-mv-cesa))
+
+
+define KernelPackage/ocf-ubsec-ssb
+ TITLE:=BCM5365P IPSec Core driver
+ DEPENDS:=@TARGET_brcm47xx +kmod-crypto-ocf
+ KCONFIG:=CONFIG_OCF_UBSEC_SSB
+ FILES:=$(LINUX_DIR)/crypto/ocf/ubsec_ssb/ubsec_ssb.ko
+ AUTOLOAD:=$(call AutoLoad,10,ubsec_ssb)
+ $(call AddDepends/crypto)
+endef
+
+define KernelPackage/ocf-ubsec-ssb/description
+ This package contains the OCF driver for the BCM5365p IPSec Core
+endef
+
+$(eval $(call KernelPackage,ocf-ubsec-ssb))
@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ocf-crypto-headers
-PKG_VERSION:=20080917
+PKG_VERSION:=20110720
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
@@ -2,8 +2,8 @@
/* $OpenBSD: cryptodev.h,v 1.31 2002/06/11 11:14:29 beck Exp $ */
/*-
- * Linux port done by David McCullough <david_mccullough@securecomputing.com>
- * Copyright (C) 2006-2007 David McCullough
+ * Linux port done by David McCullough <david_mccullough@mcafee.com>
+ * Copyright (C) 2006-2010 David McCullough
* Copyright (C) 2004-2005 Intel Corporation.
* The license and original author are listed below.
*
@@ -156,7 +156,8 @@
#define CRYPTO_SHA2_384 23
#define CRYPTO_SHA2_512 24
#define CRYPTO_RIPEMD160 25
-#define CRYPTO_ALGORITHM_MAX 25 /* Keep updated - see below */
+#define CRYPTO_LZS_COMP 26
+#define CRYPTO_ALGORITHM_MAX 26 /* Keep updated - see above */
/* Algorithm flags */
#define CRYPTO_ALG_FLAG_SUPPORTED 0x01 /* Algorithm is supported */
@@ -336,6 +337,7 @@ struct cryptodesc {
#define crd_key CRD_INI.cri_key
#define crd_alg CRD_INI.cri_alg
#define crd_klen CRD_INI.cri_klen
+#define crd_mlen CRD_INI.cri_mlen
struct cryptodesc *crd_next;
};
View
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ubsec-ssb
-PKG_VERSION:=2009-02-21
-PKG_RELEASE:=1
-
-CRYPTO_MENU:=OCF Configuration
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/ocf-ubsec-ssb
- SUBMENU:=$(CRYPTO_MENU)
- DEPENDS:=@TARGET_brcm47xx +kmod-crypto-core +kmod-crypto-ocf
- TITLE:=BCM5365P IPSec Core driver
- FILES:=$(PKG_BUILD_DIR)/src/ubsec_ssb.ko
- AUTOLOAD:=$(call AutoLoad,09,ubsec_ssb)
-endef
-
-define KernelPackage/ocf-ubsec-ssb/description
- This package contains the OCF driver for the BCM5365p IPSec Core
-endef
-
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
- $(CP) -r ./src $(PKG_BUILD_DIR)/
-endef
-
-LINUX_PATCHLEVEL:=$(shell echo "$(LINUX_VERSION)" | cut -d. -f2)
-
-define Build/Compile
- $(MAKE) -C $(LINUX_DIR) \
- ARCH="$(LINUX_KARCH)" \
- CROSS_COMPILE="$(TARGET_CROSS)" \
- PATCHLEVEL="$(LINUX_PATCHLEVEL)" \
- KERNDIR="$(LINUX_DIR)" \
- SUBDIRS="$(PKG_BUILD_DIR)/src" \
- modules
-endef
-
-$(eval $(call KernelPackage,ocf-ubsec-ssb))
@@ -1,19 +0,0 @@
-#
-# Makefile for b5365ips driver
-#
-# Copyright (C) 2007 Daniel Mueller <daniel@danm.de>
-#
-# 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.
-#
-
-obj-m := ubsec_ssb.o
-
-obj ?= .
-
-ifeq ($(MAKING_MODULES),1)
-
--include $(TOPDIR)/Rules.make
-endif
Oops, something went wrong.

0 comments on commit 32dec70

Please sign in to comment.