diff options
Diffstat (limited to 'src/lib/libcrypto/camellia/cmll_ctr.c')
-rw-r--r-- | src/lib/libcrypto/camellia/cmll_ctr.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/lib/libcrypto/camellia/cmll_ctr.c b/src/lib/libcrypto/camellia/cmll_ctr.c index 80fbcaf925..59a351ee1b 100644 --- a/src/lib/libcrypto/camellia/cmll_ctr.c +++ b/src/lib/libcrypto/camellia/cmll_ctr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cmll_ctr.c,v 1.3 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: cmll_ctr.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,12 @@ | |||
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_ctr128_encrypt(const unsigned char *in, unsigned char *out, | 55 | void |
56 | size_t length, const CAMELLIA_KEY *key, | 56 | Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out, |
57 | unsigned char ivec[CAMELLIA_BLOCK_SIZE], | 57 | size_t length, const CAMELLIA_KEY *key, |
58 | unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE], | 58 | unsigned char ivec[CAMELLIA_BLOCK_SIZE], |
59 | unsigned int *num) | 59 | unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE], unsigned int *num) |
60 | { | 60 | { |
61 | 61 | CRYPTO_ctr128_encrypt(in, out, length, key, ivec, ecount_buf, num, | |
62 | CRYPTO_ctr128_encrypt(in,out,length,key,ivec,ecount_buf,num,(block128_f)Camellia_encrypt); | 62 | (block128_f)Camellia_encrypt); |
63 | } | 63 | } |
64 | |||