Commit 4739ccdb authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Add SPARC T4 Camellia support. 

Submitted by: David Miller
parent 54a1f448

Configure

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ my $x86_elf_asm="$x86_asm:elf"; 


my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o::aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o rc4-md5-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:ghash-x86_64.o:e_padlock-x86_64.o";

my $ia64_asm="ia64cpuid.o:bn-ia64.o ia64-mont.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::ghash-ia64.o::void";

my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o::md5-sparcv9.o:sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o:::::::ghash-sparcv9.o::void";

my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o::md5-sparcv9.o:sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o::::::camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o:ghash-sparcv9.o::void";

my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::::void";

my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o:::::sha1-alpha.o:::::::ghash-alpha.o::void";

my $mips64_asm=":bn-mips.o mips-mont.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o sha512-mips.o::::::::";

TABLE

+9 −9
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o

$modes_obj    = ghash-sparcv9.o

$engines_obj  = 

$perlasm_scheme = void
@@ -2627,7 +2627,7 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o

$modes_obj    = ghash-sparcv9.o

$engines_obj  = 

$perlasm_scheme = void
@@ -2660,7 +2660,7 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o

$modes_obj    = ghash-sparcv9.o

$engines_obj  = 

$perlasm_scheme = void
@@ -4409,7 +4409,7 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o

$modes_obj    = ghash-sparcv9.o

$engines_obj  = 

$perlasm_scheme = void
@@ -4607,7 +4607,7 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o

$modes_obj    = ghash-sparcv9.o

$engines_obj  = 

$perlasm_scheme = void
@@ -5465,7 +5465,7 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o

$modes_obj    = ghash-sparcv9.o

$engines_obj  = 

$perlasm_scheme = void
@@ -5498,7 +5498,7 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o

$modes_obj    = ghash-sparcv9.o

$engines_obj  = 

$perlasm_scheme = void
@@ -5597,7 +5597,7 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o

$modes_obj    = ghash-sparcv9.o

$engines_obj  = 

$perlasm_scheme = void
@@ -5630,7 +5630,7 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$cmll_obj     = camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o

$modes_obj    = ghash-sparcv9.o

$engines_obj  = 

$perlasm_scheme = void

crypto/camellia/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ cmll-x86.s: asm/cmll-x86.pl ../perlasm/x86asm.pl 
	$(PERL) asm/cmll-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

cmll-x86_64.s:  asm/cmll-x86_64.pl

	$(PERL) asm/cmll-x86_64.pl $(PERLASM_SCHEME) > $@

cmllt4-sparcv9.s: asm/cmllt4-sparcv9.pl

	$(PERL) asm/cmllt4-sparcv9.pl $(CFLAGS) > $@



files:

	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO

crypto/camellia/asm/cmllt4-sparcv9.pl

0 → 100644
+932 −0

File added.

Preview size limit exceeded, changes collapsed.

crypto/evp/e_camellia.c

+307 −31
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#include <assert.h>

#include <openssl/camellia.h>

#include "evp_locl.h"

#include "modes_lcl.h"



static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,

	const unsigned char *iv, int enc);
@@ -69,59 +70,334 @@ static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 
typedef struct

	{

	CAMELLIA_KEY ks;

	block128_f block;

	union {

		cbc128_f cbc;

		ctr128_f ctr;

	} stream;

	} EVP_CAMELLIA_KEY;



#define MAXBITCHUNK	((size_t)1<<(sizeof(size_t)*8-4))



/* Attribute operation for Camellia */

#define data(ctx)	EVP_C_DATA(EVP_CAMELLIA_KEY,ctx)



IMPLEMENT_BLOCK_CIPHER(camellia_128, ks, Camellia, EVP_CAMELLIA_KEY,

	NID_camellia_128, 16, 16, 16, 128,

	0, camellia_init_key, NULL, 

	EVP_CIPHER_set_asn1_iv,

	EVP_CIPHER_get_asn1_iv,

	NULL)

IMPLEMENT_BLOCK_CIPHER(camellia_192, ks, Camellia, EVP_CAMELLIA_KEY,

	NID_camellia_192, 16, 24, 16, 128,

	0, camellia_init_key, NULL, 

	EVP_CIPHER_set_asn1_iv,

	EVP_CIPHER_get_asn1_iv,

	NULL)

IMPLEMENT_BLOCK_CIPHER(camellia_256, ks, Camellia, EVP_CAMELLIA_KEY,

	NID_camellia_256, 16, 32, 16, 128,

	0, camellia_init_key, NULL, 

	EVP_CIPHER_set_asn1_iv,

	EVP_CIPHER_get_asn1_iv,

	NULL)



