The Great Renaming
A simple execution of tmp/invoke-rename.pl
diff --git a/programs/ssl/dtls_client.c b/programs/ssl/dtls_client.c
index f9bf800..689c533 100644
--- a/programs/ssl/dtls_client.c
+++ b/programs/ssl/dtls_client.c
@@ -20,36 +20,36 @@
* 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 mbedtls_printf printf
+#define mbedtls_fprintf fprintf
#endif
-#if !defined(POLARSSL_SSL_CLI_C) || !defined(POLARSSL_SSL_PROTO_DTLS) || \
- !defined(POLARSSL_NET_C) || \
- !defined(POLARSSL_ENTROPY_C) || !defined(POLARSSL_CTR_DRBG_C) || \
- !defined(POLARSSL_X509_CRT_PARSE_C) || !defined(POLARSSL_RSA_C) || \
- !defined(POLARSSL_CERTS_C)
+#if !defined(MBEDTLS_SSL_CLI_C) || !defined(MBEDTLS_SSL_PROTO_DTLS) || \
+ !defined(MBEDTLS_NET_C) || \
+ !defined(MBEDTLS_ENTROPY_C) || !defined(MBEDTLS_CTR_DRBG_C) || \
+ !defined(MBEDTLS_X509_CRT_PARSE_C) || !defined(MBEDTLS_RSA_C) || \
+ !defined(MBEDTLS_CERTS_C)
int main( int argc, char *argv[] )
{
((void) argc);
((void) argv);
- polarssl_printf( "POLARSSL_SSL_CLI_C and/or POLARSSL_SSL_PROTO_DTLS and/or "
- "POLARSSL_NET_C and/or "
- "POLARSSL_ENTROPY_C and/or POLARSSL_CTR_DRBG_C and/or "
- "POLARSSL_X509_CRT_PARSE_C and/or POLARSSL_RSA_C and/or "
- "POLARSSL_CERTS_C and/or POLARSSL_PEM_PARSE_C not defined.\n" );
+ mbedtls_printf( "MBEDTLS_SSL_CLI_C and/or MBEDTLS_SSL_PROTO_DTLS and/or "
+ "MBEDTLS_NET_C and/or "
+ "MBEDTLS_ENTROPY_C and/or MBEDTLS_CTR_DRBG_C and/or "
+ "MBEDTLS_X509_CRT_PARSE_C and/or MBEDTLS_RSA_C and/or "
+ "MBEDTLS_CERTS_C and/or MBEDTLS_PEM_PARSE_C not defined.\n" );
return( 0 );
}
#else
@@ -78,7 +78,7 @@
{
((void) level);
- polarssl_fprintf( (FILE *) ctx, "%s", str );
+ mbedtls_fprintf( (FILE *) ctx, "%s", str );
fflush( (FILE *) ctx );
}
@@ -89,243 +89,243 @@
const char *pers = "dtls_client";
int retry_left = MAX_RETRY;
- entropy_context entropy;
- ctr_drbg_context ctr_drbg;
- ssl_context ssl;
- x509_crt cacert;
+ mbedtls_entropy_context entropy;
+ mbedtls_ctr_drbg_context ctr_drbg;
+ mbedtls_ssl_context ssl;
+ mbedtls_x509_crt cacert;
((void) argc);
((void) argv);
-#if defined(POLARSSL_DEBUG_C)
- debug_set_threshold( DEBUG_LEVEL );
+#if defined(MBEDTLS_DEBUG_C)
+ mbedtls_debug_set_threshold( DEBUG_LEVEL );
#endif
/*
* 0. Initialize the RNG and the session data
*/
- memset( &ssl, 0, sizeof( ssl_context ) );
- x509_crt_init( &cacert );
+ memset( &ssl, 0, sizeof( mbedtls_ssl_context ) );
+ mbedtls_x509_crt_init( &cacert );
- 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 %d\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_ctr_drbg_init returned %d\n", ret );
goto exit;
}
- polarssl_printf( " ok\n" );
+ mbedtls_printf( " ok\n" );
/*
* 0. Initialize certificates
*/
- polarssl_printf( " . Loading the CA root certificate ..." );
+ mbedtls_printf( " . Loading the CA root certificate ..." );
fflush( stdout );
- ret = x509_crt_parse( &cacert, (const unsigned char *) test_cas_pem,
- test_cas_pem_len );
+ ret = mbedtls_x509_crt_parse( &cacert, (const unsigned char *) mbedtls_test_cas_pem,
+ mbedtls_test_cas_pem_len );
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. Start the connection
*/
- polarssl_printf( " . Connecting to udp/%s/%4d...", SERVER_NAME,
+ mbedtls_printf( " . Connecting to udp/%s/%4d...", SERVER_NAME,
SERVER_PORT );
fflush( stdout );
- if( ( ret = net_connect( &server_fd, SERVER_ADDR,
- SERVER_PORT, NET_PROTO_UDP ) ) != 0 )
+ if( ( ret = mbedtls_net_connect( &server_fd, SERVER_ADDR,
+ SERVER_PORT, MBEDTLS_NET_PROTO_UDP ) ) != 0 )
{
- polarssl_printf( " failed\n ! net_connect returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_net_connect returned %d\n\n", ret );
goto exit;
}
- polarssl_printf( " ok\n" );
+ mbedtls_printf( " ok\n" );
/*
* 2. Setup stuff
*/
- polarssl_printf( " . Setting up the DTLS structure..." );
+ mbedtls_printf( " . Setting up the DTLS structure..." );
fflush( stdout );
- if( ( ret = ssl_init( &ssl ) ) != 0 )
+ if( ( ret = mbedtls_ssl_init( &ssl ) ) != 0 )
{
- polarssl_printf( " failed\n ! ssl_init returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_ssl_init returned %d\n\n", ret );
goto exit;
}
- polarssl_printf( " ok\n" );
+ mbedtls_printf( " ok\n" );
- ssl_set_endpoint( &ssl, SSL_IS_CLIENT );
- ssl_set_transport( &ssl, SSL_TRANSPORT_DATAGRAM );
+ mbedtls_ssl_set_endpoint( &ssl, MBEDTLS_SSL_IS_CLIENT );
+ mbedtls_ssl_set_transport( &ssl, MBEDTLS_SSL_TRANSPORT_DATAGRAM );
/* OPTIONAL is usually a bad choice for security, but makes interop easier
* in this simplified example, in which the ca chain is hardcoded.
* Production code should set a proper ca chain and use REQUIRED. */
- ssl_set_authmode( &ssl, SSL_VERIFY_OPTIONAL );
- ssl_set_ca_chain( &ssl, &cacert, NULL, SERVER_NAME );
+ mbedtls_ssl_set_authmode( &ssl, MBEDTLS_SSL_VERIFY_OPTIONAL );
+ mbedtls_ssl_set_ca_chain( &ssl, &cacert, NULL, SERVER_NAME );
- 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 );
- ssl_set_bio_timeout( &ssl, &server_fd,
- net_send, net_recv, net_recv_timeout,
+ mbedtls_ssl_set_bio_timeout( &ssl, &server_fd,
+ mbedtls_net_send, mbedtls_net_recv, mbedtls_net_recv_timeout,
READ_TIMEOUT_MS );
/*
* 4. Handshake
*/
- polarssl_printf( " . Performing the SSL/TLS handshake..." );
+ mbedtls_printf( " . Performing the SSL/TLS handshake..." );
fflush( stdout );
- do ret = ssl_handshake( &ssl );
- while( ret == POLARSSL_ERR_NET_WANT_READ ||
- ret == POLARSSL_ERR_NET_WANT_WRITE );
+ do ret = mbedtls_ssl_handshake( &ssl );
+ while( ret == MBEDTLS_ERR_NET_WANT_READ ||
+ ret == MBEDTLS_ERR_NET_WANT_WRITE );
if( ret != 0 )
{
- 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" );
/*
* 5. Verify the server certificate
*/
- polarssl_printf( " . Verifying peer X.509 certificate..." );
+ mbedtls_printf( " . Verifying peer X.509 certificate..." );
- /* In real life, we would have used SSL_VERIFY_REQUIRED so that the
+ /* In real life, we would have used MBEDTLS_SSL_VERIFY_REQUIRED so that the
* handshake would not succeed if the peer's cert is bad. Even if we used
- * SSL_VERIFY_OPTIONAL, we would bail out here if ret != 0 */
- if( ( ret = ssl_get_verify_result( &ssl ) ) != 0 )
+ * MBEDTLS_SSL_VERIFY_OPTIONAL, we would bail out here if ret != 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", SERVER_NAME );
+ if( ( ret & MBEDTLS_X509_BADCERT_CN_MISMATCH ) != 0 )
+ mbedtls_printf( " ! CN mismatch (expected CN=%s)\n", 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" );
/*
* 6. Write the echo request
*/
send_request:
- polarssl_printf( " > Write to server:" );
+ mbedtls_printf( " > Write to server:" );
fflush( stdout );
len = sizeof( MESSAGE ) - 1;
- do ret = ssl_write( &ssl, (unsigned char *) MESSAGE, len );
- while( ret == POLARSSL_ERR_NET_WANT_READ ||
- ret == POLARSSL_ERR_NET_WANT_WRITE );
+ do ret = mbedtls_ssl_write( &ssl, (unsigned char *) MESSAGE, 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;
}
len = ret;
- polarssl_printf( " %d bytes written\n\n%s\n\n", len, MESSAGE );
+ mbedtls_printf( " %d bytes written\n\n%s\n\n", len, MESSAGE );
/*
* 7. Read the echo response
*/
- polarssl_printf( " < Read from server:" );
+ mbedtls_printf( " < Read from server:" );
fflush( stdout );
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\n" );
+ case MBEDTLS_ERR_NET_TIMEOUT:
+ mbedtls_printf( " timeout\n\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\n", -ret );
+ mbedtls_printf( " mbedtls_ssl_read returned -0x%x\n\n", -ret );
goto exit;
}
}
len = ret;
- polarssl_printf( " %d bytes read\n\n%s\n\n", len, buf );
+ mbedtls_printf( " %d bytes read\n\n%s\n\n", len, buf );
/*
* 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. Final clean-ups 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: %d - %s\n\n", ret, error_buf );
+ mbedtls_strerror( ret, error_buf, 100 );
+ mbedtls_printf( "Last error was: %d - %s\n\n", ret, error_buf );
}
#endif
if( server_fd != -1 )
- net_close( server_fd );
+ mbedtls_net_close( server_fd );
- x509_crt_free( &cacert );
- ssl_free( &ssl );
- ctr_drbg_free( &ctr_drbg );
- entropy_free( &entropy );
+ mbedtls_x509_crt_free( &cacert );
+ 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
@@ -335,7 +335,7 @@
return( ret );
}
-#endif /* POLARSSL_SSL_CLI_C && POLARSSL_SSL_PROTO_DTLS && POLARSSL_NET_C &&
- POLARSSL_ENTROPY_C && POLARSSL_CTR_DRBG_C &&
- POLARSSL_X509_CRT_PARSE_C && POLARSSL_RSA_C && POLARSSL_CERTS_C &&
- POLARSSL_PEM_PARSE_C */
+#endif /* MBEDTLS_SSL_CLI_C && MBEDTLS_SSL_PROTO_DTLS && MBEDTLS_NET_C &&
+ MBEDTLS_ENTROPY_C && MBEDTLS_CTR_DRBG_C &&
+ MBEDTLS_X509_CRT_PARSE_C && MBEDTLS_RSA_C && MBEDTLS_CERTS_C &&
+ MBEDTLS_PEM_PARSE_C */