diff options
| author | mydesktop <dev.mc2@gmail.com> | 2014-05-25 13:06:40 -0400 |
|---|---|---|
| committer | mydesktop <dev.mc2@gmail.com> | 2014-05-25 13:06:40 -0400 |
| commit | 3a3a8176782a4fa75b0607fba0393c9d4a1746be (patch) | |
| tree | e8e38bdeaf0e9ea8ba773bb27e1de4b288b8150d /src/crypto | |
| parent | Merge pull request #12 from quazarcoin/MRO_master (diff) | |
| download | monero-3a3a8176782a4fa75b0607fba0393c9d4a1746be.tar.xz | |
0.8.8update
Diffstat (limited to 'src/crypto')
| -rw-r--r-- | src/crypto/oaes_lib.c | 1 | ||||
| -rw-r--r-- | src/crypto/oaes_lib.h | 23 |
2 files changed, 11 insertions, 13 deletions
diff --git a/src/crypto/oaes_lib.c b/src/crypto/oaes_lib.c index 96f038600..f3f2aac8c 100644 --- a/src/crypto/oaes_lib.c +++ b/src/crypto/oaes_lib.c @@ -64,7 +64,6 @@ static const char _NR[] = { # define min(a,b) (((a)<(b)) ? (a) : (b)) #endif /* min */ - // "OAES<8-bit header version><8-bit type><16-bit options><8-bit flags><56-bit reserved>" static uint8_t oaes_header[OAES_BLOCK_SIZE] = { // 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b, c, d, e, f, diff --git a/src/crypto/oaes_lib.h b/src/crypto/oaes_lib.h index 16b914c7a..fd1942822 100644 --- a/src/crypto/oaes_lib.h +++ b/src/crypto/oaes_lib.h @@ -32,6 +32,7 @@ #define _OAES_LIB_H #include <stdint.h> +#include <stdlib.h> #ifdef __cplusplus extern "C" { @@ -101,15 +102,14 @@ typedef int ( * oaes_step_cb ) ( typedef uint16_t OAES_OPTION; - typedef struct _oaes_key { - size_t data_len; - uint8_t *data; - size_t exp_data_len; - uint8_t *exp_data; - size_t num_keys; - size_t key_base; + size_t data_len; + uint8_t *data; + size_t exp_data_len; + uint8_t *exp_data; + size_t num_keys; + size_t key_base; } oaes_key; typedef struct _oaes_ctx @@ -119,14 +119,13 @@ typedef struct _oaes_ctx #endif // OAES_HAVE_ISAAC #ifdef OAES_DEBUG - oaes_step_cb step_cb; + oaes_step_cb step_cb; #endif // OAES_DEBUG - oaes_key * key; - OAES_OPTION options; - uint8_t iv[OAES_BLOCK_SIZE]; + oaes_key * key; + OAES_OPTION options; + uint8_t iv[OAES_BLOCK_SIZE]; } oaes_ctx; - /* * // usage: * |