yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Fixed compiler warning for unreferenced ret in md_file() when POLARSSL_FS_IO not declared

Browse source
This commit is contained in:
Paul Bakker 2012-01-14 18:07:41 +00:00
parent 1052784054
commit 8913f82c26
4 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/polarssl/error.h
View file

@ -72,8 +72,8 @@
* X509 2 21 * X509 2 21
* DHM 3 6 * DHM 3 6
* RSA 4 9 * RSA 4 9
* MD 5 1 * MD 5 4
* CIPER 6 1 * CIPHER 6 5
* SSL 7 30 * SSL 7 30
* *
* Module dependent error code (5 bits 0x.08.-0x.F8.) * Module dependent error code (5 bits 0x.08.-0x.F8.)

3
include/polarssl/md.h
View file

@ -42,8 +42,7 @@
#define POLARSSL_ERR_MD_FEATURE_UNAVAILABLE -0x5080 /**< The selected feature is not available. */ #define POLARSSL_ERR_MD_FEATURE_UNAVAILABLE -0x5080 /**< The selected feature is not available. */
#define POLARSSL_ERR_MD_BAD_INPUT_DATA -0x5100 /**< Bad input parameters to function. */ #define POLARSSL_ERR_MD_BAD_INPUT_DATA -0x5100 /**< Bad input parameters to function. */
#define POLARSSL_ERR_MD_ALLOC_FAILED -0x5180 /**< Failed to allocate memory. */ #define POLARSSL_ERR_MD_ALLOC_FAILED -0x5180 /**< Failed to allocate memory. */
#define POLARSSL_ERR_MD_FILE_OPEN_FAILED -0x5200 /**< Opening of file failed. */ #define POLARSSL_ERR_MD_FILE_IO_ERROR -0x5200 /**< Opening or reading of file failed. */
#define POLARSSL_ERR_MD_FILE_READ_FAILED -0x5280 /**< Failure when reading from file. */
typedef enum { typedef enum {
POLARSSL_MD_NONE=0, POLARSSL_MD_NONE=0,

6
library/error.c
View file

@ -177,10 +177,8 @@ void error_strerror( int ret, char *buf, size_t buflen )
snprintf( buf, buflen, "MD - Bad input parameters to function" ); snprintf( buf, buflen, "MD - Bad input parameters to function" );
if( use_ret == -(POLARSSL_ERR_MD_ALLOC_FAILED) ) if( use_ret == -(POLARSSL_ERR_MD_ALLOC_FAILED) )
snprintf( buf, buflen, "MD - Failed to allocate memory" ); snprintf( buf, buflen, "MD - Failed to allocate memory" );
if( use_ret == -(POLARSSL_ERR_MD_FILE_OPEN_FAILED) ) if( use_ret == -(POLARSSL_ERR_MD_FILE_IO_ERROR) )
snprintf( buf, buflen, "MD - Opening of file failed" ); snprintf( buf, buflen, "MD - Opening or reading of file failed" );
if( use_ret == -(POLARSSL_ERR_MD_FILE_READ_FAILED) )
snprintf( buf, buflen, "MD - Failure when reading from file" );
#endif /* POLARSSL_MD_C */ #endif /* POLARSSL_MD_C */
#if defined(POLARSSL_PEM_C) #if defined(POLARSSL_PEM_C)

10
library/md.c
View file

@ -222,19 +222,19 @@ int md( const md_info_t *md_info, const unsigned char *input, size_t ilen,
int md_file( const md_info_t *md_info, const char *path, unsigned char *output ) int md_file( const md_info_t *md_info, const char *path, unsigned char *output )
{ {
#if defined(POLARSSL_FS_IO)
int ret; int ret;
#endif
if( md_info == NULL ) if( md_info == NULL )
return POLARSSL_ERR_MD_BAD_INPUT_DATA; return POLARSSL_ERR_MD_BAD_INPUT_DATA;
#if defined(POLARSSL_FS_IO) #if defined(POLARSSL_FS_IO)
ret = md_info->file_func( path, output ); ret = md_info->file_func( path, output );
if( ret == 2 ) if( ret != 0 )
return POLARSSL_ERR_MD_FILE_OPEN_FAILED; return( POLARSSL_ERR_MD_FILE_IO_ERROR + ret );
if( ret == 3 )
return POLARSSL_ERR_MD_FILE_READ_FAILED;
return ret; return( ret );
#else #else
((void) path); ((void) path);
((void) output); ((void) output);