The Great Renaming
A simple execution of tmp/invoke-rename.pl
diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 67d2955..892ca17 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -20,25 +20,25 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#if !defined(POLARSSL_CONFIG_FILE)
+#if !defined(MBEDTLS_CONFIG_FILE)
#include "mbedtls/config.h"
#else
-#include POLARSSL_CONFIG_FILE
+#include MBEDTLS_CONFIG_FILE
#endif
-#if defined(POLARSSL_PLATFORM_C)
+#if defined(MBEDTLS_PLATFORM_C)
#include "mbedtls/platform.h"
#else
#include <stdio.h>
-#define polarssl_printf printf
-#define polarssl_fprintf fprintf
-#define polarssl_printf printf
-#define polarssl_snprintf snprintf
+#define mbedtls_printf printf
+#define mbedtls_fprintf fprintf
+#define mbedtls_printf printf
+#define mbedtls_snprintf snprintf
#endif
-#if defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_FS_IO) && \
- defined(POLARSSL_SSL_TLS_C) && defined(POLARSSL_SSL_CLI_C) && \
- defined(POLARSSL_NET_C) && defined(POLARSSL_CTR_DRBG_C)
+#if defined(MBEDTLS_ENTROPY_C) && defined(MBEDTLS_FS_IO) && \
+ defined(MBEDTLS_SSL_TLS_C) && defined(MBEDTLS_SSL_CLI_C) && \
+ defined(MBEDTLS_NET_C) && defined(MBEDTLS_CTR_DRBG_C)
#include "mbedtls/net.h"
#include "mbedtls/ssl.h"
#include "mbedtls/entropy.h"
@@ -53,7 +53,7 @@
#include <string.h>
#endif
-#if defined(POLARSSL_TIMING_C)
+#if defined(MBEDTLS_TIMING_C)
#include "mbedtls/timing.h"
#endif
@@ -79,7 +79,7 @@
#define DFL_PSK ""
#define DFL_PSK_IDENTITY "Client_identity"
#define DFL_FORCE_CIPHER 0
-#define DFL_RENEGOTIATION SSL_RENEGOTIATION_DISABLED
+#define DFL_RENEGOTIATION MBEDTLS_SSL_RENEGOTIATION_DISABLED
#define DFL_ALLOW_LEGACY -2
#define DFL_RENEGOTIATE 0
#define DFL_EXCHANGES 1
@@ -87,14 +87,14 @@
#define DFL_MAX_VERSION -1
#define DFL_ARC4 -1
#define DFL_AUTH_MODE -1
-#define DFL_MFL_CODE SSL_MAX_FRAG_LEN_NONE
+#define DFL_MFL_CODE MBEDTLS_SSL_MAX_FRAG_LEN_NONE
#define DFL_TRUNC_HMAC -1
#define DFL_RECSPLIT -1
#define DFL_RECONNECT 0
#define DFL_RECO_DELAY 0
-#define DFL_TICKETS SSL_SESSION_TICKETS_ENABLED
+#define DFL_TICKETS MBEDTLS_SSL_SESSION_TICKETS_ENABLED
#define DFL_ALPN_STRING NULL
-#define DFL_TRANSPORT SSL_TRANSPORT_STREAM
+#define DFL_TRANSPORT MBEDTLS_SSL_TRANSPORT_STREAM
#define DFL_HS_TO_MIN 0
#define DFL_HS_TO_MAX 0
#define DFL_FALLBACK -1
@@ -104,8 +104,8 @@
#define GET_REQUEST "GET %s HTTP/1.0\r\nExtra-header: "
#define GET_REQUEST_END "\r\n\r\n"
-#if defined(POLARSSL_X509_CRT_PARSE_C)
-#if defined(POLARSSL_FS_IO)
+#if defined(MBEDTLS_X509_CRT_PARSE_C)
+#if defined(MBEDTLS_FS_IO)
#define USAGE_IO \
" ca_file=%%s The single file containing the top-level CA(s) you fully trust\n" \
" default: \"\" (pre-loaded)\n" \
@@ -116,65 +116,65 @@
" key_file=%%s default: \"\" (pre-loaded)\n"
#else
#define USAGE_IO \
- " No file operations available (POLARSSL_FS_IO not defined)\n"
-#endif /* POLARSSL_FS_IO */
+ " No file operations available (MBEDTLS_FS_IO not defined)\n"
+#endif /* MBEDTLS_FS_IO */
#else
#define USAGE_IO ""
-#endif /* POLARSSL_X509_CRT_PARSE_C */
+#endif /* MBEDTLS_X509_CRT_PARSE_C */
-#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
+#if defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED)
#define USAGE_PSK \
" psk=%%s default: \"\" (in hex, without 0x)\n" \
" psk_identity=%%s default: \"Client_identity\"\n"
#else
#define USAGE_PSK ""
-#endif /* POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED */
+#endif /* MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED */
-#if defined(POLARSSL_SSL_SESSION_TICKETS)
+#if defined(MBEDTLS_SSL_SESSION_TICKETS)
#define USAGE_TICKETS \
" tickets=%%d default: 1 (enabled)\n"
#else
#define USAGE_TICKETS ""
-#endif /* POLARSSL_SSL_SESSION_TICKETS */
+#endif /* MBEDTLS_SSL_SESSION_TICKETS */
-#if defined(POLARSSL_SSL_TRUNCATED_HMAC)
+#if defined(MBEDTLS_SSL_TRUNCATED_HMAC)
#define USAGE_TRUNC_HMAC \
" trunc_hmac=%%d default: library default\n"
#else
#define USAGE_TRUNC_HMAC ""
-#endif /* POLARSSL_SSL_TRUNCATED_HMAC */
+#endif /* MBEDTLS_SSL_TRUNCATED_HMAC */
-#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
+#if defined(MBEDTLS_SSL_MAX_FRAGMENT_LENGTH)
#define USAGE_MAX_FRAG_LEN \
" max_frag_len=%%d default: 16384 (tls default)\n" \
" options: 512, 1024, 2048, 4096\n"
#else
#define USAGE_MAX_FRAG_LEN ""
-#endif /* POLARSSL_SSL_MAX_FRAGMENT_LENGTH */
+#endif /* MBEDTLS_SSL_MAX_FRAGMENT_LENGTH */
-#if defined(POLARSSL_SSL_CBC_RECORD_SPLITTING)
+#if defined(MBEDTLS_SSL_CBC_RECORD_SPLITTING)
#define USAGE_RECSPLIT \
" recplit=%%d default: (library default)\n"
#else
#define USAGE_RECSPLIT
#endif
-#if defined(POLARSSL_TIMING_C)
+#if defined(MBEDTLS_TIMING_C)
#define USAGE_TIME \
" reco_delay=%%d default: 0 seconds\n"
#else
#define USAGE_TIME ""
-#endif /* POLARSSL_TIMING_C */
+#endif /* MBEDTLS_TIMING_C */
-#if defined(POLARSSL_SSL_ALPN)
+#if defined(MBEDTLS_SSL_ALPN)
#define USAGE_ALPN \
" alpn=%%s default: \"\" (disabled)\n" \
" example: spdy/1,http/1.1\n"
#else
#define USAGE_ALPN ""
-#endif /* POLARSSL_SSL_ALPN */
+#endif /* MBEDTLS_SSL_ALPN */
-#if defined(POLARSSL_SSL_PROTO_DTLS)
+#if defined(MBEDTLS_SSL_PROTO_DTLS)
#define USAGE_DTLS \
" dtls=%%d default: 0 (TLS)\n" \
" hs_timeout=%%d-%%d default: (library default: 1000-60000)\n" \
@@ -183,28 +183,28 @@
#define USAGE_DTLS ""
#endif
-#if defined(POLARSSL_SSL_FALLBACK_SCSV)
+#if defined(MBEDTLS_SSL_FALLBACK_SCSV)
#define USAGE_FALLBACK \
" fallback=0/1 default: (library default: off)\n"
#else
#define USAGE_FALLBACK ""
#endif
-#if defined(POLARSSL_SSL_EXTENDED_MASTER_SECRET)
+#if defined(MBEDTLS_SSL_EXTENDED_MASTER_SECRET)
#define USAGE_EMS \
" extended_ms=0/1 default: (library default: on)\n"
#else
#define USAGE_EMS ""
#endif
-#if defined(POLARSSL_SSL_ENCRYPT_THEN_MAC)
+#if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC)
#define USAGE_ETM \
" etm=0/1 default: (library default: on)\n"
#else
#define USAGE_ETM ""
#endif
-#if defined(POLARSSL_SSL_RENEGOTIATION)
+#if defined(MBEDTLS_SSL_RENEGOTIATION)
#define USAGE_RENEGO \
" renegotiation=%%d default: 0 (disabled)\n" \
" renegotiate=%%d default: 0 (disabled)\n"
@@ -258,14 +258,14 @@
" force_ciphersuite=<name> default: all enabled\n"\
" acceptable ciphersuite names:\n"
-#if !defined(POLARSSL_ENTROPY_C) || !defined(POLARSSL_FS_IO) || \
- !defined(POLARSSL_SSL_TLS_C) || !defined(POLARSSL_SSL_CLI_C) || \
- !defined(POLARSSL_NET_C) || !defined(POLARSSL_CTR_DRBG_C)
+#if !defined(MBEDTLS_ENTROPY_C) || !defined(MBEDTLS_FS_IO) || \
+ !defined(MBEDTLS_SSL_TLS_C) || !defined(MBEDTLS_SSL_CLI_C) || \
+ !defined(MBEDTLS_NET_C) || !defined(MBEDTLS_CTR_DRBG_C)
int main( void )
{
- polarssl_printf("POLARSSL_ENTROPY_C and/or "
- "POLARSSL_SSL_TLS_C and/or POLARSSL_SSL_CLI_C and/or "
- "POLARSSL_NET_C and/or POLARSSL_CTR_DRBG_C not defined.\n");
+ mbedtls_printf("MBEDTLS_ENTROPY_C and/or "
+ "MBEDTLS_SSL_TLS_C and/or MBEDTLS_SSL_CLI_C and/or "
+ "MBEDTLS_NET_C and/or MBEDTLS_CTR_DRBG_C not defined.\n");
return( 0 );
}
#else
@@ -279,7 +279,7 @@
int server_port; /* port on which the ssl service runs */
int debug_level; /* level of debugging */
int nbio; /* should I/O be blocking? */
- uint32_t read_timeout; /* timeout on ssl_read() in milliseconds */
+ uint32_t read_timeout; /* timeout on mbedtls_ssl_read() in milliseconds */
int max_resend; /* DTLS times to resend on read timeout */
const char *request_page; /* page on server to request */
int request_size; /* pad request with header to requested size */
@@ -318,7 +318,7 @@
{
((void) level);
- polarssl_fprintf( (FILE *) ctx, "%s", str );
+ mbedtls_fprintf( (FILE *) ctx, "%s", str );
fflush( (FILE *) ctx );
}
@@ -334,11 +334,11 @@
if( first_try )
{
first_try = 0;
- return( POLARSSL_ERR_NET_WANT_READ );
+ return( MBEDTLS_ERR_NET_WANT_READ );
}
- ret = net_recv( ctx, buf, len );
- if( ret != POLARSSL_ERR_NET_WANT_READ )
+ ret = mbedtls_net_recv( ctx, buf, len );
+ if( ret != MBEDTLS_ERR_NET_WANT_READ )
first_try = 1; /* Next call will be a new operation */
return( ret );
}
@@ -351,77 +351,77 @@
if( first_try )
{
first_try = 0;
- return( POLARSSL_ERR_NET_WANT_WRITE );
+ return( MBEDTLS_ERR_NET_WANT_WRITE );
}
- ret = net_send( ctx, buf, len );
- if( ret != POLARSSL_ERR_NET_WANT_WRITE )
+ ret = mbedtls_net_send( ctx, buf, len );
+ if( ret != MBEDTLS_ERR_NET_WANT_WRITE )
first_try = 1; /* Next call will be a new operation */
return( ret );
}
-#if defined(POLARSSL_X509_CRT_PARSE_C)
+#if defined(MBEDTLS_X509_CRT_PARSE_C)
/*
* Enabled if debug_level > 1 in code below
*/
-static int my_verify( void *data, x509_crt *crt, int depth, int *flags )
+static int my_verify( void *data, mbedtls_x509_crt *crt, int depth, int *flags )
{
char buf[1024];
((void) data);
- polarssl_printf( "\nVerify requested for (Depth %d):\n", depth );
- x509_crt_info( buf, sizeof( buf ) - 1, "", crt );
- polarssl_printf( "%s", buf );
+ mbedtls_printf( "\nVerify requested for (Depth %d):\n", depth );
+ mbedtls_x509_crt_info( buf, sizeof( buf ) - 1, "", crt );
+ mbedtls_printf( "%s", buf );
- if( ( (*flags) & BADCERT_EXPIRED ) != 0 )
- polarssl_printf( " ! server certificate has expired\n" );
+ if( ( (*flags) & MBEDTLS_BADCERT_EXPIRED ) != 0 )
+ mbedtls_printf( " ! server certificate has expired\n" );
- if( ( (*flags) & BADCERT_REVOKED ) != 0 )
- polarssl_printf( " ! server certificate has been revoked\n" );
+ if( ( (*flags) & MBEDTLS_X509_BADCERT_REVOKED ) != 0 )
+ mbedtls_printf( " ! server certificate has been revoked\n" );
- if( ( (*flags) & BADCERT_CN_MISMATCH ) != 0 )
- polarssl_printf( " ! CN mismatch\n" );
+ if( ( (*flags) & MBEDTLS_X509_BADCERT_CN_MISMATCH ) != 0 )
+ mbedtls_printf( " ! CN mismatch\n" );
- if( ( (*flags) & BADCERT_NOT_TRUSTED ) != 0 )
- polarssl_printf( " ! self-signed or not signed by a trusted CA\n" );
+ if( ( (*flags) & MBEDTLS_X509_BADCERT_NOT_TRUSTED ) != 0 )
+ mbedtls_printf( " ! self-signed or not signed by a trusted CA\n" );
- if( ( (*flags) & BADCRL_NOT_TRUSTED ) != 0 )
- polarssl_printf( " ! CRL not trusted\n" );
+ if( ( (*flags) & MBEDTLS_X509_BADCRL_NOT_TRUSTED ) != 0 )
+ mbedtls_printf( " ! CRL not trusted\n" );
- if( ( (*flags) & BADCRL_EXPIRED ) != 0 )
- polarssl_printf( " ! CRL expired\n" );
+ if( ( (*flags) & MBEDTLS_X509_BADCRL_EXPIRED ) != 0 )
+ mbedtls_printf( " ! CRL expired\n" );
- if( ( (*flags) & BADCERT_OTHER ) != 0 )
- polarssl_printf( " ! other (unknown) flag\n" );
+ if( ( (*flags) & MBEDTLS_BADCERT_OTHER ) != 0 )
+ mbedtls_printf( " ! other (unknown) flag\n" );
if ( ( *flags ) == 0 )
- polarssl_printf( " This certificate has no flags\n" );
+ mbedtls_printf( " This certificate has no flags\n" );
return( 0 );
}
-#endif /* POLARSSL_X509_CRT_PARSE_C */
+#endif /* MBEDTLS_X509_CRT_PARSE_C */
int main( int argc, char *argv[] )
{
int ret = 0, len, tail_len, server_fd, i, written, frags, retry_left;
- unsigned char buf[SSL_MAX_CONTENT_LEN + 1];
-#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
- unsigned char psk[POLARSSL_PSK_MAX_LEN];
+ unsigned char buf[MBEDTLS_SSL_MAX_CONTENT_LEN + 1];
+#if defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED)
+ unsigned char psk[MBEDTLS_PSK_MAX_LEN];
size_t psk_len = 0;
#endif
-#if defined(POLARSSL_SSL_ALPN)
+#if defined(MBEDTLS_SSL_ALPN)
const char *alpn_list[10];
#endif
const char *pers = "ssl_client2";
- entropy_context entropy;
- ctr_drbg_context ctr_drbg;
- ssl_context ssl;
- ssl_session saved_session;
-#if defined(POLARSSL_X509_CRT_PARSE_C)
- x509_crt cacert;
- x509_crt clicert;
- pk_context pkey;
+ mbedtls_entropy_context entropy;
+ mbedtls_ctr_drbg_context ctr_drbg;
+ mbedtls_ssl_context ssl;
+ mbedtls_ssl_session saved_session;
+#if defined(MBEDTLS_X509_CRT_PARSE_C)
+ mbedtls_x509_crt cacert;
+ mbedtls_x509_crt clicert;
+ mbedtls_pk_context pkey;
#endif
char *p, *q;
const int *list;
@@ -430,14 +430,14 @@
* Make sure memory references are valid.
*/
server_fd = 0;
- memset( &ssl, 0, sizeof( ssl_context ) );
- memset( &saved_session, 0, sizeof( ssl_session ) );
-#if defined(POLARSSL_X509_CRT_PARSE_C)
- x509_crt_init( &cacert );
- x509_crt_init( &clicert );
- pk_init( &pkey );
+ memset( &ssl, 0, sizeof( mbedtls_ssl_context ) );
+ memset( &saved_session, 0, sizeof( mbedtls_ssl_session ) );
+#if defined(MBEDTLS_X509_CRT_PARSE_C)
+ mbedtls_x509_crt_init( &cacert );
+ mbedtls_x509_crt_init( &clicert );
+ mbedtls_pk_init( &pkey );
#endif
-#if defined(POLARSSL_SSL_ALPN)
+#if defined(MBEDTLS_SSL_ALPN)
memset( (void * ) alpn_list, 0, sizeof( alpn_list ) );
#endif
@@ -447,19 +447,19 @@
if( ret == 0 )
ret = 1;
- polarssl_printf( USAGE );
+ mbedtls_printf( USAGE );
- list = ssl_list_ciphersuites();
+ list = mbedtls_ssl_list_ciphersuites();
while( *list )
{
- polarssl_printf(" %-42s", ssl_get_ciphersuite_name( *list ) );
+ mbedtls_printf(" %-42s", mbedtls_ssl_get_ciphersuite_name( *list ) );
list++;
if( !*list )
break;
- polarssl_printf(" %s\n", ssl_get_ciphersuite_name( *list ) );
+ mbedtls_printf(" %s\n", mbedtls_ssl_get_ciphersuite_name( *list ) );
list++;
}
- polarssl_printf("\n");
+ mbedtls_printf("\n");
goto exit;
}
@@ -522,9 +522,9 @@
{
int t = atoi( q );
if( t == 0 )
- opt.transport = SSL_TRANSPORT_STREAM;
+ opt.transport = MBEDTLS_SSL_TRANSPORT_STREAM;
else if( t == 1 )
- opt.transport = SSL_TRANSPORT_DATAGRAM;
+ opt.transport = MBEDTLS_SSL_TRANSPORT_DATAGRAM;
else
goto usage;
}
@@ -553,7 +553,7 @@
else if( strcmp( p, "request_size" ) == 0 )
{
opt.request_size = atoi( q );
- if( opt.request_size < 0 || opt.request_size > SSL_MAX_CONTENT_LEN )
+ if( opt.request_size < 0 || opt.request_size > MBEDTLS_SSL_MAX_CONTENT_LEN )
goto usage;
}
else if( strcmp( p, "ca_file" ) == 0 )
@@ -570,7 +570,7 @@
opt.psk_identity = q;
else if( strcmp( p, "force_ciphersuite" ) == 0 )
{
- opt.force_ciphersuite[0] = ssl_get_ciphersuite_id( q );
+ opt.force_ciphersuite[0] = mbedtls_ssl_get_ciphersuite_id( q );
if( opt.force_ciphersuite[0] == 0 )
{
@@ -581,16 +581,16 @@
}
else if( strcmp( p, "renegotiation" ) == 0 )
{
- opt.renegotiation = (atoi( q )) ? SSL_RENEGOTIATION_ENABLED :
- SSL_RENEGOTIATION_DISABLED;
+ opt.renegotiation = (atoi( q )) ? MBEDTLS_SSL_RENEGOTIATION_ENABLED :
+ MBEDTLS_SSL_RENEGOTIATION_DISABLED;
}
else if( strcmp( p, "allow_legacy" ) == 0 )
{
switch( atoi( q ) )
{
- case -1: opt.allow_legacy = SSL_LEGACY_BREAK_HANDSHAKE; break;
- case 0: opt.allow_legacy = SSL_LEGACY_NO_RENEGOTIATION; break;
- case 1: opt.allow_legacy = SSL_LEGACY_ALLOW_RENEGOTIATION; break;
+ case -1: opt.allow_legacy = MBEDTLS_SSL_LEGACY_BREAK_HANDSHAKE; break;
+ case 0: opt.allow_legacy = MBEDTLS_SSL_LEGACY_NO_RENEGOTIATION; break;
+ case 1: opt.allow_legacy = MBEDTLS_SSL_LEGACY_ALLOW_RENEGOTIATION; break;
default: goto usage;
}
}
@@ -632,8 +632,8 @@
{
switch( atoi( q ) )
{
- case 0: opt.fallback = SSL_IS_NOT_FALLBACK; break;
- case 1: opt.fallback = SSL_IS_FALLBACK; break;
+ case 0: opt.fallback = MBEDTLS_SSL_IS_NOT_FALLBACK; break;
+ case 1: opt.fallback = MBEDTLS_SSL_IS_FALLBACK; break;
default: goto usage;
}
}
@@ -641,8 +641,8 @@
{
switch( atoi( q ) )
{
- case 0: opt.extended_ms = SSL_EXTENDED_MS_DISABLED; break;
- case 1: opt.extended_ms = SSL_EXTENDED_MS_ENABLED; break;
+ case 0: opt.extended_ms = MBEDTLS_SSL_EXTENDED_MS_DISABLED; break;
+ case 1: opt.extended_ms = MBEDTLS_SSL_EXTENDED_MS_ENABLED; break;
default: goto usage;
}
}
@@ -650,38 +650,38 @@
{
switch( atoi( q ) )
{
- case 0: opt.etm = SSL_ETM_DISABLED; break;
- case 1: opt.etm = SSL_ETM_ENABLED; break;
+ case 0: opt.etm = MBEDTLS_SSL_ETM_DISABLED; break;
+ case 1: opt.etm = MBEDTLS_SSL_ETM_ENABLED; break;
default: goto usage;
}
}
else if( strcmp( p, "min_version" ) == 0 )
{
if( strcmp( q, "ssl3" ) == 0 )
- opt.min_version = SSL_MINOR_VERSION_0;
+ opt.min_version = MBEDTLS_SSL_MINOR_VERSION_0;
else if( strcmp( q, "tls1" ) == 0 )
- opt.min_version = SSL_MINOR_VERSION_1;
+ opt.min_version = MBEDTLS_SSL_MINOR_VERSION_1;
else if( strcmp( q, "tls1_1" ) == 0 ||
strcmp( q, "dtls1" ) == 0 )
- opt.min_version = SSL_MINOR_VERSION_2;
+ opt.min_version = MBEDTLS_SSL_MINOR_VERSION_2;
else if( strcmp( q, "tls1_2" ) == 0 ||
strcmp( q, "dtls1_2" ) == 0 )
- opt.min_version = SSL_MINOR_VERSION_3;
+ opt.min_version = MBEDTLS_SSL_MINOR_VERSION_3;
else
goto usage;
}
else if( strcmp( p, "max_version" ) == 0 )
{
if( strcmp( q, "ssl3" ) == 0 )
- opt.max_version = SSL_MINOR_VERSION_0;
+ opt.max_version = MBEDTLS_SSL_MINOR_VERSION_0;
else if( strcmp( q, "tls1" ) == 0 )
- opt.max_version = SSL_MINOR_VERSION_1;
+ opt.max_version = MBEDTLS_SSL_MINOR_VERSION_1;
else if( strcmp( q, "tls1_1" ) == 0 ||
strcmp( q, "dtls1" ) == 0 )
- opt.max_version = SSL_MINOR_VERSION_2;
+ opt.max_version = MBEDTLS_SSL_MINOR_VERSION_2;
else if( strcmp( q, "tls1_2" ) == 0 ||
strcmp( q, "dtls1_2" ) == 0 )
- opt.max_version = SSL_MINOR_VERSION_3;
+ opt.max_version = MBEDTLS_SSL_MINOR_VERSION_3;
else
goto usage;
}
@@ -689,8 +689,8 @@
{
switch( atoi( q ) )
{
- case 0: opt.arc4 = SSL_ARC4_DISABLED; break;
- case 1: opt.arc4 = SSL_ARC4_ENABLED; break;
+ case 0: opt.arc4 = MBEDTLS_SSL_ARC4_DISABLED; break;
+ case 1: opt.arc4 = MBEDTLS_SSL_ARC4_ENABLED; break;
default: goto usage;
}
}
@@ -698,35 +698,35 @@
{
if( strcmp( q, "ssl3" ) == 0 )
{
- opt.min_version = SSL_MINOR_VERSION_0;
- opt.max_version = SSL_MINOR_VERSION_0;
+ opt.min_version = MBEDTLS_SSL_MINOR_VERSION_0;
+ opt.max_version = MBEDTLS_SSL_MINOR_VERSION_0;
}
else if( strcmp( q, "tls1" ) == 0 )
{
- opt.min_version = SSL_MINOR_VERSION_1;
- opt.max_version = SSL_MINOR_VERSION_1;
+ opt.min_version = MBEDTLS_SSL_MINOR_VERSION_1;
+ opt.max_version = MBEDTLS_SSL_MINOR_VERSION_1;
}
else if( strcmp( q, "tls1_1" ) == 0 )
{
- opt.min_version = SSL_MINOR_VERSION_2;
- opt.max_version = SSL_MINOR_VERSION_2;
+ opt.min_version = MBEDTLS_SSL_MINOR_VERSION_2;
+ opt.max_version = MBEDTLS_SSL_MINOR_VERSION_2;
}
else if( strcmp( q, "tls1_2" ) == 0 )
{
- opt.min_version = SSL_MINOR_VERSION_3;
- opt.max_version = SSL_MINOR_VERSION_3;
+ opt.min_version = MBEDTLS_SSL_MINOR_VERSION_3;
+ opt.max_version = MBEDTLS_SSL_MINOR_VERSION_3;
}
else if( strcmp( q, "dtls1" ) == 0 )
{
- opt.min_version = SSL_MINOR_VERSION_2;
- opt.max_version = SSL_MINOR_VERSION_2;
- opt.transport = SSL_TRANSPORT_DATAGRAM;
+ opt.min_version = MBEDTLS_SSL_MINOR_VERSION_2;
+ opt.max_version = MBEDTLS_SSL_MINOR_VERSION_2;
+ opt.transport = MBEDTLS_SSL_TRANSPORT_DATAGRAM;
}
else if( strcmp( q, "dtls1_2" ) == 0 )
{
- opt.min_version = SSL_MINOR_VERSION_3;
- opt.max_version = SSL_MINOR_VERSION_3;
- opt.transport = SSL_TRANSPORT_DATAGRAM;
+ opt.min_version = MBEDTLS_SSL_MINOR_VERSION_3;
+ opt.max_version = MBEDTLS_SSL_MINOR_VERSION_3;
+ opt.transport = MBEDTLS_SSL_TRANSPORT_DATAGRAM;
}
else
goto usage;
@@ -734,24 +734,24 @@
else if( strcmp( p, "auth_mode" ) == 0 )
{
if( strcmp( q, "none" ) == 0 )
- opt.auth_mode = SSL_VERIFY_NONE;
+ opt.auth_mode = MBEDTLS_SSL_VERIFY_NONE;
else if( strcmp( q, "optional" ) == 0 )
- opt.auth_mode = SSL_VERIFY_OPTIONAL;
+ opt.auth_mode = MBEDTLS_SSL_VERIFY_OPTIONAL;
else if( strcmp( q, "required" ) == 0 )
- opt.auth_mode = SSL_VERIFY_REQUIRED;
+ opt.auth_mode = MBEDTLS_SSL_VERIFY_REQUIRED;
else
goto usage;
}
else if( strcmp( p, "max_frag_len" ) == 0 )
{
if( strcmp( q, "512" ) == 0 )
- opt.mfl_code = SSL_MAX_FRAG_LEN_512;
+ opt.mfl_code = MBEDTLS_SSL_MAX_FRAG_LEN_512;
else if( strcmp( q, "1024" ) == 0 )
- opt.mfl_code = SSL_MAX_FRAG_LEN_1024;
+ opt.mfl_code = MBEDTLS_SSL_MAX_FRAG_LEN_1024;
else if( strcmp( q, "2048" ) == 0 )
- opt.mfl_code = SSL_MAX_FRAG_LEN_2048;
+ opt.mfl_code = MBEDTLS_SSL_MAX_FRAG_LEN_2048;
else if( strcmp( q, "4096" ) == 0 )
- opt.mfl_code = SSL_MAX_FRAG_LEN_4096;
+ opt.mfl_code = MBEDTLS_SSL_MAX_FRAG_LEN_4096;
else
goto usage;
}
@@ -759,8 +759,8 @@
{
switch( atoi( q ) )
{
- case 0: opt.trunc_hmac = SSL_TRUNC_HMAC_DISABLED; break;
- case 1: opt.trunc_hmac = SSL_TRUNC_HMAC_ENABLED; break;
+ case 0: opt.trunc_hmac = MBEDTLS_SSL_TRUNC_HMAC_DISABLED; break;
+ case 1: opt.trunc_hmac = MBEDTLS_SSL_TRUNC_HMAC_ENABLED; break;
default: goto usage;
}
}
@@ -784,26 +784,26 @@
goto usage;
}
-#if defined(POLARSSL_DEBUG_C)
- debug_set_threshold( opt.debug_level );
+#if defined(MBEDTLS_DEBUG_C)
+ mbedtls_debug_set_threshold( opt.debug_level );
#endif
if( opt.force_ciphersuite[0] > 0 )
{
- const ssl_ciphersuite_t *ciphersuite_info;
- ciphersuite_info = ssl_ciphersuite_from_id( opt.force_ciphersuite[0] );
+ const mbedtls_ssl_ciphersuite_t *ciphersuite_info;
+ ciphersuite_info = mbedtls_ssl_ciphersuite_from_id( opt.force_ciphersuite[0] );
if( opt.max_version != -1 &&
ciphersuite_info->min_minor_ver > opt.max_version )
{
- polarssl_printf("forced ciphersuite not allowed with this protocol version\n");
+ mbedtls_printf("forced ciphersuite not allowed with this protocol version\n");
ret = 2;
goto usage;
}
if( opt.min_version != -1 &&
ciphersuite_info->max_minor_ver < opt.min_version )
{
- polarssl_printf("forced ciphersuite not allowed with this protocol version\n");
+ mbedtls_printf("forced ciphersuite not allowed with this protocol version\n");
ret = 2;
goto usage;
}
@@ -819,26 +819,26 @@
{
opt.min_version = ciphersuite_info->min_minor_ver;
/* DTLS starts with TLS 1.1 */
- if( opt.transport == SSL_TRANSPORT_DATAGRAM &&
- opt.min_version < SSL_MINOR_VERSION_2 )
- opt.min_version = SSL_MINOR_VERSION_2;
+ if( opt.transport == MBEDTLS_SSL_TRANSPORT_DATAGRAM &&
+ opt.min_version < MBEDTLS_SSL_MINOR_VERSION_2 )
+ opt.min_version = MBEDTLS_SSL_MINOR_VERSION_2;
}
/* Enable RC4 if needed and not explicitly disabled */
- if( ciphersuite_info->cipher == POLARSSL_CIPHER_ARC4_128 )
+ if( ciphersuite_info->cipher == MBEDTLS_CIPHER_ARC4_128 )
{
- if( opt.arc4 == SSL_ARC4_DISABLED )
+ if( opt.arc4 == MBEDTLS_SSL_ARC4_DISABLED )
{
- polarssl_printf("forced RC4 ciphersuite with RC4 disabled\n");
+ mbedtls_printf("forced RC4 ciphersuite with RC4 disabled\n");
ret = 2;
goto usage;
}
- opt.arc4 = SSL_ARC4_ENABLED;
+ opt.arc4 = MBEDTLS_SSL_ARC4_ENABLED;
}
}
-#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
+#if defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED)
/*
* Unhexify the pre-shared key if any is given
*/
@@ -849,7 +849,7 @@
if( strlen( opt.psk ) % 2 != 0 )
{
- polarssl_printf("pre-shared key not valid hex\n");
+ mbedtls_printf("pre-shared key not valid hex\n");
goto exit;
}
@@ -866,7 +866,7 @@
c -= 'A' - 10;
else
{
- polarssl_printf("pre-shared key not valid hex\n");
+ mbedtls_printf("pre-shared key not valid hex\n");
goto exit;
}
psk[ j / 2 ] = c << 4;
@@ -880,15 +880,15 @@
c -= 'A' - 10;
else
{
- polarssl_printf("pre-shared key not valid hex\n");
+ mbedtls_printf("pre-shared key not valid hex\n");
goto exit;
}
psk[ j / 2 ] |= c;
}
}
-#endif /* POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED */
+#endif /* MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED */
-#if defined(POLARSSL_SSL_ALPN)
+#if defined(MBEDTLS_SSL_ALPN)
if( opt.alpn_string != NULL )
{
p = (char *) opt.alpn_string;
@@ -906,124 +906,124 @@
*p++ = '\0';
}
}
-#endif /* POLARSSL_SSL_ALPN */
+#endif /* MBEDTLS_SSL_ALPN */
/*
* 0. Initialize the RNG and the session data
*/
- polarssl_printf( "\n . Seeding the random number generator..." );
+ mbedtls_printf( "\n . Seeding the random number generator..." );
fflush( stdout );
- entropy_init( &entropy );
- if( ( ret = ctr_drbg_init( &ctr_drbg, entropy_func, &entropy,
+ mbedtls_entropy_init( &entropy );
+ if( ( ret = mbedtls_ctr_drbg_init( &ctr_drbg, mbedtls_entropy_func, &entropy,
(const unsigned char *) pers,
strlen( pers ) ) ) != 0 )
{
- polarssl_printf( " failed\n ! ctr_drbg_init returned -0x%x\n", -ret );
+ mbedtls_printf( " failed\n ! mbedtls_ctr_drbg_init returned -0x%x\n", -ret );
goto exit;
}
- polarssl_printf( " ok\n" );
+ mbedtls_printf( " ok\n" );
-#if defined(POLARSSL_X509_CRT_PARSE_C)
+#if defined(MBEDTLS_X509_CRT_PARSE_C)
/*
* 1.1. Load the trusted CA
*/
- polarssl_printf( " . Loading the CA root certificate ..." );
+ mbedtls_printf( " . Loading the CA root certificate ..." );
fflush( stdout );
-#if defined(POLARSSL_FS_IO)
+#if defined(MBEDTLS_FS_IO)
if( strlen( opt.ca_path ) )
if( strcmp( opt.ca_path, "none" ) == 0 )
ret = 0;
else
- ret = x509_crt_parse_path( &cacert, opt.ca_path );
+ ret = mbedtls_x509_crt_parse_path( &cacert, opt.ca_path );
else if( strlen( opt.ca_file ) )
if( strcmp( opt.ca_file, "none" ) == 0 )
ret = 0;
else
- ret = x509_crt_parse_file( &cacert, opt.ca_file );
+ ret = mbedtls_x509_crt_parse_file( &cacert, opt.ca_file );
else
#endif
-#if defined(POLARSSL_CERTS_C)
- for( i = 0; test_cas[i] != NULL; i++ )
+#if defined(MBEDTLS_CERTS_C)
+ for( i = 0; mbedtls_test_cas[i] != NULL; i++ )
{
- ret = x509_crt_parse( &cacert,
- (const unsigned char *) test_cas[i],
- test_cas_len[i] );
+ ret = mbedtls_x509_crt_parse( &cacert,
+ (const unsigned char *) mbedtls_test_cas[i],
+ mbedtls_test_cas_len[i] );
if( ret != 0 )
break;
}
#else
{
ret = 1;
- polarssl_printf("POLARSSL_CERTS_C not defined.");
+ mbedtls_printf("MBEDTLS_CERTS_C not defined.");
}
#endif
if( ret < 0 )
{
- polarssl_printf( " failed\n ! x509_crt_parse returned -0x%x\n\n", -ret );
+ mbedtls_printf( " failed\n ! mbedtls_x509_crt_parse returned -0x%x\n\n", -ret );
goto exit;
}
- polarssl_printf( " ok (%d skipped)\n", ret );
+ mbedtls_printf( " ok (%d skipped)\n", ret );
/*
* 1.2. Load own certificate and private key
*
* (can be skipped if client authentication is not required)
*/
- polarssl_printf( " . Loading the client cert. and key..." );
+ mbedtls_printf( " . Loading the client cert. and key..." );
fflush( stdout );
-#if defined(POLARSSL_FS_IO)
+#if defined(MBEDTLS_FS_IO)
if( strlen( opt.crt_file ) )
if( strcmp( opt.crt_file, "none" ) == 0 )
ret = 0;
else
- ret = x509_crt_parse_file( &clicert, opt.crt_file );
+ ret = mbedtls_x509_crt_parse_file( &clicert, opt.crt_file );
else
#endif
-#if defined(POLARSSL_CERTS_C)
- ret = x509_crt_parse( &clicert, (const unsigned char *) test_cli_crt,
- test_cli_crt_len );
+#if defined(MBEDTLS_CERTS_C)
+ ret = mbedtls_x509_crt_parse( &clicert, (const unsigned char *) mbedtls_test_cli_crt,
+ mbedtls_test_cli_crt_len );
#else
{
ret = 1;
- polarssl_printf("POLARSSL_CERTS_C not defined.");
+ mbedtls_printf("MBEDTLS_CERTS_C not defined.");
}
#endif
if( ret != 0 )
{
- polarssl_printf( " failed\n ! x509_crt_parse returned -0x%x\n\n", -ret );
+ mbedtls_printf( " failed\n ! mbedtls_x509_crt_parse returned -0x%x\n\n", -ret );
goto exit;
}
-#if defined(POLARSSL_FS_IO)
+#if defined(MBEDTLS_FS_IO)
if( strlen( opt.key_file ) )
if( strcmp( opt.key_file, "none" ) == 0 )
ret = 0;
else
- ret = pk_parse_keyfile( &pkey, opt.key_file, "" );
+ ret = mbedtls_pk_parse_keyfile( &pkey, opt.key_file, "" );
else
#endif
-#if defined(POLARSSL_CERTS_C)
- ret = pk_parse_key( &pkey, (const unsigned char *) test_cli_key,
- test_cli_key_len, NULL, 0 );
+#if defined(MBEDTLS_CERTS_C)
+ ret = mbedtls_pk_parse_key( &pkey, (const unsigned char *) mbedtls_test_cli_key,
+ mbedtls_test_cli_key_len, NULL, 0 );
#else
{
ret = 1;
- polarssl_printf("POLARSSL_CERTS_C not defined.");
+ mbedtls_printf("MBEDTLS_CERTS_C not defined.");
}
#endif
if( ret != 0 )
{
- polarssl_printf( " failed\n ! pk_parse_key returned -0x%x\n\n", -ret );
+ mbedtls_printf( " failed\n ! mbedtls_pk_parse_key returned -0x%x\n\n", -ret );
goto exit;
}
- polarssl_printf( " ok\n" );
-#endif /* POLARSSL_X509_CRT_PARSE_C */
+ mbedtls_printf( " ok\n" );
+#endif /* MBEDTLS_X509_CRT_PARSE_C */
/*
* 2. Start the connection
@@ -1031,321 +1031,321 @@
if( opt.server_addr == NULL)
opt.server_addr = opt.server_name;
- polarssl_printf( " . Connecting to %s/%s/%-4d...",
- opt.transport == SSL_TRANSPORT_STREAM ? "tcp" : "udp",
+ mbedtls_printf( " . Connecting to %s/%s/%-4d...",
+ opt.transport == MBEDTLS_SSL_TRANSPORT_STREAM ? "tcp" : "udp",
opt.server_addr, opt.server_port );
fflush( stdout );
- if( ( ret = net_connect( &server_fd, opt.server_addr, opt.server_port,
- opt.transport == SSL_TRANSPORT_STREAM ?
- NET_PROTO_TCP : NET_PROTO_UDP ) ) != 0 )
+ if( ( ret = mbedtls_net_connect( &server_fd, opt.server_addr, opt.server_port,
+ opt.transport == MBEDTLS_SSL_TRANSPORT_STREAM ?
+ MBEDTLS_NET_PROTO_TCP : MBEDTLS_NET_PROTO_UDP ) ) != 0 )
{
- polarssl_printf( " failed\n ! net_connect returned -0x%x\n\n", -ret );
+ mbedtls_printf( " failed\n ! mbedtls_net_connect returned -0x%x\n\n", -ret );
goto exit;
}
if( opt.nbio > 0 )
- ret = net_set_nonblock( server_fd );
+ ret = mbedtls_net_set_nonblock( server_fd );
else
- ret = net_set_block( server_fd );
+ ret = mbedtls_net_set_block( server_fd );
if( ret != 0 )
{
- polarssl_printf( " failed\n ! net_set_(non)block() returned -0x%x\n\n", -ret );
+ mbedtls_printf( " failed\n ! net_set_(non)block() returned -0x%x\n\n", -ret );
goto exit;
}
- polarssl_printf( " ok\n" );
+ mbedtls_printf( " ok\n" );
/*
* 3. Setup stuff
*/
- polarssl_printf( " . Setting up the SSL/TLS structure..." );
+ mbedtls_printf( " . Setting up the SSL/TLS structure..." );
fflush( stdout );
- if( ( ret = ssl_init( &ssl ) ) != 0 )
+ if( ( ret = mbedtls_ssl_init( &ssl ) ) != 0 )
{
- polarssl_printf( " failed\n ! ssl_init returned -0x%x\n\n", -ret );
+ mbedtls_printf( " failed\n ! mbedtls_ssl_init returned -0x%x\n\n", -ret );
goto exit;
}
-#if defined(POLARSSL_X509_CRT_PARSE_C)
+#if defined(MBEDTLS_X509_CRT_PARSE_C)
if( opt.debug_level > 0 )
- ssl_set_verify( &ssl, my_verify, NULL );
+ mbedtls_ssl_set_verify( &ssl, my_verify, NULL );
#endif
- ssl_set_endpoint( &ssl, SSL_IS_CLIENT );
+ mbedtls_ssl_set_endpoint( &ssl, MBEDTLS_SSL_IS_CLIENT );
if( opt.auth_mode != DFL_AUTH_MODE )
- ssl_set_authmode( &ssl, opt.auth_mode );
+ mbedtls_ssl_set_authmode( &ssl, opt.auth_mode );
-#if defined(POLARSSL_SSL_PROTO_DTLS)
- if( ( ret = ssl_set_transport( &ssl, opt.transport ) ) != 0 )
+#if defined(MBEDTLS_SSL_PROTO_DTLS)
+ if( ( ret = mbedtls_ssl_set_transport( &ssl, opt.transport ) ) != 0 )
{
- polarssl_printf( " failed\n ! selected transport is not available\n" );
+ mbedtls_printf( " failed\n ! selected transport is not available\n" );
goto exit;
}
if( opt.hs_to_min != DFL_HS_TO_MIN || opt.hs_to_max != DFL_HS_TO_MAX )
- ssl_set_handshake_timeout( &ssl, opt.hs_to_min, opt.hs_to_max );
-#endif /* POLARSSL_SSL_PROTO_DTLS */
+ mbedtls_ssl_set_handshake_timeout( &ssl, opt.hs_to_min, opt.hs_to_max );
+#endif /* MBEDTLS_SSL_PROTO_DTLS */
-#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
- if( ( ret = ssl_set_max_frag_len( &ssl, opt.mfl_code ) ) != 0 )
+#if defined(MBEDTLS_SSL_MAX_FRAGMENT_LENGTH)
+ if( ( ret = mbedtls_ssl_set_max_frag_len( &ssl, opt.mfl_code ) ) != 0 )
{
- polarssl_printf( " failed\n ! ssl_set_max_frag_len returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_ssl_set_max_frag_len returned %d\n\n", ret );
goto exit;
}
#endif
-#if defined(POLARSSL_SSL_TRUNCATED_HMAC)
+#if defined(MBEDTLS_SSL_TRUNCATED_HMAC)
if( opt.trunc_hmac != DFL_TRUNC_HMAC )
- ssl_set_truncated_hmac( &ssl, opt.trunc_hmac );
+ mbedtls_ssl_set_truncated_hmac( &ssl, opt.trunc_hmac );
#endif
-#if defined(POLARSSL_SSL_EXTENDED_MASTER_SECRET)
+#if defined(MBEDTLS_SSL_EXTENDED_MASTER_SECRET)
if( opt.extended_ms != DFL_EXTENDED_MS )
- ssl_set_extended_master_secret( &ssl, opt.extended_ms );
+ mbedtls_ssl_set_extended_master_secret( &ssl, opt.extended_ms );
#endif
-#if defined(POLARSSL_SSL_ENCRYPT_THEN_MAC)
+#if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC)
if( opt.etm != DFL_ETM )
- ssl_set_encrypt_then_mac( &ssl, opt.etm );
+ mbedtls_ssl_set_encrypt_then_mac( &ssl, opt.etm );
#endif
-#if defined(POLARSSL_SSL_CBC_RECORD_SPLITTING)
+#if defined(MBEDTLS_SSL_CBC_RECORD_SPLITTING)
if( opt.recsplit != DFL_RECSPLIT )
- ssl_set_cbc_record_splitting( &ssl, opt.recsplit
- ? SSL_CBC_RECORD_SPLITTING_ENABLED
- : SSL_CBC_RECORD_SPLITTING_DISABLED );
+ mbedtls_ssl_set_cbc_record_splitting( &ssl, opt.recsplit
+ ? MBEDTLS_SSL_CBC_RECORD_SPLITTING_ENABLED
+ : MBEDTLS_SSL_CBC_RECORD_SPLITTING_DISABLED );
#endif
-#if defined(POLARSSL_SSL_ALPN)
+#if defined(MBEDTLS_SSL_ALPN)
if( opt.alpn_string != NULL )
- if( ( ret = ssl_set_alpn_protocols( &ssl, alpn_list ) ) != 0 )
+ if( ( ret = mbedtls_ssl_set_alpn_protocols( &ssl, alpn_list ) ) != 0 )
{
- polarssl_printf( " failed\n ! ssl_set_alpn_protocols returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_ssl_set_alpn_protocols returned %d\n\n", ret );
goto exit;
}
#endif
- ssl_set_rng( &ssl, ctr_drbg_random, &ctr_drbg );
- ssl_set_dbg( &ssl, my_debug, stdout );
+ mbedtls_ssl_set_rng( &ssl, mbedtls_ctr_drbg_random, &ctr_drbg );
+ mbedtls_ssl_set_dbg( &ssl, my_debug, stdout );
if( opt.nbio == 2 )
- ssl_set_bio_timeout( &ssl, &server_fd, my_send, my_recv, NULL,
+ mbedtls_ssl_set_bio_timeout( &ssl, &server_fd, my_send, my_recv, NULL,
opt.read_timeout );
else
- ssl_set_bio_timeout( &ssl, &server_fd, net_send, net_recv,
-#if defined(POLARSSL_HAVE_TIME)
- opt.nbio == 0 ? net_recv_timeout : NULL,
+ mbedtls_ssl_set_bio_timeout( &ssl, &server_fd, mbedtls_net_send, mbedtls_net_recv,
+#if defined(MBEDTLS_HAVE_TIME)
+ opt.nbio == 0 ? mbedtls_net_recv_timeout : NULL,
#else
NULL,
#endif
opt.read_timeout );
-#if defined(POLARSSL_SSL_SESSION_TICKETS)
- if( ( ret = ssl_set_session_tickets( &ssl, opt.tickets ) ) != 0 )
+#if defined(MBEDTLS_SSL_SESSION_TICKETS)
+ if( ( ret = mbedtls_ssl_set_session_tickets( &ssl, opt.tickets ) ) != 0 )
{
- polarssl_printf( " failed\n ! ssl_set_session_tickets returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_ssl_set_session_tickets returned %d\n\n", ret );
goto exit;
}
#endif
if( opt.force_ciphersuite[0] != DFL_FORCE_CIPHER )
- ssl_set_ciphersuites( &ssl, opt.force_ciphersuite );
+ mbedtls_ssl_set_ciphersuites( &ssl, opt.force_ciphersuite );
if( opt.arc4 != DFL_ARC4 )
- ssl_set_arc4_support( &ssl, opt.arc4 );
+ mbedtls_ssl_set_arc4_support( &ssl, opt.arc4 );
if( opt.allow_legacy != DFL_ALLOW_LEGACY )
- ssl_legacy_renegotiation( &ssl, opt.allow_legacy );
-#if defined(POLARSSL_SSL_RENEGOTIATION)
- ssl_set_renegotiation( &ssl, opt.renegotiation );
+ mbedtls_ssl_legacy_renegotiation( &ssl, opt.allow_legacy );
+#if defined(MBEDTLS_SSL_RENEGOTIATION)
+ mbedtls_ssl_set_renegotiation( &ssl, opt.renegotiation );
#endif
-#if defined(POLARSSL_X509_CRT_PARSE_C)
+#if defined(MBEDTLS_X509_CRT_PARSE_C)
if( strcmp( opt.ca_path, "none" ) != 0 &&
strcmp( opt.ca_file, "none" ) != 0 )
{
- ssl_set_ca_chain( &ssl, &cacert, NULL, opt.server_name );
+ mbedtls_ssl_set_ca_chain( &ssl, &cacert, NULL, opt.server_name );
}
if( strcmp( opt.crt_file, "none" ) != 0 &&
strcmp( opt.key_file, "none" ) != 0 )
{
- if( ( ret = ssl_set_own_cert( &ssl, &clicert, &pkey ) ) != 0 )
+ if( ( ret = mbedtls_ssl_set_own_cert( &ssl, &clicert, &pkey ) ) != 0 )
{
- polarssl_printf( " failed\n ! ssl_set_own_cert returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_ssl_set_own_cert returned %d\n\n", ret );
goto exit;
}
}
#endif
-#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
- if( ( ret = ssl_set_psk( &ssl, psk, psk_len,
+#if defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED)
+ if( ( ret = mbedtls_ssl_set_psk( &ssl, psk, psk_len,
(const unsigned char *) opt.psk_identity,
strlen( opt.psk_identity ) ) ) != 0 )
{
- polarssl_printf( " failed\n ! ssl_set_psk returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_ssl_set_psk returned %d\n\n", ret );
goto exit;
}
#endif
-#if defined(POLARSSL_SSL_SERVER_NAME_INDICATION)
- if( ( ret = ssl_set_hostname( &ssl, opt.server_name ) ) != 0 )
+#if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION)
+ if( ( ret = mbedtls_ssl_set_hostname( &ssl, opt.server_name ) ) != 0 )
{
- polarssl_printf( " failed\n ! ssl_set_hostname returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_ssl_set_hostname returned %d\n\n", ret );
goto exit;
}
#endif
if( opt.min_version != DFL_MIN_VERSION )
{
- ret = ssl_set_min_version( &ssl, SSL_MAJOR_VERSION_3, opt.min_version );
+ ret = mbedtls_ssl_set_min_version( &ssl, MBEDTLS_SSL_MAJOR_VERSION_3, opt.min_version );
if( ret != 0 )
{
- polarssl_printf( " failed\n ! selected min_version is not available\n" );
+ mbedtls_printf( " failed\n ! selected min_version is not available\n" );
goto exit;
}
}
if( opt.max_version != DFL_MAX_VERSION )
{
- ret = ssl_set_max_version( &ssl, SSL_MAJOR_VERSION_3, opt.max_version );
+ ret = mbedtls_ssl_set_max_version( &ssl, MBEDTLS_SSL_MAJOR_VERSION_3, opt.max_version );
if( ret != 0 )
{
- polarssl_printf( " failed\n ! selected max_version is not available\n" );
+ mbedtls_printf( " failed\n ! selected max_version is not available\n" );
goto exit;
}
}
-#if defined(POLARSSL_SSL_FALLBACK_SCSV)
+#if defined(MBEDTLS_SSL_FALLBACK_SCSV)
if( opt.fallback != DFL_FALLBACK )
- ssl_set_fallback( &ssl, opt.fallback );
+ mbedtls_ssl_set_fallback( &ssl, opt.fallback );
#endif
- polarssl_printf( " ok\n" );
+ mbedtls_printf( " ok\n" );
/*
* 4. Handshake
*/
- polarssl_printf( " . Performing the SSL/TLS handshake..." );
+ mbedtls_printf( " . Performing the SSL/TLS handshake..." );
fflush( stdout );
- while( ( ret = ssl_handshake( &ssl ) ) != 0 )
+ while( ( ret = mbedtls_ssl_handshake( &ssl ) ) != 0 )
{
- if( ret != POLARSSL_ERR_NET_WANT_READ && ret != POLARSSL_ERR_NET_WANT_WRITE )
+ if( ret != MBEDTLS_ERR_NET_WANT_READ && ret != MBEDTLS_ERR_NET_WANT_WRITE )
{
- polarssl_printf( " failed\n ! ssl_handshake returned -0x%x\n", -ret );
- if( ret == POLARSSL_ERR_X509_CERT_VERIFY_FAILED )
- polarssl_printf(
+ mbedtls_printf( " failed\n ! mbedtls_ssl_handshake returned -0x%x\n", -ret );
+ if( ret == MBEDTLS_ERR_X509_CERT_VERIFY_FAILED )
+ mbedtls_printf(
" Unable to verify the server's certificate. "
"Either it is invalid,\n"
" or you didn't set ca_file or ca_path "
"to an appropriate value.\n"
" Alternatively, you may want to use "
"auth_mode=optional for testing purposes.\n" );
- polarssl_printf( "\n" );
+ mbedtls_printf( "\n" );
goto exit;
}
}
- polarssl_printf( " ok\n [ Protocol is %s ]\n [ Ciphersuite is %s ]\n",
- ssl_get_version( &ssl ), ssl_get_ciphersuite( &ssl ) );
+ mbedtls_printf( " ok\n [ Protocol is %s ]\n [ Ciphersuite is %s ]\n",
+ mbedtls_ssl_get_version( &ssl ), mbedtls_ssl_get_ciphersuite( &ssl ) );
- if( ( ret = ssl_get_record_expansion( &ssl ) ) >= 0 )
- polarssl_printf( " [ Record expansion is %d ]\n", ret );
+ if( ( ret = mbedtls_ssl_get_record_expansion( &ssl ) ) >= 0 )
+ mbedtls_printf( " [ Record expansion is %d ]\n", ret );
else
- polarssl_printf( " [ Record expansion is unknown (compression) ]\n" );
+ mbedtls_printf( " [ Record expansion is unknown (compression) ]\n" );
-#if defined(POLARSSL_SSL_ALPN)
+#if defined(MBEDTLS_SSL_ALPN)
if( opt.alpn_string != NULL )
{
- const char *alp = ssl_get_alpn_protocol( &ssl );
- polarssl_printf( " [ Application Layer Protocol is %s ]\n",
+ const char *alp = mbedtls_ssl_get_alpn_protocol( &ssl );
+ mbedtls_printf( " [ Application Layer Protocol is %s ]\n",
alp ? alp : "(none)" );
}
#endif
if( opt.reconnect != 0 )
{
- polarssl_printf(" . Saving session for reuse..." );
+ mbedtls_printf(" . Saving session for reuse..." );
fflush( stdout );
- if( ( ret = ssl_get_session( &ssl, &saved_session ) ) != 0 )
+ if( ( ret = mbedtls_ssl_get_session( &ssl, &saved_session ) ) != 0 )
{
- polarssl_printf( " failed\n ! ssl_get_session returned -0x%x\n\n", -ret );
+ mbedtls_printf( " failed\n ! mbedtls_ssl_get_session returned -0x%x\n\n", -ret );
goto exit;
}
- polarssl_printf( " ok\n" );
+ mbedtls_printf( " ok\n" );
}
-#if defined(POLARSSL_X509_CRT_PARSE_C)
+#if defined(MBEDTLS_X509_CRT_PARSE_C)
/*
* 5. Verify the server certificate
*/
- polarssl_printf( " . Verifying peer X.509 certificate..." );
+ mbedtls_printf( " . Verifying peer X.509 certificate..." );
- if( ( ret = ssl_get_verify_result( &ssl ) ) != 0 )
+ if( ( ret = mbedtls_ssl_get_verify_result( &ssl ) ) != 0 )
{
- polarssl_printf( " failed\n" );
+ mbedtls_printf( " failed\n" );
- if( ( ret & BADCERT_EXPIRED ) != 0 )
- polarssl_printf( " ! server certificate has expired\n" );
+ if( ( ret & MBEDTLS_BADCERT_EXPIRED ) != 0 )
+ mbedtls_printf( " ! server certificate has expired\n" );
- if( ( ret & BADCERT_REVOKED ) != 0 )
- polarssl_printf( " ! server certificate has been revoked\n" );
+ if( ( ret & MBEDTLS_X509_BADCERT_REVOKED ) != 0 )
+ mbedtls_printf( " ! server certificate has been revoked\n" );
- if( ( ret & BADCERT_CN_MISMATCH ) != 0 )
- polarssl_printf( " ! CN mismatch (expected CN=%s)\n", opt.server_name );
+ if( ( ret & MBEDTLS_X509_BADCERT_CN_MISMATCH ) != 0 )
+ mbedtls_printf( " ! CN mismatch (expected CN=%s)\n", opt.server_name );
- if( ( ret & BADCERT_NOT_TRUSTED ) != 0 )
- polarssl_printf( " ! self-signed or not signed by a trusted CA\n" );
+ if( ( ret & MBEDTLS_X509_BADCERT_NOT_TRUSTED ) != 0 )
+ mbedtls_printf( " ! self-signed or not signed by a trusted CA\n" );
- polarssl_printf( "\n" );
+ mbedtls_printf( "\n" );
}
else
- polarssl_printf( " ok\n" );
+ mbedtls_printf( " ok\n" );
- if( ssl_get_peer_cert( &ssl ) != NULL )
+ if( mbedtls_ssl_get_peer_cert( &ssl ) != NULL )
{
- polarssl_printf( " . Peer certificate information ...\n" );
- x509_crt_info( (char *) buf, sizeof( buf ) - 1, " ",
- ssl_get_peer_cert( &ssl ) );
- polarssl_printf( "%s\n", buf );
+ mbedtls_printf( " . Peer certificate information ...\n" );
+ mbedtls_x509_crt_info( (char *) buf, sizeof( buf ) - 1, " ",
+ mbedtls_ssl_get_peer_cert( &ssl ) );
+ mbedtls_printf( "%s\n", buf );
}
-#endif /* POLARSSL_X509_CRT_PARSE_C */
+#endif /* MBEDTLS_X509_CRT_PARSE_C */
-#if defined(POLARSSL_SSL_RENEGOTIATION)
+#if defined(MBEDTLS_SSL_RENEGOTIATION)
if( opt.renegotiate )
{
/*
* Perform renegotiation (this must be done when the server is waiting
* for input from our side).
*/
- polarssl_printf( " . Performing renegotiation..." );
+ mbedtls_printf( " . Performing renegotiation..." );
fflush( stdout );
- while( ( ret = ssl_renegotiate( &ssl ) ) != 0 )
+ while( ( ret = mbedtls_ssl_renegotiate( &ssl ) ) != 0 )
{
- if( ret != POLARSSL_ERR_NET_WANT_READ &&
- ret != POLARSSL_ERR_NET_WANT_WRITE )
+ if( ret != MBEDTLS_ERR_NET_WANT_READ &&
+ ret != MBEDTLS_ERR_NET_WANT_WRITE )
{
- polarssl_printf( " failed\n ! ssl_renegotiate returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_ssl_renegotiate returned %d\n\n", ret );
goto exit;
}
}
- polarssl_printf( " ok\n" );
+ mbedtls_printf( " ok\n" );
}
-#endif /* POLARSSL_SSL_RENEGOTIATION */
+#endif /* MBEDTLS_SSL_RENEGOTIATION */
/*
* 6. Write the GET request
*/
retry_left = opt.max_resend;
send_request:
- polarssl_printf( " > Write to server:" );
+ mbedtls_printf( " > Write to server:" );
fflush( stdout );
- len = polarssl_snprintf( (char *) buf, sizeof(buf) - 1, GET_REQUEST,
+ len = mbedtls_snprintf( (char *) buf, sizeof(buf) - 1, GET_REQUEST,
opt.request_page );
tail_len = strlen( GET_REQUEST_END );
@@ -1371,17 +1371,17 @@
if( len >= 1 ) buf[len - 1] = '\n';
}
- if( opt.transport == SSL_TRANSPORT_STREAM )
+ if( opt.transport == MBEDTLS_SSL_TRANSPORT_STREAM )
{
for( written = 0, frags = 0; written < len; written += ret, frags++ )
{
- while( ( ret = ssl_write( &ssl, buf + written, len - written ) )
+ while( ( ret = mbedtls_ssl_write( &ssl, buf + written, len - written ) )
<= 0 )
{
- if( ret != POLARSSL_ERR_NET_WANT_READ &&
- ret != POLARSSL_ERR_NET_WANT_WRITE )
+ if( ret != MBEDTLS_ERR_NET_WANT_READ &&
+ ret != MBEDTLS_ERR_NET_WANT_WRITE )
{
- polarssl_printf( " failed\n ! ssl_write returned -0x%x\n\n", -ret );
+ mbedtls_printf( " failed\n ! mbedtls_ssl_write returned -0x%x\n\n", -ret );
goto exit;
}
}
@@ -1389,13 +1389,13 @@
}
else /* Not stream, so datagram */
{
- do ret = ssl_write( &ssl, buf, len );
- while( ret == POLARSSL_ERR_NET_WANT_READ ||
- ret == POLARSSL_ERR_NET_WANT_WRITE );
+ do ret = mbedtls_ssl_write( &ssl, buf, len );
+ while( ret == MBEDTLS_ERR_NET_WANT_READ ||
+ ret == MBEDTLS_ERR_NET_WANT_WRITE );
if( ret < 0 )
{
- polarssl_printf( " failed\n ! ssl_write returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_ssl_write returned %d\n\n", ret );
goto exit;
}
@@ -1404,53 +1404,53 @@
}
buf[written] = '\0';
- polarssl_printf( " %d bytes written in %d fragments\n\n%s\n", written, frags, (char *) buf );
+ mbedtls_printf( " %d bytes written in %d fragments\n\n%s\n", written, frags, (char *) buf );
/*
* 7. Read the HTTP response
*/
- polarssl_printf( " < Read from server:" );
+ mbedtls_printf( " < Read from server:" );
fflush( stdout );
/*
* TLS and DTLS need different reading styles (stream vs datagram)
*/
- if( opt.transport == SSL_TRANSPORT_STREAM )
+ if( opt.transport == MBEDTLS_SSL_TRANSPORT_STREAM )
{
do
{
len = sizeof( buf ) - 1;
memset( buf, 0, sizeof( buf ) );
- ret = ssl_read( &ssl, buf, len );
+ ret = mbedtls_ssl_read( &ssl, buf, len );
- if( ret == POLARSSL_ERR_NET_WANT_READ ||
- ret == POLARSSL_ERR_NET_WANT_WRITE )
+ if( ret == MBEDTLS_ERR_NET_WANT_READ ||
+ ret == MBEDTLS_ERR_NET_WANT_WRITE )
continue;
if( ret <= 0 )
{
switch( ret )
{
- case POLARSSL_ERR_SSL_PEER_CLOSE_NOTIFY:
- polarssl_printf( " connection was closed gracefully\n" );
+ case MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY:
+ mbedtls_printf( " connection was closed gracefully\n" );
ret = 0;
goto close_notify;
case 0:
- case POLARSSL_ERR_NET_CONN_RESET:
- polarssl_printf( " connection was reset by peer\n" );
+ case MBEDTLS_ERR_NET_CONN_RESET:
+ mbedtls_printf( " connection was reset by peer\n" );
ret = 0;
goto reconnect;
default:
- polarssl_printf( " ssl_read returned -0x%x\n", -ret );
+ mbedtls_printf( " mbedtls_ssl_read returned -0x%x\n", -ret );
goto exit;
}
}
len = ret;
buf[len] = '\0';
- polarssl_printf( " %d bytes read\n\n%s", len, (char *) buf );
+ mbedtls_printf( " %d bytes read\n\n%s", len, (char *) buf );
/* End of message should be detected according to the syntax of the
* application protocol (eg HTTP), just use a dummy test here. */
@@ -1467,34 +1467,34 @@
len = sizeof( buf ) - 1;
memset( buf, 0, sizeof( buf ) );
- do ret = ssl_read( &ssl, buf, len );
- while( ret == POLARSSL_ERR_NET_WANT_READ ||
- ret == POLARSSL_ERR_NET_WANT_WRITE );
+ do ret = mbedtls_ssl_read( &ssl, buf, len );
+ while( ret == MBEDTLS_ERR_NET_WANT_READ ||
+ ret == MBEDTLS_ERR_NET_WANT_WRITE );
if( ret <= 0 )
{
switch( ret )
{
- case POLARSSL_ERR_NET_TIMEOUT:
- polarssl_printf( " timeout\n" );
+ case MBEDTLS_ERR_NET_TIMEOUT:
+ mbedtls_printf( " timeout\n" );
if( retry_left-- > 0 )
goto send_request;
goto exit;
- case POLARSSL_ERR_SSL_PEER_CLOSE_NOTIFY:
- polarssl_printf( " connection was closed gracefully\n" );
+ case MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY:
+ mbedtls_printf( " connection was closed gracefully\n" );
ret = 0;
goto close_notify;
default:
- polarssl_printf( " ssl_read returned -0x%x\n", -ret );
+ mbedtls_printf( " mbedtls_ssl_read returned -0x%x\n", -ret );
goto exit;
}
}
len = ret;
buf[len] = '\0';
- polarssl_printf( " %d bytes read\n\n%s", len, (char *) buf );
+ mbedtls_printf( " %d bytes read\n\n%s", len, (char *) buf );
ret = 0;
}
@@ -1508,14 +1508,14 @@
* 8. Done, cleanly close the connection
*/
close_notify:
- polarssl_printf( " . Closing the connection..." );
+ mbedtls_printf( " . Closing the connection..." );
/* No error checking, the connection might be closed already */
- do ret = ssl_close_notify( &ssl );
- while( ret == POLARSSL_ERR_NET_WANT_WRITE );
+ do ret = mbedtls_ssl_close_notify( &ssl );
+ while( ret == MBEDTLS_ERR_NET_WANT_WRITE );
ret = 0;
- polarssl_printf( " done\n" );
+ mbedtls_printf( " done\n" );
/*
* 9. Reconnect?
@@ -1525,58 +1525,58 @@
{
--opt.reconnect;
- net_close( server_fd );
+ mbedtls_net_close( server_fd );
-#if defined(POLARSSL_TIMING_C)
+#if defined(MBEDTLS_TIMING_C)
if( opt.reco_delay > 0 )
- m_sleep( 1000 * opt.reco_delay );
+ mbedtls_timing_m_sleep( 1000 * opt.reco_delay );
#endif
- polarssl_printf( " . Reconnecting with saved session..." );
+ mbedtls_printf( " . Reconnecting with saved session..." );
fflush( stdout );
- if( ( ret = ssl_session_reset( &ssl ) ) != 0 )
+ if( ( ret = mbedtls_ssl_session_reset( &ssl ) ) != 0 )
{
- polarssl_printf( " failed\n ! ssl_session_reset returned -0x%x\n\n", -ret );
+ mbedtls_printf( " failed\n ! mbedtls_ssl_session_reset returned -0x%x\n\n", -ret );
goto exit;
}
- if( ( ret = ssl_set_session( &ssl, &saved_session ) ) != 0 )
+ if( ( ret = mbedtls_ssl_set_session( &ssl, &saved_session ) ) != 0 )
{
- polarssl_printf( " failed\n ! ssl_set_session returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_ssl_set_session returned %d\n\n", ret );
goto exit;
}
- if( ( ret = net_connect( &server_fd, opt.server_addr, opt.server_port,
- opt.transport == SSL_TRANSPORT_STREAM ?
- NET_PROTO_TCP : NET_PROTO_UDP ) ) != 0 )
+ if( ( ret = mbedtls_net_connect( &server_fd, opt.server_addr, opt.server_port,
+ opt.transport == MBEDTLS_SSL_TRANSPORT_STREAM ?
+ MBEDTLS_NET_PROTO_TCP : MBEDTLS_NET_PROTO_UDP ) ) != 0 )
{
- polarssl_printf( " failed\n ! net_connect returned -0x%x\n\n", -ret );
+ mbedtls_printf( " failed\n ! mbedtls_net_connect returned -0x%x\n\n", -ret );
goto exit;
}
if( opt.nbio > 0 )
- ret = net_set_nonblock( server_fd );
+ ret = mbedtls_net_set_nonblock( server_fd );
else
- ret = net_set_block( server_fd );
+ ret = mbedtls_net_set_block( server_fd );
if( ret != 0 )
{
- polarssl_printf( " failed\n ! net_set_(non)block() returned -0x%x\n\n",
+ mbedtls_printf( " failed\n ! net_set_(non)block() returned -0x%x\n\n",
-ret );
goto exit;
}
- while( ( ret = ssl_handshake( &ssl ) ) != 0 )
+ while( ( ret = mbedtls_ssl_handshake( &ssl ) ) != 0 )
{
- if( ret != POLARSSL_ERR_NET_WANT_READ &&
- ret != POLARSSL_ERR_NET_WANT_WRITE )
+ if( ret != MBEDTLS_ERR_NET_WANT_READ &&
+ ret != MBEDTLS_ERR_NET_WANT_WRITE )
{
- polarssl_printf( " failed\n ! ssl_handshake returned -0x%x\n\n", -ret );
+ mbedtls_printf( " failed\n ! mbedtls_ssl_handshake returned -0x%x\n\n", -ret );
goto exit;
}
}
- polarssl_printf( " ok\n" );
+ mbedtls_printf( " ok\n" );
goto send_request;
}
@@ -1585,30 +1585,30 @@
* Cleanup and exit
*/
exit:
-#ifdef POLARSSL_ERROR_C
+#ifdef MBEDTLS_ERROR_C
if( ret != 0 )
{
char error_buf[100];
- polarssl_strerror( ret, error_buf, 100 );
- polarssl_printf("Last error was: -0x%X - %s\n\n", -ret, error_buf );
+ mbedtls_strerror( ret, error_buf, 100 );
+ mbedtls_printf("Last error was: -0x%X - %s\n\n", -ret, error_buf );
}
#endif
if( server_fd )
- net_close( server_fd );
+ mbedtls_net_close( server_fd );
-#if defined(POLARSSL_X509_CRT_PARSE_C)
- x509_crt_free( &clicert );
- x509_crt_free( &cacert );
- pk_free( &pkey );
+#if defined(MBEDTLS_X509_CRT_PARSE_C)
+ mbedtls_x509_crt_free( &clicert );
+ mbedtls_x509_crt_free( &cacert );
+ mbedtls_pk_free( &pkey );
#endif
- ssl_session_free( &saved_session );
- ssl_free( &ssl );
- ctr_drbg_free( &ctr_drbg );
- entropy_free( &entropy );
+ mbedtls_ssl_session_free( &saved_session );
+ mbedtls_ssl_free( &ssl );
+ mbedtls_ctr_drbg_free( &ctr_drbg );
+ mbedtls_entropy_free( &entropy );
#if defined(_WIN32)
- polarssl_printf( " + Press Enter to exit this program.\n" );
+ mbedtls_printf( " + Press Enter to exit this program.\n" );
fflush( stdout ); getchar();
#endif
@@ -1618,6 +1618,6 @@
return( ret );
}
-#endif /* POLARSSL_BIGNUM_C && POLARSSL_ENTROPY_C && POLARSSL_SSL_TLS_C &&
- POLARSSL_SSL_CLI_C && POLARSSL_NET_C && POLARSSL_RSA_C &&
- POLARSSL_CTR_DRBG_C */
+#endif /* MBEDTLS_BIGNUM_C && MBEDTLS_ENTROPY_C && MBEDTLS_SSL_TLS_C &&
+ MBEDTLS_SSL_CLI_C && MBEDTLS_NET_C && MBEDTLS_RSA_C &&
+ MBEDTLS_CTR_DRBG_C */