Merge branch 'development' into dtls
* development: (46 commits)
Fix url again
Fix small bug in base64_encode()
Fix depend that was checked but not documented
Fix dependency that was not checked
Minor gitginore fixes
Move some ignore patterns to subdirectories
Ignore CMake/MSVC-related build files.
Re-categorize changelog entry
Fix misattribution
Minor nits with stdout/stderr.
Add cmake compatibility targets
Add script for polarssl symlink creation
Fix more stdio inclusion issues
Add debug info for cert/suite selection
Fix possible portability issue
Fix bug in ssl_get_verify_result()
aescrypt2.c local char array not initial
Update Changelog
Fix mips64 bignum implementation
Fix usage string of ssl_client2
...
Conflicts:
include/polarssl/ssl.h
library/CMakeLists.txt
library/Makefile
programs/Makefile
programs/ssl/ssl_client2.c
programs/ssl/ssl_server2.c
visualc/VS2010/PolarSSL.sln
visualc/VS2010/mbedTLS.vcxproj
visualc/VS6/mbedtls.dsp
visualc/VS6/mbedtls.dsw
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index bd01c1b..f4f92b1 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of mbed TLS (https://www.polarssl.org)
+ * This file is part of mbed TLS (https://polarssl.org)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -26,6 +26,15 @@
#include POLARSSL_CONFIG_FILE
#endif
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#define polarssl_fprintf fprintf
+#define polarssl_malloc malloc
+#define polarssl_free free
+#endif
+
#if !defined(POLARSSL_ENTROPY_C) || \
!defined(POLARSSL_SSL_TLS_C) || !defined(POLARSSL_SSL_SRV_C) || \
!defined(POLARSSL_NET_C) || !defined(POLARSSL_CTR_DRBG_C)
@@ -35,7 +44,7 @@
((void) argc);
((void) argv);
- printf("POLARSSL_ENTROPY_C and/or "
+ polarssl_printf("POLARSSL_ENTROPY_C and/or "
"POLARSSL_SSL_TLS_C and/or POLARSSL_SSL_SRV_C and/or "
"POLARSSL_NET_C and/or POLARSSL_CTR_DRBG_C not defined.\n");
return( 0 );
@@ -46,13 +55,6 @@
#define POLARSSL_SNI
#endif
-#if defined(POLARSSL_PLATFORM_C)
-#include "polarssl/platform.h"
-#else
-#define polarssl_malloc malloc
-#define polarssl_free free
-#endif
-
#if defined(_WIN32)
#include <windows.h>
#endif
@@ -83,7 +85,7 @@
#endif
#if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C)
-#include "polarssl/memory.h"
+#include "polarssl/memory_buffer_alloc.h"
#endif
#define DFL_SERVER_ADDR NULL
@@ -207,7 +209,7 @@
{
((void) level);
- fprintf( (FILE *) ctx, "%s", str );
+ polarssl_fprintf( (FILE *) ctx, "%s", str );
fflush( (FILE *) ctx );
}
@@ -773,19 +775,19 @@
if( ret == 0 )
ret = 1;
- printf( USAGE );
+ polarssl_printf( USAGE );
list = ssl_list_ciphersuites();
while( *list )
{
- printf(" %-42s", ssl_get_ciphersuite_name( *list ) );
+ polarssl_printf(" %-42s", ssl_get_ciphersuite_name( *list ) );
list++;
if( !*list )
break;
- printf(" %s\n", ssl_get_ciphersuite_name( *list ) );
+ polarssl_printf(" %s\n", ssl_get_ciphersuite_name( *list ) );
list++;
}
- printf("\n");
+ polarssl_printf("\n");
goto exit;
}
@@ -1145,14 +1147,14 @@
if( opt.max_version != -1 &&
ciphersuite_info->min_minor_ver > opt.max_version )
{
- printf("forced ciphersuite not allowed with this protocol version\n");
+ polarssl_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 )
{
- printf("forced ciphersuite not allowed with this protocol version\n");
+ polarssl_printf("forced ciphersuite not allowed with this protocol version\n");
ret = 2;
goto usage;
}
@@ -1194,7 +1196,7 @@
if( i != 4 )
{
- printf( "too few values for version_suites\n" );
+ polarssl_printf( "too few values for version_suites\n" );
ret = 1;
goto exit;
}
@@ -1208,7 +1210,7 @@
if( version_suites[i][0] == 0 )
{
- printf( "unknown ciphersuite: '%s'\n", name[i] );
+ polarssl_printf( "unknown ciphersuite: '%s'\n", name[i] );
ret = 2;
goto usage;
}
@@ -1221,7 +1223,7 @@
*/
if( unhexify( psk, opt.psk, &psk_len ) != 0 )
{
- printf( "pre-shared key not valid hex\n" );
+ polarssl_printf( "pre-shared key not valid hex\n" );
goto exit;
}
@@ -1229,7 +1231,7 @@
{
if( ( psk_info = psk_parse( opt.psk_list ) ) == NULL )
{
- printf( "psk_list invalid" );
+ polarssl_printf( "psk_list invalid" );
goto exit;
}
}
@@ -1258,7 +1260,7 @@
/*
* 0. Initialize the RNG and the session data
*/
- printf( "\n . Seeding the random number generator..." );
+ polarssl_printf( "\n . Seeding the random number generator..." );
fflush( stdout );
entropy_init( &entropy );
@@ -1266,17 +1268,17 @@
(const unsigned char *) pers,
strlen( pers ) ) ) != 0 )
{
- printf( " failed\n ! ctr_drbg_init returned -0x%x\n", -ret );
+ polarssl_printf( " failed\n ! ctr_drbg_init returned -0x%x\n", -ret );
goto exit;
}
- printf( " ok\n" );
+ polarssl_printf( " ok\n" );
#if defined(POLARSSL_X509_CRT_PARSE_C)
/*
* 1.1. Load the trusted CA
*/
- printf( " . Loading the CA root certificate ..." );
+ polarssl_printf( " . Loading the CA root certificate ..." );
fflush( stdout );
#if defined(POLARSSL_FS_IO)
@@ -1298,21 +1300,21 @@
#else
{
ret = 1;
- printf("POLARSSL_CERTS_C not defined.");
+ polarssl_printf("POLARSSL_CERTS_C not defined.");
}
#endif
if( ret < 0 )
{
- printf( " failed\n ! x509_crt_parse returned -0x%x\n\n", -ret );
+ polarssl_printf( " failed\n ! x509_crt_parse returned -0x%x\n\n", -ret );
goto exit;
}
- printf( " ok (%d skipped)\n", ret );
+ polarssl_printf( " ok (%d skipped)\n", ret );
/*
* 1.2. Load own certificate and private key
*/
- printf( " . Loading the server cert. and key..." );
+ polarssl_printf( " . Loading the server cert. and key..." );
fflush( stdout );
#if defined(POLARSSL_FS_IO)
@@ -1321,7 +1323,7 @@
key_cert_init++;
if( ( ret = x509_crt_parse_file( &srvcert, opt.crt_file ) ) != 0 )
{
- printf( " failed\n ! x509_crt_parse_file returned -0x%x\n\n",
+ polarssl_printf( " failed\n ! x509_crt_parse_file returned -0x%x\n\n",
-ret );
goto exit;
}
@@ -1331,13 +1333,13 @@
key_cert_init++;
if( ( ret = pk_parse_keyfile( &pkey, opt.key_file, "" ) ) != 0 )
{
- printf( " failed\n ! pk_parse_keyfile returned -0x%x\n\n", -ret );
+ polarssl_printf( " failed\n ! pk_parse_keyfile returned -0x%x\n\n", -ret );
goto exit;
}
}
if( key_cert_init == 1 )
{
- printf( " failed\n ! crt_file without key_file or vice-versa\n\n" );
+ polarssl_printf( " failed\n ! crt_file without key_file or vice-versa\n\n" );
goto exit;
}
@@ -1346,7 +1348,7 @@
key_cert_init2++;
if( ( ret = x509_crt_parse_file( &srvcert2, opt.crt_file2 ) ) != 0 )
{
- printf( " failed\n ! x509_crt_parse_file(2) returned -0x%x\n\n",
+ polarssl_printf( " failed\n ! x509_crt_parse_file(2) returned -0x%x\n\n",
-ret );
goto exit;
}
@@ -1356,14 +1358,14 @@
key_cert_init2++;
if( ( ret = pk_parse_keyfile( &pkey2, opt.key_file2, "" ) ) != 0 )
{
- printf( " failed\n ! pk_parse_keyfile(2) returned -0x%x\n\n",
+ polarssl_printf( " failed\n ! pk_parse_keyfile(2) returned -0x%x\n\n",
-ret );
goto exit;
}
}
if( key_cert_init2 == 1 )
{
- printf( " failed\n ! crt_file2 without key_file2 or vice-versa\n\n" );
+ polarssl_printf( " failed\n ! crt_file2 without key_file2 or vice-versa\n\n" );
goto exit;
}
#endif
@@ -1375,7 +1377,7 @@
strcmp( opt.key_file2, "none" ) != 0 )
{
#if !defined(POLARSSL_CERTS_C)
- printf( "Not certificated or key provided, and \n"
+ polarssl_printf( "Not certificated or key provided, and \n"
"POLARSSL_CERTS_C not defined!\n" );
goto exit;
#else
@@ -1384,14 +1386,14 @@
(const unsigned char *) test_srv_crt_rsa,
strlen( test_srv_crt_rsa ) ) ) != 0 )
{
- printf( " failed\n ! x509_crt_parse returned -0x%x\n\n", -ret );
+ polarssl_printf( " failed\n ! x509_crt_parse returned -0x%x\n\n", -ret );
goto exit;
}
if( ( ret = pk_parse_key( &pkey,
(const unsigned char *) test_srv_key_rsa,
strlen( test_srv_key_rsa ), NULL, 0 ) ) != 0 )
{
- printf( " failed\n ! pk_parse_key returned -0x%x\n\n", -ret );
+ polarssl_printf( " failed\n ! pk_parse_key returned -0x%x\n\n", -ret );
goto exit;
}
key_cert_init = 2;
@@ -1401,14 +1403,14 @@
(const unsigned char *) test_srv_crt_ec,
strlen( test_srv_crt_ec ) ) ) != 0 )
{
- printf( " failed\n ! x509_crt_parse2 returned -0x%x\n\n", -ret );
+ polarssl_printf( " failed\n ! x509_crt_parse2 returned -0x%x\n\n", -ret );
goto exit;
}
if( ( ret = pk_parse_key( &pkey2,
(const unsigned char *) test_srv_key_ec,
strlen( test_srv_key_ec ), NULL, 0 ) ) != 0 )
{
- printf( " failed\n ! pk_parse_key2 returned -0x%x\n\n", -ret );
+ polarssl_printf( " failed\n ! pk_parse_key2 returned -0x%x\n\n", -ret );
goto exit;
}
key_cert_init2 = 2;
@@ -1416,46 +1418,46 @@
#endif /* POLARSSL_CERTS_C */
}
- printf( " ok\n" );
+ polarssl_printf( " ok\n" );
#endif /* POLARSSL_X509_CRT_PARSE_C */
#if defined(POLARSSL_DHM_C) && defined(POLARSSL_FS_IO)
if( opt.dhm_file != NULL )
{
- printf( " . Loading DHM parameters..." );
+ polarssl_printf( " . Loading DHM parameters..." );
fflush( stdout );
if( ( ret = dhm_parse_dhmfile( &dhm, opt.dhm_file ) ) != 0 )
{
- printf( " failed\n ! dhm_parse_dhmfile returned -0x%04X\n\n",
+ polarssl_printf( " failed\n ! dhm_parse_dhmfile returned -0x%04X\n\n",
-ret );
goto exit;
}
- printf( " ok\n" );
+ polarssl_printf( " ok\n" );
}
#endif
#if defined(POLARSSL_SNI)
if( opt.sni != NULL )
{
- printf( " . Setting up SNI information..." );
+ polarssl_printf( " . Setting up SNI information..." );
fflush( stdout );
if( ( sni_info = sni_parse( opt.sni ) ) == NULL )
{
- printf( " failed\n" );
+ polarssl_printf( " failed\n" );
goto exit;
}
- printf( " ok\n" );
+ polarssl_printf( " ok\n" );
}
#endif /* POLARSSL_SNI */
/*
* 2. Setup the listening TCP socket
*/
- printf( " . Bind on %s://%s:%-4d/ ...",
+ polarssl_printf( " . Bind on %s://%s:%-4d/ ...",
opt.transport == SSL_TRANSPORT_STREAM ? "tcp" : "udp",
opt.server_addr ? opt.server_addr : "*",
opt.server_port );
@@ -1465,21 +1467,21 @@
opt.transport == SSL_TRANSPORT_STREAM ?
NET_PROTO_TCP : NET_PROTO_UDP ) ) != 0 )
{
- printf( " failed\n ! net_bind returned -0x%x\n\n", -ret );
+ polarssl_printf( " failed\n ! net_bind returned -0x%x\n\n", -ret );
goto exit;
}
- printf( " ok\n" );
+ polarssl_printf( " ok\n" );
/*
* 3. Setup stuff
*/
- printf( " . Setting up the SSL/TLS structure..." );
+ polarssl_printf( " . Setting up the SSL/TLS structure..." );
fflush( stdout );
if( ( ret = ssl_init( &ssl ) ) != 0 )
{
- printf( " failed\n ! ssl_init returned -0x%x\n\n", -ret );
+ polarssl_printf( " failed\n ! ssl_init returned -0x%x\n\n", -ret );
goto exit;
}
@@ -1500,7 +1502,7 @@
#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
if( ( ret = ssl_set_max_frag_len( &ssl, opt.mfl_code ) ) != 0 )
{
- printf( " failed\n ! ssl_set_max_frag_len returned %d\n\n", ret );
+ polarssl_printf( " failed\n ! ssl_set_max_frag_len returned %d\n\n", ret );
goto exit;
};
#endif
@@ -1524,7 +1526,7 @@
if( opt.alpn_string != NULL )
if( ( ret = ssl_set_alpn_protocols( &ssl, alpn_list ) ) != 0 )
{
- printf( " failed\n ! ssl_set_alpn_protocols returned %d\n\n", ret );
+ polarssl_printf( " failed\n ! ssl_set_alpn_protocols returned %d\n\n", ret );
goto exit;
}
#endif
@@ -1546,7 +1548,7 @@
#if defined(POLARSSL_SSL_SESSION_TICKETS)
if( ( ret = ssl_set_session_tickets( &ssl, opt.tickets ) ) != 0 )
{
- printf( " failed\n ! ssl_set_session_tickets returned %d\n\n", ret );
+ polarssl_printf( " failed\n ! ssl_set_session_tickets returned %d\n\n", ret );
goto exit;
}
@@ -1640,13 +1642,13 @@
if( key_cert_init )
if( ( ret = ssl_set_own_cert( &ssl, &srvcert, &pkey ) ) != 0 )
{
- printf( " failed\n ! ssl_set_own_cert returned %d\n\n", ret );
+ polarssl_printf( " failed\n ! ssl_set_own_cert returned %d\n\n", ret );
goto exit;
}
if( key_cert_init2 )
if( ( ret = ssl_set_own_cert( &ssl, &srvcert2, &pkey2 ) ) != 0 )
{
- printf( " failed\n ! ssl_set_own_cert returned %d\n\n", ret );
+ polarssl_printf( " failed\n ! ssl_set_own_cert returned %d\n\n", ret );
goto exit;
}
#endif
@@ -1664,7 +1666,7 @@
strlen( opt.psk_identity ) );
if( ret != 0 )
{
- printf( " failed\n ssl_set_psk returned -0x%04X\n\n", - ret );
+ polarssl_printf( " failed\n ssl_set_psk returned -0x%04X\n\n", - ret );
goto exit;
}
}
@@ -1687,7 +1689,7 @@
if( ret != 0 )
{
- printf( " failed\n ssl_set_dh_param returned -0x%04X\n\n", - ret );
+ polarssl_printf( " failed\n ssl_set_dh_param returned -0x%04X\n\n", - ret );
goto exit;
}
#endif
@@ -1712,7 +1714,7 @@
}
}
- printf( " ok\n" );
+ polarssl_printf( " ok\n" );
reset:
#if !defined(_WIN32)
@@ -1729,7 +1731,7 @@
{
char error_buf[100];
polarssl_strerror( ret, error_buf, 100 );
- printf("Last error was: %d - %s\n\n", ret, error_buf );
+ polarssl_printf("Last error was: %d - %s\n\n", ret, error_buf );
}
#endif
@@ -1743,7 +1745,7 @@
*/
client_fd = -1;
- printf( " . Waiting for a remote connection ..." );
+ polarssl_printf( " . Waiting for a remote connection ..." );
fflush( stdout );
if( ( ret = net_accept( listen_fd, &client_fd, client_ip ) ) != 0 )
@@ -1751,13 +1753,13 @@
#if !defined(_WIN32)
if( received_sigterm )
{
- printf( " interrupted by signal\n" );
+ polarssl_printf( " interrupted by signal\n" );
ret = 0;
goto exit;
}
#endif
- printf( " failed\n ! net_accept returned -0x%x\n\n", -ret );
+ polarssl_printf( " failed\n ! net_accept returned -0x%x\n\n", -ret );
goto exit;
}
@@ -1767,7 +1769,7 @@
ret = net_set_block( client_fd );
if( ret != 0 )
{
- printf( " failed\n ! net_set_(non)block() returned -0x%x\n\n", -ret );
+ polarssl_printf( " failed\n ! net_set_(non)block() returned -0x%x\n\n", -ret );
goto exit;
}
@@ -1795,7 +1797,7 @@
}
#endif /* POLARSSL_SSL_DTLS_HELLO_VERIFY */
- printf( " ok\n" );
+ polarssl_printf( " ok\n" );
/*
* With UDP, bind_fd is hijacked by client_fd, so bind a new one
@@ -1822,7 +1824,7 @@
/*
* 4. Handshake
*/
- printf( " . Performing the SSL/TLS handshake..." );
+ polarssl_printf( " . Performing the SSL/TLS handshake..." );
fflush( stdout );
do ret = ssl_handshake( &ssl );
@@ -1831,31 +1833,31 @@
if( ret == POLARSSL_ERR_SSL_HELLO_VERIFY_REQUIRED )
{
- printf( " hello verification requested\n" );
+ polarssl_printf( " hello verification requested\n" );
ret = 0;
goto reset;
}
else if( ret != 0 )
{
- printf( " failed\n ! ssl_handshake returned -0x%x\n\n", -ret );
+ polarssl_printf( " failed\n ! ssl_handshake returned -0x%x\n\n", -ret );
goto reset;
}
else /* ret == 0 */
{
- printf( " ok\n [ Protocol is %s ]\n [ Ciphersuite is %s ]\n",
+ polarssl_printf( " ok\n [ Protocol is %s ]\n [ Ciphersuite is %s ]\n",
ssl_get_version( &ssl ), ssl_get_ciphersuite( &ssl ) );
}
if( ( ret = ssl_get_record_expansion( &ssl ) ) >= 0 )
- printf( " [ Record expansion is %d ]\n", ret );
+ polarssl_printf( " [ Record expansion is %d ]\n", ret );
else
- printf( " [ Record expansion is unknown (compression) ]\n" );
+ polarssl_printf( " [ Record expansion is unknown (compression) ]\n" );
#if defined(POLARSSL_SSL_ALPN)
if( opt.alpn_string != NULL )
{
const char *alp = ssl_get_alpn_protocol( &ssl );
- printf( " [ Application Layer Protocol is %s ]\n",
+ polarssl_printf( " [ Application Layer Protocol is %s ]\n",
alp ? alp : "(none)" );
}
#endif
@@ -1864,35 +1866,35 @@
/*
* 5. Verify the server certificate
*/
- printf( " . Verifying peer X.509 certificate..." );
+ polarssl_printf( " . Verifying peer X.509 certificate..." );
if( ( ret = ssl_get_verify_result( &ssl ) ) != 0 )
{
- printf( " failed\n" );
+ polarssl_printf( " failed\n" );
if( !ssl_get_peer_cert( &ssl ) )
- printf( " ! no client certificate sent\n" );
+ polarssl_printf( " ! no client certificate sent\n" );
if( ( ret & BADCERT_EXPIRED ) != 0 )
- printf( " ! client certificate has expired\n" );
+ polarssl_printf( " ! client certificate has expired\n" );
if( ( ret & BADCERT_REVOKED ) != 0 )
- printf( " ! client certificate has been revoked\n" );
+ polarssl_printf( " ! client certificate has been revoked\n" );
if( ( ret & BADCERT_NOT_TRUSTED ) != 0 )
- printf( " ! self-signed or not signed by a trusted CA\n" );
+ polarssl_printf( " ! self-signed or not signed by a trusted CA\n" );
- printf( "\n" );
+ polarssl_printf( "\n" );
}
else
- printf( " ok\n" );
+ polarssl_printf( " ok\n" );
if( ssl_get_peer_cert( &ssl ) )
{
- printf( " . Peer certificate information ...\n" );
+ polarssl_printf( " . Peer certificate information ...\n" );
x509_crt_info( (char *) buf, sizeof( buf ) - 1, " ",
ssl_get_peer_cert( &ssl ) );
- printf( "%s\n", buf );
+ polarssl_printf( "%s\n", buf );
}
#endif /* POLARSSL_X509_CRT_PARSE_C */
@@ -1904,7 +1906,7 @@
/*
* 6. Read the HTTP Request
*/
- printf( " < Read from client:" );
+ polarssl_printf( " < Read from client:" );
fflush( stdout );
/*
@@ -1928,17 +1930,17 @@
switch( ret )
{
case POLARSSL_ERR_SSL_PEER_CLOSE_NOTIFY:
- printf( " connection was closed gracefully\n" );
+ polarssl_printf( " connection was closed gracefully\n" );
goto close_notify;
case 0:
case POLARSSL_ERR_NET_CONN_RESET:
- printf( " connection was reset by peer\n" );
+ polarssl_printf( " connection was reset by peer\n" );
ret = POLARSSL_ERR_NET_CONN_RESET;
goto reset;
default:
- printf( " ssl_read returned -0x%x\n", -ret );
+ polarssl_printf( " ssl_read returned -0x%x\n", -ret );
goto reset;
}
}
@@ -2041,7 +2043,7 @@
#if defined(POLARSSL_SSL_RENEGOTIATION)
if( opt.renegotiate && exchanges_left == opt.exchanges )
{
- printf( " . Requestion renegotiation..." );
+ polarssl_printf( " . Requestion renegotiation..." );
fflush( stdout );
while( ( ret = ssl_renegotiate( &ssl ) ) != 0 )
@@ -2049,19 +2051,19 @@
if( ret != POLARSSL_ERR_NET_WANT_READ &&
ret != POLARSSL_ERR_NET_WANT_WRITE )
{
- printf( " failed\n ! ssl_renegotiate returned %d\n\n", ret );
+ polarssl_printf( " failed\n ! ssl_renegotiate returned %d\n\n", ret );
goto reset;
}
}
- printf( " ok\n" );
+ polarssl_printf( " ok\n" );
}
#endif /* POLARSSL_SSL_RENEGOTIATION */
/*
* 7. Write the 200 Response
*/
- printf( " > Write to client:" );
+ polarssl_printf( " > Write to client:" );
fflush( stdout );
len = sprintf( (char *) buf, HTTP_RESPONSE,
@@ -2076,14 +2078,14 @@
{
if( ret == POLARSSL_ERR_NET_CONN_RESET )
{
- printf( " failed\n ! peer closed the connection\n\n" );
+ polarssl_printf( " failed\n ! peer closed the connection\n\n" );
goto reset;
}
if( ret != POLARSSL_ERR_NET_WANT_READ &&
ret != POLARSSL_ERR_NET_WANT_WRITE )
{
- printf( " failed\n ! ssl_write returned %d\n\n", ret );
+ polarssl_printf( " failed\n ! ssl_write returned %d\n\n", ret );
goto reset;
}
}
@@ -2107,6 +2109,7 @@
buf[written] = '\0';
printf( " %d bytes written in %d fragments\n\n%s\n", written, frags, (char *) buf );
+ polarssl_printf( " %d bytes written in %d fragments\n\n%s\n", written, frags, (char *) buf );
ret = 0;
/*
@@ -2119,14 +2122,15 @@
* 8. Done, cleanly close the connection
*/
close_notify:
- printf( " . Closing the connection..." );
+ polarssl_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 );
ret = 0;
- printf( " done\n" );
+ polarssl_printf( " done\n" );
+
goto reset;
/*
@@ -2138,7 +2142,7 @@
{
char error_buf[100];
polarssl_strerror( ret, error_buf, 100 );
- printf("Last error was: -0x%X - %s\n\n", -ret, error_buf );
+ polarssl_printf("Last error was: -0x%X - %s\n\n", -ret, error_buf );
}
#endif
@@ -2189,7 +2193,7 @@
printf( " done.\n" );
#if defined(_WIN32)
- printf( " + Press Enter to exit this program.\n" );
+ polarssl_printf( " + Press Enter to exit this program.\n" );
fflush( stdout ); getchar();
#endif