mirror of
https://github.com/monero-project/monero.git
synced 2024-12-25 12:19:22 -05:00
crypto: remove unused OAES code
@SyntheticBird45 reported that the OpenBSD compiler gives warnings about string functions used in `oaes_sprintf`, as well as use of `rand()` in `oaes_key_gen`. Neither of these functions are used in the codebase. Removing the unused OAES functions silences these warnings.
This commit is contained in:
parent
a1dc85c537
commit
0f9a5c1020
@ -1,50 +0,0 @@
|
|||||||
/*
|
|
||||||
* ---------------------------------------------------------------------------
|
|
||||||
* OpenAES License
|
|
||||||
* ---------------------------------------------------------------------------
|
|
||||||
* Copyright (c) 2012, Nabil S. Al Ramli, www.nalramli.com
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* - Redistributions of source code must retain the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer.
|
|
||||||
* - Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
||||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
|
||||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
||||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
||||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
||||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
||||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
||||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
* ---------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _OAES_CONFIG_H
|
|
||||||
#define _OAES_CONFIG_H
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//#ifndef OAES_HAVE_ISAAC
|
|
||||||
//#define OAES_HAVE_ISAAC 1
|
|
||||||
//#endif // OAES_HAVE_ISAAC
|
|
||||||
|
|
||||||
//#ifndef OAES_DEBUG
|
|
||||||
//#define OAES_DEBUG 0
|
|
||||||
//#endif // OAES_DEBUG
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif // _OAES_CONFIG_H
|
|
File diff suppressed because it is too large
Load Diff
@ -74,32 +74,6 @@ typedef enum
|
|||||||
OAES_RET_COUNT
|
OAES_RET_COUNT
|
||||||
} OAES_RET;
|
} OAES_RET;
|
||||||
|
|
||||||
/*
|
|
||||||
* oaes_set_option() takes one of these values for its [option] parameter
|
|
||||||
* some options accept either an optional or a required [value] parameter
|
|
||||||
*/
|
|
||||||
// no option
|
|
||||||
#define OAES_OPTION_NONE 0
|
|
||||||
// enable ECB mode, disable CBC mode
|
|
||||||
#define OAES_OPTION_ECB 1
|
|
||||||
// enable CBC mode, disable ECB mode
|
|
||||||
// value is optional, may pass uint8_t iv[OAES_BLOCK_SIZE] to specify
|
|
||||||
// the value of the initialization vector, iv
|
|
||||||
#define OAES_OPTION_CBC 2
|
|
||||||
|
|
||||||
#ifdef OAES_DEBUG
|
|
||||||
typedef int ( * oaes_step_cb ) (
|
|
||||||
const uint8_t state[OAES_BLOCK_SIZE],
|
|
||||||
const char * step_name,
|
|
||||||
int step_count,
|
|
||||||
void * user_data );
|
|
||||||
// enable state stepping mode
|
|
||||||
// value is required, must pass oaes_step_cb to receive the state at each step
|
|
||||||
#define OAES_OPTION_STEP_ON 4
|
|
||||||
// disable state stepping mode
|
|
||||||
#define OAES_OPTION_STEP_OFF 8
|
|
||||||
#endif // OAES_DEBUG
|
|
||||||
|
|
||||||
typedef uint16_t OAES_OPTION;
|
typedef uint16_t OAES_OPTION;
|
||||||
|
|
||||||
typedef struct _oaes_key
|
typedef struct _oaes_key
|
||||||
@ -114,17 +88,7 @@ typedef struct _oaes_key
|
|||||||
|
|
||||||
typedef struct _oaes_ctx
|
typedef struct _oaes_ctx
|
||||||
{
|
{
|
||||||
#ifdef OAES_HAVE_ISAAC
|
|
||||||
randctx * rctx;
|
|
||||||
#endif // OAES_HAVE_ISAAC
|
|
||||||
|
|
||||||
#ifdef OAES_DEBUG
|
|
||||||
oaes_step_cb step_cb;
|
|
||||||
#endif // OAES_DEBUG
|
|
||||||
|
|
||||||
oaes_key * key;
|
oaes_key * key;
|
||||||
OAES_OPTION options;
|
|
||||||
uint8_t iv[OAES_BLOCK_SIZE];
|
|
||||||
} oaes_ctx;
|
} oaes_ctx;
|
||||||
/*
|
/*
|
||||||
* // usage:
|
* // usage:
|
||||||
@ -165,49 +129,10 @@ OAES_API OAES_CTX * oaes_alloc(void);
|
|||||||
|
|
||||||
OAES_API OAES_RET oaes_free( OAES_CTX ** ctx );
|
OAES_API OAES_RET oaes_free( OAES_CTX ** ctx );
|
||||||
|
|
||||||
OAES_API OAES_RET oaes_set_option( OAES_CTX * ctx,
|
|
||||||
OAES_OPTION option, const void * value );
|
|
||||||
|
|
||||||
OAES_API OAES_RET oaes_key_gen_128( OAES_CTX * ctx );
|
|
||||||
|
|
||||||
OAES_API OAES_RET oaes_key_gen_192( OAES_CTX * ctx );
|
|
||||||
|
|
||||||
OAES_API OAES_RET oaes_key_gen_256( OAES_CTX * ctx );
|
|
||||||
|
|
||||||
// export key with header information
|
|
||||||
// set data == NULL to get the required data_len
|
|
||||||
OAES_API OAES_RET oaes_key_export( OAES_CTX * ctx,
|
|
||||||
uint8_t * data, size_t * data_len );
|
|
||||||
|
|
||||||
// directly export the data from key
|
|
||||||
// set data == NULL to get the required data_len
|
|
||||||
OAES_API OAES_RET oaes_key_export_data( OAES_CTX * ctx,
|
|
||||||
uint8_t * data, size_t * data_len );
|
|
||||||
|
|
||||||
// import key with header information
|
|
||||||
OAES_API OAES_RET oaes_key_import( OAES_CTX * ctx,
|
|
||||||
const uint8_t * data, size_t data_len );
|
|
||||||
|
|
||||||
// directly import data into key
|
// directly import data into key
|
||||||
OAES_API OAES_RET oaes_key_import_data( OAES_CTX * ctx,
|
OAES_API OAES_RET oaes_key_import_data( OAES_CTX * ctx,
|
||||||
const uint8_t * data, size_t data_len );
|
const uint8_t * data, size_t data_len );
|
||||||
|
|
||||||
// set c == NULL to get the required c_len
|
|
||||||
OAES_API OAES_RET oaes_encrypt( OAES_CTX * ctx,
|
|
||||||
const uint8_t * m, size_t m_len, uint8_t * c, size_t * c_len );
|
|
||||||
|
|
||||||
// set m == NULL to get the required m_len
|
|
||||||
OAES_API OAES_RET oaes_decrypt( OAES_CTX * ctx,
|
|
||||||
const uint8_t * c, size_t c_len, uint8_t * m, size_t * m_len );
|
|
||||||
|
|
||||||
// set buf == NULL to get the required buf_len
|
|
||||||
OAES_API OAES_RET oaes_sprintf(
|
|
||||||
char * buf, size_t * buf_len, const uint8_t * data, size_t data_len );
|
|
||||||
|
|
||||||
OAES_API OAES_RET oaes_encryption_round( const uint8_t * key, uint8_t * c );
|
|
||||||
|
|
||||||
OAES_API OAES_RET oaes_pseudo_encrypt_ecb( OAES_CTX * ctx, uint8_t * c );
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user