#define IMPLEMENT_CAMELLIA_CFBR(ksize,cbits)	IMPLEMENT_CFBR(camellia,Camellia,EVP_CAMELLIA_KEY,ks,ksize,cbits,16,0)



IMPLEMENT_CAMELLIA_CFBR(128,1)

IMPLEMENT_CAMELLIA_CFBR(192,1)

IMPLEMENT_CAMELLIA_CFBR(256,1)



IMPLEMENT_CAMELLIA_CFBR(128,8)

IMPLEMENT_CAMELLIA_CFBR(192,8)

IMPLEMENT_CAMELLIA_CFBR(256,8)

#if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))

/* ---------^^^ this is not a typo, just a way to detect that

 * assembler support was in general requested... */

#include "sparc_arch.h"



extern unsigned int OPENSSL_sparcv9cap_P[];



#define	SPARC_CMLL_CAPABLE	(OPENSSL_sparcv9cap_P[1] & CFR_CAMELLIA)



void	cmll_t4_set_key (const unsigned char *key, int bits,

				CAMELLIA_KEY *ks);

void	cmll_t4_encrypt (const unsigned char *in, unsigned char *out,

				const CAMELLIA_KEY *key);

void	cmll_t4_decrypt (const unsigned char *in, unsigned char *out,

				const CAMELLIA_KEY *key);



void	cmll128_t4_cbc_encrypt (const unsigned char *in, unsigned char *out,

				size_t len, const CAMELLIA_KEY *key,

				unsigned char *ivec);

void	cmll128_t4_cbc_decrypt (const unsigned char *in, unsigned char *out,

				size_t len, const CAMELLIA_KEY *key,

				unsigned char *ivec);

void	cmll256_t4_cbc_encrypt (const unsigned char *in, unsigned char *out,

				size_t len, const CAMELLIA_KEY *key,

				unsigned char *ivec);

void	cmll256_t4_cbc_decrypt (const unsigned char *in, unsigned char *out,

				size_t len, const CAMELLIA_KEY *key,

				unsigned char *ivec);

void	cmll128_t4_ctr32_encrypt (const unsigned char *in, unsigned char *out,

				size_t blocks, const CAMELLIA_KEY *key,

				unsigned char *ivec);

void	cmll256_t4_ctr32_encrypt (const unsigned char *in, unsigned char *out,

				size_t blocks, const CAMELLIA_KEY *key,

				unsigned char *ivec);



static int cmll_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,

		   const unsigned char *iv, int enc)

	{

	int ret, mode, bits;

	EVP_CAMELLIA_KEY *dat = (EVP_CAMELLIA_KEY *)ctx->cipher_data;



	mode = ctx->cipher->flags & EVP_CIPH_MODE;

	bits = ctx->key_len*8;



	cmll_t4_set_key(key, bits, &dat->ks);



	if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)

	    && !enc)

		{

		    ret = 0;

		    dat->block	= (block128_f)cmll_t4_decrypt;

		    switch (bits) {

		    case 128:

			dat->stream.cbc	= mode==EVP_CIPH_CBC_MODE ?

						(cbc128_f)cmll128_t4_cbc_decrypt :

						NULL;

			break;

		    case 192:

		    case 256:

			dat->stream.cbc	= mode==EVP_CIPH_CBC_MODE ?

						(cbc128_f)cmll256_t4_cbc_decrypt :

						NULL;

			break;

		    default:

			ret = -1;

		    }

		}

	else	{

		    ret = 0;

		    dat->block	= (block128_f)cmll_t4_encrypt;

		    switch (bits) {

		    case 128:

			if (mode==EVP_CIPH_CBC_MODE)

				dat->stream.cbc	= (cbc128_f)cmll128_t4_cbc_encrypt;

			else if (mode==EVP_CIPH_CTR_MODE)

				dat->stream.ctr = (ctr128_f)cmll128_t4_ctr32_encrypt;

			else

				dat->stream.cbc = NULL;

			break;

		    case 192:

		    case 256:

			if (mode==EVP_CIPH_CBC_MODE)

				dat->stream.cbc	= (cbc128_f)cmll256_t4_cbc_encrypt;

			else if (mode==EVP_CIPH_CTR_MODE)

				dat->stream.ctr = (ctr128_f)cmll256_t4_ctr32_encrypt;

			else

				dat->stream.cbc = NULL;

			break;

		    default:

			ret = -1;

		    }

		}



	if(ret < 0)

		{

		EVPerr(EVP_F_CAMELLIA_INIT_KEY,EVP_R_CAMELLIA_KEY_SETUP_FAILED);

		return 0;

		}



	return 1;

	}



