generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
leave comment about CTR mode.
This commit is contained in:
Andy Polyakov 2012-11-05 09:20:41 +00:00
parent 24798c5e59
commit 7cb81398b7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/evp/e_camellia.c
View File

@ -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,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,cfb1,cfb1,CFB,flags) \
BLOCK_CIPHER_generic(nid,keylen,1,16,cfb8,cfb8,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) BLOCK_CIPHER_generic(nid,keylen,1,16,ctr,ctr,CTR,flags)
#endif #endif
@ -378,7 +378,7 @@ static int camellia_cfb1_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
return 1; return 1;
} }
/* #if 0 /* not yet, missing NID */
static int camellia_ctr_cipher (EVP_CIPHER_CTX *ctx, unsigned char *out, static int camellia_ctr_cipher (EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t len) 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; ctx->num = (size_t)num;
return 1; return 1;
} }
*/ #endif
BLOCK_CIPHER_generic_pack(NID_camellia,128,EVP_CIPH_FLAG_FIPS) BLOCK_CIPHER_generic_pack(NID_camellia,128,0)
BLOCK_CIPHER_generic_pack(NID_camellia,192,EVP_CIPH_FLAG_FIPS) BLOCK_CIPHER_generic_pack(NID_camellia,192,0)
BLOCK_CIPHER_generic_pack(NID_camellia,256,EVP_CIPH_FLAG_FIPS) BLOCK_CIPHER_generic_pack(NID_camellia,256,0)
#else #else