diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-03-20 15:28:40 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-03-20 15:28:40 +0000 |
| commit | 3d2030852da420b820a661e7b19bb757487e2599 (patch) | |
| tree | 787cdff35e35be75e53f378b098bba3237a8deb7 /crypto/camellia/cmll_cbc.c | |
| parent | 8f5086671f06c811be16442eb6d6fe68e5ba71fc (diff) | |
| download | src-3d2030852da420b820a661e7b19bb757487e2599.tar.gz src-3d2030852da420b820a661e7b19bb757487e2599.zip | |
Import OpenSSL 1.0.1m.vendor/openssl/1.0.1m
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=280288
svn path=/vendor-crypto/openssl/1.0.1m/; revision=280289; tag=vendor/openssl/1.0.1m
Diffstat (limited to 'crypto/camellia/cmll_cbc.c')
| -rw-r--r-- | crypto/camellia/cmll_cbc.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/crypto/camellia/cmll_cbc.c b/crypto/camellia/cmll_cbc.c index 4c8d455adef3..a4907ca05f78 100644 --- a/crypto/camellia/cmll_cbc.c +++ b/crypto/camellia/cmll_cbc.c @@ -7,7 +7,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -53,12 +53,14 @@ #include <openssl/modes.h> void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out, - size_t len, const CAMELLIA_KEY *key, - unsigned char *ivec, const int enc) - { + size_t len, const CAMELLIA_KEY *key, + unsigned char *ivec, const int enc) +{ - if (enc) - CRYPTO_cbc128_encrypt(in,out,len,key,ivec,(block128_f)Camellia_encrypt); - else - CRYPTO_cbc128_decrypt(in,out,len,key,ivec,(block128_f)Camellia_decrypt); - } + if (enc) + CRYPTO_cbc128_encrypt(in, out, len, key, ivec, + (block128_f) Camellia_encrypt); + else + CRYPTO_cbc128_decrypt(in, out, len, key, ivec, + (block128_f) Camellia_decrypt); +} |