diff options
| author | Andy Polyakov <appro@openssl.org> | 2012-11-05 09:20:41 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2012-11-05 09:20:41 +0000 |
| commit | 7cb81398b72c735c965b5cf1e547837c94760490 (patch) | |
| tree | f4bdeae1c6bb20fc28285483f0b9a881b3fcb65b /crypto | |
| parent | 24798c5e59dd95aa005bfc0e6efbdab5be5dcbf3 (diff) | |
| download | openssl-7cb81398b72c735c965b5cf1e547837c94760490.tar.gz | |
e_camillia.c: remove copy-n-paste artifact, EVP_CIPH_FLAG_FIPS, and
leave comment about CTR mode.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/evp/e_camellia.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/evp/e_camellia.c b/crypto/evp/e_camellia.c index e48a090b71..83365b2f0a 100644 --- a/crypto/evp/e_camellia.c +++ b/crypto/evp/e_camellia.c @@ -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 |