diff options
Diffstat (limited to 'src/lib/libcrypto/camellia/cmll_cbc.c')
-rw-r--r-- | src/lib/libcrypto/camellia/cmll_cbc.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/lib/libcrypto/camellia/cmll_cbc.c b/src/lib/libcrypto/camellia/cmll_cbc.c index b21857c572..6567e5deb6 100644 --- a/src/lib/libcrypto/camellia/cmll_cbc.c +++ b/src/lib/libcrypto/camellia/cmll_cbc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cmll_cbc.c,v 1.3 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: cmll_cbc.c,v 1.4 2014/11/13 20:01:58 miod Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2006 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -52,13 +52,14 @@ | |||
52 | #include <openssl/camellia.h> | 52 | #include <openssl/camellia.h> |
53 | #include <openssl/modes.h> | 53 | #include <openssl/modes.h> |
54 | 54 | ||
55 | void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out, | 55 | void |
56 | size_t len, const CAMELLIA_KEY *key, | 56 | Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out, size_t len, |
57 | unsigned char *ivec, const int enc) | 57 | const CAMELLIA_KEY *key, unsigned char *ivec, const int enc) |
58 | { | 58 | { |
59 | |||
60 | if (enc) | 59 | if (enc) |
61 | CRYPTO_cbc128_encrypt(in,out,len,key,ivec,(block128_f)Camellia_encrypt); | 60 | CRYPTO_cbc128_encrypt(in, out, len, key, ivec, |
61 | (block128_f)Camellia_encrypt); | ||
62 | else | 62 | else |
63 | CRYPTO_cbc128_decrypt(in,out,len,key,ivec,(block128_f)Camellia_decrypt); | 63 | CRYPTO_cbc128_decrypt(in, out, len, key, ivec, |
64 | } | 64 | (block128_f)Camellia_decrypt); |
65 | } | ||