yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-25 20:45:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad error codes

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2013-10-27 13:48:15 +01:00
parent 7109624aef
commit a8a25ae1b9
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/polarssl/error.h
View File

@ -85,7 +85,7 @@
* ECP 4 7 (Started from top) * ECP 4 7 (Started from top)
* MD 5 4 * MD 5 4
* CIPHER 6 6 * CIPHER 6 6
* SSL 6 7 (Started from top) * SSL 6 8 (Started from top)
* SSL 7 31 * SSL 7 31
* *
* Module dependent error code (5 bits 0x.08.-0x.F8.) * Module dependent error code (5 bits 0x.08.-0x.F8.)

1
include/polarssl/ssl.h
View File

@ -132,6 +132,7 @@
#define POLARSSL_ERR_SSL_SESSION_TICKET_EXPIRED -0x6D80 /**< Session ticket has expired. */ #define POLARSSL_ERR_SSL_SESSION_TICKET_EXPIRED -0x6D80 /**< Session ticket has expired. */
#define POLARSSL_ERR_SSL_PK_TYPE_MISMATCH -0x6D00 /**< Public key type mismatch (eg, asked for RSA key exchange and presented EC key) */ #define POLARSSL_ERR_SSL_PK_TYPE_MISMATCH -0x6D00 /**< Public key type mismatch (eg, asked for RSA key exchange and presented EC key) */
#define POLARSSL_ERR_SSL_UNKNOWN_IDENTITY -0x6C80 /**< Unkown identity received (eg, PSK identity) */ #define POLARSSL_ERR_SSL_UNKNOWN_IDENTITY -0x6C80 /**< Unkown identity received (eg, PSK identity) */
#define POLARSSL_ERR_SSL_INTERNAL_ERROR -0x6C00 /**< Internal error (eg, unexpected failure in lower-level module) */
/* /*
* Various constants * Various constants

2
library/error.c
View File

@ -422,6 +422,8 @@ void polarssl_strerror( int ret, char *buf, size_t buflen )
snprintf( buf, buflen, "SSL - Public key type mismatch (eg, asked for RSA key exchange and presented EC key)" ); snprintf( buf, buflen, "SSL - Public key type mismatch (eg, asked for RSA key exchange and presented EC key)" );
if( use_ret == -(POLARSSL_ERR_SSL_UNKNOWN_IDENTITY) ) if( use_ret == -(POLARSSL_ERR_SSL_UNKNOWN_IDENTITY) )
snprintf( buf, buflen, "SSL - Unkown identity received (eg, PSK identity)" ); snprintf( buf, buflen, "SSL - Unkown identity received (eg, PSK identity)" );
if( use_ret == -(POLARSSL_ERR_SSL_INTERNAL_ERROR) )
snprintf( buf, buflen, "SSL - Internal error (eg, unexpected failure in lower-level module)" );
#endif /* POLARSSL_SSL_TLS_C */ #endif /* POLARSSL_SSL_TLS_C */
#if defined(POLARSSL_X509_USE_C) || defined(POLARSSL_X509_CREATE_C) #if defined(POLARSSL_X509_USE_C) || defined(POLARSSL_X509_CREATE_C)

18
library/ssl_tls.c
View File

@ -1060,8 +1060,7 @@ static int ssl_encrypt_buf( ssl_context *ssl )
{ {
SSL_DEBUG_MSG( 1, ( "total encrypted length incorrect %d %d", SSL_DEBUG_MSG( 1, ( "total encrypted length incorrect %d %d",
ssl->out_msglen, olen ) ); ssl->out_msglen, olen ) );
// TODO Real error number return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
return( -1 );
} }
if( ( ret = cipher_finish( &ssl->transform_out->cipher_ctx_enc, if( ( ret = cipher_finish( &ssl->transform_out->cipher_ctx_enc,
@ -1075,8 +1074,7 @@ static int ssl_encrypt_buf( ssl_context *ssl )
{ {
SSL_DEBUG_MSG( 1, ( "total encrypted length incorrect %d %d", SSL_DEBUG_MSG( 1, ( "total encrypted length incorrect %d %d",
0, olen ) ); 0, olen ) );
// TODO Real error number return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
return( -1 );
} }
} }
else else
@ -1277,8 +1275,7 @@ static int ssl_encrypt_buf( ssl_context *ssl )
{ {
SSL_DEBUG_MSG( 1, ( "total encrypted length incorrect %d %d", SSL_DEBUG_MSG( 1, ( "total encrypted length incorrect %d %d",
enc_msglen, olen ) ); enc_msglen, olen ) );
// TODO Real error number return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
return( -1 );
} }
#if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1) #if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1)
@ -1360,8 +1357,7 @@ static int ssl_decrypt_buf( ssl_context *ssl )
if( ssl->in_msglen != olen ) if( ssl->in_msglen != olen )
{ {
SSL_DEBUG_MSG( 1, ( "total encrypted length incorrect" ) ); SSL_DEBUG_MSG( 1, ( "total encrypted length incorrect" ) );
// TODO Real error number return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
return( -1 );
} }
if( ( ret = cipher_finish( &ssl->transform_in->cipher_ctx_dec, if( ( ret = cipher_finish( &ssl->transform_in->cipher_ctx_dec,
@ -1374,8 +1370,7 @@ static int ssl_decrypt_buf( ssl_context *ssl )
if( 0 != olen ) if( 0 != olen )
{ {
SSL_DEBUG_MSG( 1, ( "total encrypted length incorrect" ) ); SSL_DEBUG_MSG( 1, ( "total encrypted length incorrect" ) );
// TODO Real error number return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
return( -1 );
} }
} }
else else
@ -1557,8 +1552,7 @@ static int ssl_decrypt_buf( ssl_context *ssl )
if( dec_msglen != olen ) if( dec_msglen != olen )
{ {
SSL_DEBUG_MSG( 1, ( "total encrypted length incorrect" ) ); SSL_DEBUG_MSG( 1, ( "total encrypted length incorrect" ) );
// TODO Real error number return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
return( -1 );
} }
#if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1) #if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1)