#define cmll_t4_cbc_cipher camellia_cbc_cipher

static int cmll_t4_cbc_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,

	const unsigned char *in, size_t len);



#define cmll_t4_ecb_cipher camellia_ecb_cipher 

static int cmll_t4_ecb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,

	const unsigned char *in, size_t len);



#define cmll_t4_ofb_cipher camellia_ofb_cipher

static int cmll_t4_ofb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,

	const unsigned char *in,size_t len);



#define cmll_t4_cfb_cipher camellia_cfb_cipher

static int cmll_t4_cfb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,

	const unsigned char *in,size_t len);



#define cmll_t4_cfb8_cipher camellia_cfb8_cipher

static int cmll_t4_cfb8_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,

	const unsigned char *in,size_t len);



#define cmll_t4_cfb1_cipher camellia_cfb1_cipher

static int cmll_t4_cfb1_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,

	const unsigned char *in,size_t len);



#define cmll_t4_ctr_cipher camellia_ctr_cipher

static int cmll_t4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,

		const unsigned char *in, size_t len);



#define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \

static const EVP_CIPHER cmll_t4_##keylen##_##mode = { \

	nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \

	flags|EVP_CIPH_##MODE##_MODE,	\

	cmll_t4_init_key,		\

	cmll_t4_##mode##_cipher,	\

	NULL,				\

	sizeof(EVP_CAMELLIA_KEY),	\

	NULL,NULL,NULL,NULL }; \

static const EVP_CIPHER camellia_##keylen##_##mode = { \

	nid##_##keylen##_##nmode,blocksize,	\

	keylen/8,ivlen, \

	flags|EVP_CIPH_##MODE##_MODE,	\

	camellia_init_key,		\

	camellia_##mode##_cipher,	\

	NULL,				\

	sizeof(EVP_CAMELLIA_KEY),	\

	NULL,NULL,NULL,NULL }; \

const EVP_CIPHER *EVP_camellia_##keylen##_##mode(void) \

{ return SPARC_CMLL_CAPABLE?&cmll_t4_##keylen##_##mode:&camellia_##keylen##_##mode; }



#else



#define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \

static const EVP_CIPHER camellia_##keylen##_##mode = { \

	nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \

	flags|EVP_CIPH_##MODE##_MODE,	\

	camellia_init_key,		\

	camellia_##mode##_cipher,	\

	NULL,				\

	sizeof(EVP_CAMELLIA_KEY),	\

	NULL,NULL,NULL,NULL }; \

const EVP_CIPHER *EVP_camellia_##keylen##_##mode(void) \

{ return &camellia_##keylen##_##mode; }



#endif



#define BLOCK_CIPHER_generic_pack(nid,keylen,flags)		\

	BLOCK_CIPHER_generic(nid,keylen,16,16,cbc,cbc,CBC,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)	\

	BLOCK_CIPHER_generic(nid,keylen,16,0,ecb,ecb,ECB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)	\

	BLOCK_CIPHER_generic(nid,keylen,1,16,ofb128,ofb,OFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)	\

	BLOCK_CIPHER_generic(nid,keylen,1,16,cfb128,cfb,CFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)	\

	BLOCK_CIPHER_generic(nid,keylen,1,16,cfb1,cfb1,CFB,flags)	\

	BLOCK_CIPHER_generic(nid,keylen,1,16,cfb8,cfb8,CFB,flags)

#if 0

	BLOCK_CIPHER_generic(nid,keylen,1,16,ctr,ctr,CTR,flags)

#endif



/* The subkey for Camellia is generated. */ 

static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,

	const unsigned char *iv, int enc)

	{

	int ret;



	ret=Camellia_set_key(key, ctx->key_len * 8, ctx->cipher_data);

	int ret, mode;

	EVP_CAMELLIA_KEY *dat = (EVP_CAMELLIA_KEY *)ctx->cipher_data;



	ret=Camellia_set_key(key, ctx->key_len * 8, &dat->ks);

	if(ret < 0)

		{

		EVPerr(EVP_F_CAMELLIA_INIT_KEY,EVP_R_CAMELLIA_KEY_SETUP_FAILED);

		return 0;

		}



	mode = ctx->cipher->flags & EVP_CIPH_MODE;

	if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)

	    && !enc)

		{

		dat->block	= (block128_f)Camellia_decrypt;

		dat->stream.cbc	= mode==EVP_CIPH_CBC_MODE ?

					(cbc128_f)Camellia_cbc_encrypt :

					NULL;

		}

	else

		{

		dat->block	= (block128_f)Camellia_encrypt;

		dat->stream.cbc	= mode==EVP_CIPH_CBC_MODE ?

					(cbc128_f)Camellia_cbc_encrypt :

					NULL;

		}





	return 1;

	}



