diff options
Diffstat (limited to 'src/lib/libcrypto/camellia/cmll_ecb.c')
-rw-r--r-- | src/lib/libcrypto/camellia/cmll_ecb.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/src/lib/libcrypto/camellia/cmll_ecb.c b/src/lib/libcrypto/camellia/cmll_ecb.c index 3054f277fe..1a65445202 100644 --- a/src/lib/libcrypto/camellia/cmll_ecb.c +++ b/src/lib/libcrypto/camellia/cmll_ecb.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cmll_ecb.c,v 1.3 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: cmll_ecb.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 | * |
@@ -49,26 +49,15 @@ | |||
49 | * | 49 | * |
50 | */ | 50 | */ |
51 | 51 | ||
52 | #ifndef CAMELLIA_DEBUG | ||
53 | # ifndef NDEBUG | ||
54 | # define NDEBUG | ||
55 | # endif | ||
56 | #endif | ||
57 | #include <assert.h> | ||
58 | |||
59 | #include <openssl/camellia.h> | 52 | #include <openssl/camellia.h> |
60 | #include "cmll_locl.h" | 53 | #include "cmll_locl.h" |
61 | 54 | ||
62 | void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out, | 55 | void |
63 | const CAMELLIA_KEY *key, const int enc) | 56 | Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out, |
64 | { | 57 | const CAMELLIA_KEY *key, const int enc) |
65 | 58 | { | |
66 | assert(in && out && key); | ||
67 | assert((CAMELLIA_ENCRYPT == enc)||(CAMELLIA_DECRYPT == enc)); | ||
68 | |||
69 | if (CAMELLIA_ENCRYPT == enc) | 59 | if (CAMELLIA_ENCRYPT == enc) |
70 | Camellia_encrypt(in, out, key); | 60 | Camellia_encrypt(in, out, key); |
71 | else | 61 | else |
72 | Camellia_decrypt(in, out, key); | 62 | Camellia_decrypt(in, out, key); |
73 | } | 63 | } |
74 | |||