Commit 7cb81398 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

e_camillia.c: remove copy-n-paste artifact, EVP_CIPH_FLAG_FIPS, and 

leave comment about CTR mode.
parent 24798c5e

crypto/evp/e_camellia.c

+6 −6
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ const EVP_CIPHER *EVP_camellia_##keylen##_##mode(void) \ 
	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

#if 0 /* not yet, missing NID */

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

#endif
@@ -378,7 +378,7 @@ static int camellia_cfb1_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out, 
	return 1;

}



/*

#if 0 /* not yet, missing NID */

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

		const unsigned char *in, size_t len)

{
@@ -394,11 +394,11 @@ static int camellia_ctr_cipher (EVP_CIPHER_CTX *ctx, unsigned char *out, 
	ctx->num = (size_t)num;

	return 1;

}

*/

#endif



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)

BLOCK_CIPHER_generic_pack(NID_camellia,128,0)

BLOCK_CIPHER_generic_pack(NID_camellia,192,0)

BLOCK_CIPHER_generic_pack(NID_camellia,256,0)



#else