2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 13:43:55 +08:00

staging: crypto: skein: allow building statically

These are the minimum changes required to get the code to build
statically in the kernel.  It's necessary to do this first so that we
can empirically determine that future cleanup patches aren't changing
the generated object code.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jason Cooper 2014-03-24 02:32:49 +00:00 committed by Greg Kroah-Hartman
parent 449bb8125e
commit c2c7426bfc
18 changed files with 59 additions and 125 deletions

View File

@ -146,6 +146,8 @@ source "drivers/staging/gs_fpgaboot/Kconfig"
source "drivers/staging/nokia_h4p/Kconfig"
source "drivers/staging/skein/Kconfig"
source "drivers/staging/unisys/Kconfig"
endif # STAGING

View File

@ -65,4 +65,5 @@ obj-$(CONFIG_DGAP) += dgap/
obj-$(CONFIG_MTD_SPINAND_MT29F) += mt29f_spinand/
obj-$(CONFIG_GS_FPGABOOT) += gs_fpgaboot/
obj-$(CONFIG_BT_NOKIA_H4P) += nokia_h4p/
obj-$(CONFIG_CRYPTO_SKEIN) += skein/
obj-$(CONFIG_UNISYSSPAR) += unisys/

View File

@ -1,27 +0,0 @@
cmake_minimum_required (VERSION 2.6)
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
# set(skeinBlock_src skein_block.c)
set(skeinBlock_src skeinBlockNo3F.c)
set(skein_src
${skeinBlock_src}
skein.c
skeinApi.c
)
set(threefish_src
threefishApi.c
threefish256Block.c
threefish512Block.c
threefish1024Block.c
)
set(s3f_src ${skein_src} ${threefish_src})
add_library(skein3fish SHARED ${s3f_src})
set_target_properties(skein3fish PROPERTIES VERSION ${VERSION} SOVERSION ${SOVERSION})
target_link_libraries(skein3fish ${LIBS})
install(TARGETS skein3fish DESTINATION ${LIBDIRNAME})

View File

@ -0,0 +1,32 @@
config CRYPTO_SKEIN
bool "Skein digest algorithm"
depends on (X86 || UML_X86) && 64BIT
select CRYPTO_THREEFISH
select CRYPTO_HASH
help
Skein secure hash algorithm is one of 5 finalists from the NIST SHA3
competition.
Skein is optimized for modern, 64bit processors and is highly
customizable. See:
http://www.skein-hash.info/sites/default/files/skein1.3.pdf
for more information. This module depends on the threefish block
cipher module.
config CRYPTO_THREEFISH
bool "Threefish tweakable block cipher"
depends on (X86 || UML_X86) && 64BIT
select CRYPTO_ALGAPI
help
Threefish cipher algorithm is the tweakable block cipher underneath
the Skein family of secure hash algorithms. Skein is one of 5
finalists from the NIST SHA3 competition.
Skein is optimized for modern, 64bit processors and is highly
customizable. See:
http://www.skein-hash.info/sites/default/files/skein1.3.pdf
for more information.

View File

@ -0,0 +1,13 @@
#
# Makefile for the skein secure hash algorithm
#
subdir-ccflags-y := -I$(src)/include/
obj-$(CONFIG_CRYPTO_SKEIN) += skein.o \
skeinApi.o \
skein_block.o
obj-$(CONFIG_CRYPTO_THREEFISH) += threefish1024Block.o \
threefish256Block.o \
threefish512Block.o \
threefishApi.o

View File

