projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
24798c5
)
e_camillia.c: remove copy-n-paste artifact, EVP_CIPH_FLAG_FIPS, and
author
Andy Polyakov
<appro@openssl.org>
Mon, 5 Nov 2012 09:20:41 +0000
(09:20 +0000)
committer
Andy Polyakov
<appro@openssl.org>
Mon, 5 Nov 2012 09:20:41 +0000
(09:20 +0000)
leave comment about CTR mode.
crypto/evp/e_camellia.c
patch
|
blob
|
history
diff --git
a/crypto/evp/e_camellia.c
b/crypto/evp/e_camellia.c
index e48a090b718fd752e5f5452da2fbcffd2872eb3f..83365b2f0a880c6163866825b02f5ba2860749fb 100644
(file)
--- 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)
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
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;
}
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)
{
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;
}
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
#else