diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-07-24 14:17:58 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-07-24 14:17:58 +0000 |
commit | 00dd85d8f61db55d6e08d224ed30f077075e9766 (patch) | |
tree | 7cabb1d9085c88122c18b953a731e548953a544b /package/ocf-crypto-headers/src/cryptodev.h | |
parent | 8ecad9c51ad06d4eaa325e5a9f4c42adb4b4eecb (diff) | |
download | upstream-00dd85d8f61db55d6e08d224ed30f077075e9766.tar.gz upstream-00dd85d8f61db55d6e08d224ed30f077075e9766.tar.bz2 upstream-00dd85d8f61db55d6e08d224ed30f077075e9766.zip |
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
SVN-Revision: 27753
Diffstat (limited to 'package/ocf-crypto-headers/src/cryptodev.h')
-rw-r--r-- | package/ocf-crypto-headers/src/cryptodev.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/package/ocf-crypto-headers/src/cryptodev.h b/package/ocf-crypto-headers/src/cryptodev.h index fa1a57b4f8..cca0ec822d 100644 --- a/package/ocf-crypto-headers/src/cryptodev.h +++ b/package/ocf-crypto-headers/src/cryptodev.h @@ -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; }; |