@ -46,83 +46,26 @@
extern "C" {
#endif
#include <limits.h>
#ifndef BRG_UI8
# define BRG_UI8
# if UCHAR_MAX == 255u
typedef unsigned char uint_8t;
# else
# error Please define uint_8t as an 8-bit unsigned integer type in brg_types.h
# endif
#endif
#ifndef BRG_UI16
# define BRG_UI16
# if USHRT_MAX == 65535u
typedef unsigned short uint_16t;
# else
# error Please define uint_16t as a 16-bit unsigned short type in brg_types.h
# endif
#endif
#ifndef BRG_UI32
# define BRG_UI32
# if UINT_MAX == 4294967295u
# define li_32(h) 0x##h##u
typedef unsigned int uint_32t;
# elif ULONG_MAX == 4294967295u
# define li_32(h) 0x##h##ul
typedef unsigned long uint_32t;
# elif defined( _CRAY )
# error This code needs 32-bit data types, which Cray machines do not provide
# else
# error Please define uint_32t as a 32-bit unsigned integer type in brg_types.h
# endif
#endif
#ifndef BRG_UI64
# if defined( __BORLANDC__ ) && !defined( __MSDOS__ )
# define BRG_UI64
# define li_64(h) 0x##h##ui64
typedef unsigned __int64 uint_64t;
# elif defined( _MSC_VER ) && ( _MSC_VER < 1300 ) /* 1300 == VC++ 7.0 */
# define BRG_UI64
# define li_64(h) 0x##h##ui64
typedef unsigned __int64 uint_64t;
# elif defined( __sun ) && defined(ULONG_MAX) && ULONG_MAX == 0xfffffffful
# define BRG_UI64
# define li_64(h) 0x##h##ull
typedef unsigned long long uint_64t;
# elif defined( UINT_MAX ) && UINT_MAX > 4294967295u
# if UINT_MAX == 18446744073709551615u
# define BRG_UI64
# define li_64(h) 0x##h##u
typedef unsigned int uint_64t;
# endif
# elif defined( ULONG_MAX ) && ULONG_MAX > 4294967295u
# if ULONG_MAX == 18446744073709551615ul
# define BRG_UI64
# define li_64(h) 0x##h##ul
typedef unsigned long uint_64t;
# endif
# elif defined( ULLONG_MAX ) && ULLONG_MAX > 4294967295u
# if ULLONG_MAX == 18446744073709551615ull
# define BRG_UI64
# define li_64(h) 0x##h##ull
typedef unsigned long long uint_64t;
# endif
# elif defined( ULONG_LONG_MAX ) && ULONG_LONG_MAX > 4294967295u
# if ULONG_LONG_MAX == 18446744073709551615ull
# define BRG_UI64
# define li_64(h) 0x##h##ull
typedef unsigned long long uint_64t;
# endif
# elif defined(__GNUC__) /* DLW: avoid mingw problem with -ansi */
# define BRG_UI64
# define li_64(h) 0x##h##ull
typedef unsigned long long uint_64t;
# endif
#endif
#if defined( NEED_UINT_64T ) && !defined( BRG_UI64 )

View File

@ -261,18 +261,8 @@ int Skein1024_Output (Skein1024_Ctxt_t *ctx, u08b_t * hashVal);
#define Skein_Show_Key(bits,ctx,key,keyBytes)
#endif
#ifndef SKEIN_ERR_CHECK /* run-time checks (e.g., bad params, uninitialized context)? */
#define Skein_Assert(x,retCode)/* default: ignore all Asserts, for performance */
#define Skein_assert(x)
#elif defined(SKEIN_ASSERT)
#include <assert.h>
#define Skein_Assert(x,retCode) assert(x)
#define Skein_assert(x) assert(x)
#else
#include <assert.h>
#define Skein_Assert(x,retCode) { if (!(x)) return retCode; } /* caller error */
#define Skein_assert(x) assert(x) /* internal error */
#endif
/*****************************************************************
** Skein block function constants (shared across Ref and Opt code)

View File

@ -78,8 +78,8 @@ OTHER DEALINGS IN THE SOFTWARE.
*
*/
#include <linux/types.h>
#include <skein.h>
#include <stdint.h>
#ifdef __cplusplus
extern "C"

View File

@ -44,24 +44,10 @@ typedef uint_64t u64b_t; /* 64-bit unsigned integer */
* platform-specific code instead (e.g., for big-endian CPUs).
*
*/
#ifndef SKEIN_NEED_SWAP /* compile-time "override" for endianness? */
#include <brg_endian.h> /* get endianness selection */
#if PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN
/* here for big-endian CPUs */
#define SKEIN_NEED_SWAP (1)
#elif PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN
/* here for x86 and x86-64 CPUs (and other detected little-endian CPUs) */
#define SKEIN_NEED_SWAP (0)
#if PLATFORM_MUST_ALIGN == 0 /* ok to use "fast" versions? */
/* below two prototype assume we are handed aligned data */
#define Skein_Put64_LSB_First(dst08,src64,bCnt) memcpy(dst08,src64,bCnt)
#define Skein_Get64_LSB_First(dst64,src08,wCnt) memcpy(dst64,src08,8*(wCnt))
#endif
#else
#error "Skein needs endianness setting!"
#endif
#endif /* ifndef SKEIN_NEED_SWAP */
/*
******************************************************************

View File

@ -28,8 +28,8 @@
@endcode
*/
#include <linux/types.h>
#include <skein.h>
#include <stdint.h>
#define KeyScheduleConst 0x1BD11BDAA9FC1A22L

View File

@ -10,7 +10,7 @@
#define SKEIN_PORT_CODE /* instantiate any code in skein_port.h */
#include <string.h> /* get the memcpy/memset functions */
#include <linux/string.h> /* get the memcpy/memset functions */
#include <skein.h> /* get the Skein API definitions */
#include <skein_iv.h> /* get precomputed IVs */

View File

@ -24,10 +24,8 @@ OTHER DEALINGS IN THE SOFTWARE.
*/
#define SKEIN_ERR_CHECK 1
#include <linux/string.h>
#include <skeinApi.h>
#include <string.h>
#include <stdio.h>
int skeinCtxPrepare(SkeinCtx_t* ctx, SkeinSize_t size)
{

View File

@ -1,5 +1,5 @@
#include <string.h>
#include <linux/string.h>
#include <skein.h>
#include <threefishApi.h>

View File

@ -14,7 +14,7 @@
**
************************************************************************/
#include <string.h>
#include <linux/string.h>
#include <skein.h>
#ifndef SKEIN_USE_ASM

View File

@ -1,6 +1,5 @@
#include <linux/string.h>
#include <threefishApi.h>
#include <stdint.h>
#include <string.h>
void threefishEncrypt1024(ThreefishKey_t* keyCtx, uint64_t* input, uint64_t* output)

View File

@ -1,6 +1,5 @@
#include <linux/string.h>
#include <threefishApi.h>
#include <stdint.h>
#include <string.h>
void threefishEncrypt256(ThreefishKey_t* keyCtx, uint64_t* input, uint64_t* output)

View File

@ -1,6 +1,5 @@
#include <linux/string.h>
#include <threefishApi.h>
#include <stdint.h>
#include <string.h>
void threefishEncrypt512(ThreefishKey_t* keyCtx, uint64_t* input, uint64_t* output)

View File

@ -1,8 +1,7 @@
#include <linux/string.h>
#include <threefishApi.h>
#include <stdlib.h>
#include <string.h>
void threefishSetKey(ThreefishKey_t* keyCtx, ThreefishSize_t stateSize,
uint64_t* keyData, uint64_t* tweak)