static int camellia_cbc_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,

	const unsigned char *in, size_t len)

{

	EVP_CAMELLIA_KEY *dat = (EVP_CAMELLIA_KEY *)ctx->cipher_data;



	if (dat->stream.cbc)

		(*dat->stream.cbc)(in,out,len,&dat->ks,ctx->iv,ctx->encrypt);

	else if (ctx->encrypt)

		CRYPTO_cbc128_encrypt(in,out,len,&dat->ks,ctx->iv,dat->block);

	else

		CRYPTO_cbc128_encrypt(in,out,len,&dat->ks,ctx->iv,dat->block);



	return 1;

}



static int camellia_ecb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,

	const unsigned char *in, size_t len)

{

	size_t	bl = ctx->cipher->block_size;

	size_t	i;

	EVP_CAMELLIA_KEY *dat = (EVP_CAMELLIA_KEY *)ctx->cipher_data;



	if (len<bl)	return 1;



	for (i=0,len-=bl;i<=len;i+=bl)

		(*dat->block)(in+i,out+i,&dat->ks);



	return 1;

}



static int camellia_ofb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,

	const unsigned char *in,size_t len)

{

	EVP_CAMELLIA_KEY *dat = (EVP_CAMELLIA_KEY *)ctx->cipher_data;



	CRYPTO_ofb128_encrypt(in,out,len,&dat->ks,

			ctx->iv,&ctx->num,dat->block);

	return 1;

}



static int camellia_cfb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,

	const unsigned char *in,size_t len)

{

	EVP_CAMELLIA_KEY *dat = (EVP_CAMELLIA_KEY *)ctx->cipher_data;



	CRYPTO_cfb128_encrypt(in,out,len,&dat->ks,

			ctx->iv,&ctx->num,ctx->encrypt,dat->block);

	return 1;

}



static int camellia_cfb8_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,

	const unsigned char *in,size_t len)

{

	EVP_CAMELLIA_KEY *dat = (EVP_CAMELLIA_KEY *)ctx->cipher_data;



	CRYPTO_cfb128_8_encrypt(in,out,len,&dat->ks,

			ctx->iv,&ctx->num,ctx->encrypt,dat->block);

	return 1;

}



static int camellia_cfb1_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,

	const unsigned char *in,size_t len)

{

	EVP_CAMELLIA_KEY *dat = (EVP_CAMELLIA_KEY *)ctx->cipher_data;



	if (ctx->flags&EVP_CIPH_FLAG_LENGTH_BITS) {

		CRYPTO_cfb128_1_encrypt(in,out,len,&dat->ks,

			ctx->iv,&ctx->num,ctx->encrypt,dat->block);

		return 1;

	}



	while (len>=MAXBITCHUNK) {

		CRYPTO_cfb128_1_encrypt(in,out,MAXBITCHUNK*8,&dat->ks,

			ctx->iv,&ctx->num,ctx->encrypt,dat->block);

		len-=MAXBITCHUNK;

	}

	if (len)

		CRYPTO_cfb128_1_encrypt(in,out,len*8,&dat->ks,

			ctx->iv,&ctx->num,ctx->encrypt,dat->block);

	

	return 1;

}



static int camellia_ctr_cipher (EVP_CIPHER_CTX *ctx, unsigned char *out,

		const unsigned char *in, size_t len)

{

	unsigned int num = ctx->num;

	EVP_CAMELLIA_KEY *dat = (EVP_CAMELLIA_KEY *)ctx->cipher_data;



	if (dat->stream.ctr)

		CRYPTO_ctr128_encrypt_ctr32(in,out,len,&dat->ks,

			ctx->iv,ctx->buf,&num,dat->stream.ctr);

	else

		CRYPTO_ctr128_encrypt(in,out,len,&dat->ks,

			ctx->iv,ctx->buf,&num,dat->block);

	ctx->num = (size_t)num;

	return 1;

}



BLOCK_CIPHER_generic_pack(NID_camellia,128,EVP_CIPH_FLAG_FIPS)

BLOCK_CIPHER_generic_pack(NID_camellia,192,EVP_CIPH_FLAG_FIPS)

BLOCK_CIPHER_generic_pack(NID_camellia,256,EVP_CIPH_FLAG_FIPS)



#else



# ifdef PEDANTIC