diff options
Diffstat (limited to 'src/lib/libcrypto/camellia/camellia.h')
| -rw-r--r-- | src/lib/libcrypto/camellia/camellia.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/libcrypto/camellia/camellia.h b/src/lib/libcrypto/camellia/camellia.h index a294f97571..b9b5f792b1 100644 --- a/src/lib/libcrypto/camellia/camellia.h +++ b/src/lib/libcrypto/camellia/camellia.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: camellia.h,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: camellia.h,v 1.5 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 | * |
| @@ -78,14 +78,13 @@ extern "C" { | |||
| 78 | 78 | ||
| 79 | typedef unsigned int KEY_TABLE_TYPE[CAMELLIA_TABLE_WORD_LEN]; /* to match with WORD */ | 79 | typedef unsigned int KEY_TABLE_TYPE[CAMELLIA_TABLE_WORD_LEN]; /* to match with WORD */ |
| 80 | 80 | ||
| 81 | struct camellia_key_st | 81 | struct camellia_key_st { |
| 82 | { | 82 | union { |
| 83 | union { | ||
| 84 | double d; /* ensures 64-bit align */ | 83 | double d; /* ensures 64-bit align */ |
| 85 | KEY_TABLE_TYPE rd_key; | 84 | KEY_TABLE_TYPE rd_key; |
| 86 | } u; | 85 | } u; |
| 87 | int grand_rounds; | 86 | int grand_rounds; |
| 88 | }; | 87 | }; |
| 89 | typedef struct camellia_key_st CAMELLIA_KEY; | 88 | typedef struct camellia_key_st CAMELLIA_KEY; |
| 90 | 89 | ||
| 91 | int Camellia_set_key(const unsigned char *userKey, const int bits, | 90 | int Camellia_set_key(const unsigned char *userKey, const int bits, |
