AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop POLARSSL_ERROR_STRERROR_BC

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-03-11 10:59:38 +00:00
parent fc51f40a1a
commit f9c1387b9d
7 changed files with 1 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -6,6 +6,7 @@ Features
* Support for DTLS 1.0 and 1.2 (RFC 6347). * Support for DTLS 1.0 and 1.2 (RFC 6347).
API Changes API Changes
* Remove POLARSSL_ERROR_STRERROR_BC (use mbedtls_strerror()).
* Headers are now found in the 'mbedtls' directory (previously 'polarssl'). * Headers are now found in the 'mbedtls' directory (previously 'polarssl').
* Change SSL_DISABLE_RENEGOTIATION config.h flag to SSL_RENEGOTIATION * Change SSL_DISABLE_RENEGOTIATION config.h flag to SSL_RENEGOTIATION
(support for renegotiation now needs explicit enabling in config.h). (support for renegotiation now needs explicit enabling in config.h).

14
include/mbedtls/config.h
View File

@ -644,20 +644,6 @@
*/ */
#define POLARSSL_PK_PARSE_EC_EXTENDED #define POLARSSL_PK_PARSE_EC_EXTENDED
/**
* \def POLARSSL_ERROR_STRERROR_BC
*
* Make available the backward compatible error_strerror() next to the
* current polarssl_strerror().
*
* For new code, it is recommended to use polarssl_strerror() instead and
* disable this.
*
* Disable if you run into name conflicts and want to really remove the
* error_strerror()
*/
#define POLARSSL_ERROR_STRERROR_BC
/** /**
* \def POLARSSL_ERROR_STRERROR_DUMMY * \def POLARSSL_ERROR_STRERROR_DUMMY
* *

4
include/mbedtls/error.h
View File

@ -109,10 +109,6 @@ extern "C" {
*/ */
void polarssl_strerror( int errnum, char *buffer, size_t buflen ); void polarssl_strerror( int errnum, char *buffer, size_t buflen );
#if defined(POLARSSL_ERROR_STRERROR_BC)
void error_strerror( int errnum, char *buffer, size_t buflen );
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

13
library/error.c
View File

@ -747,13 +747,6 @@ void polarssl_strerror( int ret, char *buf, size_t buflen )
polarssl_snprintf( buf, buflen, "UNKNOWN ERROR CODE (%04X)", use_ret ); polarssl_snprintf( buf, buflen, "UNKNOWN ERROR CODE (%04X)", use_ret );
} }
#if defined(POLARSSL_ERROR_STRERROR_BC)
void error_strerror( int ret, char *buf, size_t buflen )
{
polarssl_strerror( ret, buf, buflen );
}
#endif /* POLARSSL_ERROR_STRERROR_BC */
#else /* POLARSSL_ERROR_C */ #else /* POLARSSL_ERROR_C */
#if defined(POLARSSL_ERROR_STRERROR_DUMMY) #if defined(POLARSSL_ERROR_STRERROR_DUMMY)
@ -769,12 +762,6 @@ void polarssl_strerror( int ret, char *buf, size_t buflen )
buf[0] = '\0'; buf[0] = '\0';
} }
#if defined(POLARSSL_ERROR_STRERROR_BC)
void error_strerror( int ret, char *buf, size_t buflen )
{
polarssl_strerror( ret, buf, buflen );
}
#endif /* POLARSSL_ERROR_STRERROR_BC */
#endif /* POLARSSL_ERROR_STRERROR_DUMMY */ #endif /* POLARSSL_ERROR_STRERROR_DUMMY */
#endif /* POLARSSL_ERROR_C */ #endif /* POLARSSL_ERROR_C */

3
library/version_features.c
View File

@ -237,9 +237,6 @@ static const char *features[] = {
#if defined(POLARSSL_PK_PARSE_EC_EXTENDED) #if defined(POLARSSL_PK_PARSE_EC_EXTENDED)
"POLARSSL_PK_PARSE_EC_EXTENDED", "POLARSSL_PK_PARSE_EC_EXTENDED",
#endif /* POLARSSL_PK_PARSE_EC_EXTENDED */ #endif /* POLARSSL_PK_PARSE_EC_EXTENDED */
#if defined(POLARSSL_ERROR_STRERROR_BC)
"POLARSSL_ERROR_STRERROR_BC",
#endif /* POLARSSL_ERROR_STRERROR_BC */
#if defined(POLARSSL_ERROR_STRERROR_DUMMY) #if defined(POLARSSL_ERROR_STRERROR_DUMMY)
"POLARSSL_ERROR_STRERROR_DUMMY", "POLARSSL_ERROR_STRERROR_DUMMY",
#endif /* POLARSSL_ERROR_STRERROR_DUMMY */ #endif /* POLARSSL_ERROR_STRERROR_DUMMY */

13
scripts/data_files/error.fmt
View File

@ -109,13 +109,6 @@ LOW_LEVEL_CODE_CHECKS
polarssl_snprintf( buf, buflen, "UNKNOWN ERROR CODE (%04X)", use_ret ); polarssl_snprintf( buf, buflen, "UNKNOWN ERROR CODE (%04X)", use_ret );
} }
#if defined(POLARSSL_ERROR_STRERROR_BC)
void error_strerror( int ret, char *buf, size_t buflen )
{
polarssl_strerror( ret, buf, buflen );
}
#endif /* POLARSSL_ERROR_STRERROR_BC */
#else /* POLARSSL_ERROR_C */ #else /* POLARSSL_ERROR_C */
#if defined(POLARSSL_ERROR_STRERROR_DUMMY) #if defined(POLARSSL_ERROR_STRERROR_DUMMY)
@ -131,12 +124,6 @@ void polarssl_strerror( int ret, char *buf, size_t buflen )
buf[0] = '\0'; buf[0] = '\0';
} }
#if defined(POLARSSL_ERROR_STRERROR_BC)
void error_strerror( int ret, char *buf, size_t buflen )
{
polarssl_strerror( ret, buf, buflen );
}
#endif /* POLARSSL_ERROR_STRERROR_BC */
#endif /* POLARSSL_ERROR_STRERROR_DUMMY */ #endif /* POLARSSL_ERROR_STRERROR_DUMMY */
#endif /* POLARSSL_ERROR_C */ #endif /* POLARSSL_ERROR_C */

8
tests/suites/test_suite_error.function
View File

@ -17,13 +17,5 @@ void error_strerror( int code, char *result_str )
polarssl_strerror( code, buf, 500 ); polarssl_strerror( code, buf, 500 );
TEST_ASSERT( strcmp( buf, result_str ) == 0 ); TEST_ASSERT( strcmp( buf, result_str ) == 0 );
#if defined(POLARSSL_ERROR_STRERROR_BC)
memset( buf, 0, sizeof( buf ) );
error_strerror( code, buf, 500 );
TEST_ASSERT( strcmp( buf, result_str ) == 0 );
#endif
} }
/* END_CASE */ /* END_CASE */