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_client2.c b/programs/ssl/ssl_client2.c
index 6f529fa..3af8034 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.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,13 @@
#include POLARSSL_CONFIG_FILE
#endif
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#define polarssl_fprintf fprintf
+#endif
+
#if !defined(POLARSSL_ENTROPY_C) || \
!defined(POLARSSL_SSL_TLS_C) || !defined(POLARSSL_SSL_CLI_C) || \
!defined(POLARSSL_NET_C) || !defined(POLARSSL_CTR_DRBG_C)
@@ -35,7 +42,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_CLI_C and/or "
"POLARSSL_NET_C and/or POLARSSL_CTR_DRBG_C not defined.\n");
return( 0 );
@@ -155,7 +162,7 @@
{
((void) level);
- fprintf( (FILE *) ctx, "%s", str );
+ polarssl_fprintf( (FILE *) ctx, "%s", str );
fflush( (FILE *) ctx );
}
@@ -206,33 +213,33 @@
char buf[1024];
((void) data);
- printf( "\nVerify requested for (Depth %d):\n", depth );
+ polarssl_printf( "\nVerify requested for (Depth %d):\n", depth );
x509_crt_info( buf, sizeof( buf ) - 1, "", crt );
- printf( "%s", buf );
+ polarssl_printf( "%s", buf );
if( ( (*flags) & BADCERT_EXPIRED ) != 0 )
- printf( " ! server certificate has expired\n" );
+ polarssl_printf( " ! server certificate has expired\n" );
if( ( (*flags) & BADCERT_REVOKED ) != 0 )
- printf( " ! server certificate has been revoked\n" );
+ polarssl_printf( " ! server certificate has been revoked\n" );
if( ( (*flags) & BADCERT_CN_MISMATCH ) != 0 )
- printf( " ! CN mismatch\n" );
+ polarssl_printf( " ! CN mismatch\n" );
if( ( (*flags) & 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" );
if( ( (*flags) & BADCRL_NOT_TRUSTED ) != 0 )
- printf( " ! CRL not trusted\n" );
+ polarssl_printf( " ! CRL not trusted\n" );
if( ( (*flags) & BADCRL_EXPIRED ) != 0 )
- printf( " ! CRL expired\n" );
+ polarssl_printf( " ! CRL expired\n" );
if( ( (*flags) & BADCERT_OTHER ) != 0 )
- printf( " ! other (unknown) flag\n" );
+ polarssl_printf( " ! other (unknown) flag\n" );
if ( ( *flags ) == 0 )
- printf( " This certificate has no flags\n" );
+ polarssl_printf( " This certificate has no flags\n" );
return( 0 );
}
@@ -363,7 +370,7 @@
"\n" \
USAGE_DTLS \
"\n" \
- " auth_mode=%%s default: \"optional\"\n" \
+ " auth_mode=%%s default: \"required\"\n" \
" options: none, optional, required\n" \
USAGE_IO \
"\n" \
@@ -388,8 +395,6 @@
" arc4=%%d default: 0 (disabled)\n" \
" force_version=%%s default: \"\" (none)\n" \
" options: ssl3, tls1, tls1_1, tls1_2, dtls1, dtls1_2\n" \
- " auth_mode=%%s default: \"required\"\n" \
- " options: none, optional, required\n" \
"\n" \
" force_ciphersuite=<name> default: all enabled\n"\
" acceptable ciphersuite names:\n"
@@ -440,19 +445,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;
}
@@ -789,14 +794,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;
}
@@ -829,7 +834,7 @@
if( strlen( opt.psk ) % 2 != 0 )
{
- printf("pre-shared key not valid hex\n");
+ polarssl_printf("pre-shared key not valid hex\n");
goto exit;
}
@@ -846,7 +851,7 @@
c -= 'A' - 10;
else
{
- printf("pre-shared key not valid hex\n");
+ polarssl_printf("pre-shared key not valid hex\n");
goto exit;
}
psk[ j / 2 ] = c << 4;
@@ -860,7 +865,7 @@
c -= 'A' - 10;
else
{
- printf("pre-shared key not valid hex\n");
+ polarssl_printf("pre-shared key not valid hex\n");
goto exit;
}
psk[ j / 2 ] |= c;
@@ -891,7 +896,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 );
@@ -899,17 +904,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)
@@ -931,23 +936,23 @@
#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
*
* (can be skipped if client authentication is not required)
*/
- printf( " . Loading the client cert. and key..." );
+ polarssl_printf( " . Loading the client cert. and key..." );
fflush( stdout );
#if defined(POLARSSL_FS_IO)
@@ -964,12 +969,12 @@
#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;
}
@@ -987,16 +992,16 @@
#else
{
ret = 1;
- printf("POLARSSL_CERTS_C not defined.");
+ polarssl_printf("POLARSSL_CERTS_C not defined.");
}
#endif
if( ret != 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;
}
- printf( " ok\n" );
+ polarssl_printf( " ok\n" );
#endif /* POLARSSL_X509_CRT_PARSE_C */
/*
@@ -1005,7 +1010,7 @@
if( opt.server_addr == NULL)
opt.server_addr = opt.server_name;
- printf( " . Connecting to %s/%s/%-4d...",
+ polarssl_printf( " . Connecting to %s/%s/%-4d...",
opt.transport == SSL_TRANSPORT_STREAM ? "tcp" : "udp",
opt.server_addr, opt.server_port );
fflush( stdout );
@@ -1014,7 +1019,7 @@
opt.transport == SSL_TRANSPORT_STREAM ?
NET_PROTO_TCP : NET_PROTO_UDP ) ) != 0 )
{
- printf( " failed\n ! net_connect returned -0x%x\n\n", -ret );
+ polarssl_printf( " failed\n ! net_connect returned -0x%x\n\n", -ret );
goto exit;
}
@@ -1024,21 +1029,21 @@
ret = net_set_block( server_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;
}
- 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;
}
@@ -1064,7 +1069,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
@@ -1095,7 +1100,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
@@ -1118,7 +1123,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;
}
#endif
@@ -1146,7 +1151,7 @@
{
if( ( ret = ssl_set_own_cert( &ssl, &clicert, &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;
}
}
@@ -1157,7 +1162,7 @@
(const unsigned char *) opt.psk_identity,
strlen( opt.psk_identity ) ) ) != 0 )
{
- printf( " failed\n ! ssl_set_psk returned %d\n\n", ret );
+ polarssl_printf( " failed\n ! ssl_set_psk returned %d\n\n", ret );
goto exit;
}
#endif
@@ -1165,7 +1170,7 @@
#if defined(POLARSSL_SSL_SERVER_NAME_INDICATION)
if( ( ret = ssl_set_hostname( &ssl, opt.server_name ) ) != 0 )
{
- printf( " failed\n ! ssl_set_hostname returned %d\n\n", ret );
+ polarssl_printf( " failed\n ! ssl_set_hostname returned %d\n\n", ret );
goto exit;
}
#endif
@@ -1195,33 +1200,33 @@
ssl_set_fallback( &ssl, opt.fallback );
#endif
- printf( " ok\n" );
+ polarssl_printf( " ok\n" );
/*
* 4. Handshake
*/
- printf( " . Performing the SSL/TLS handshake..." );
+ polarssl_printf( " . Performing the SSL/TLS handshake..." );
fflush( stdout );
while( ( ret = ssl_handshake( &ssl ) ) != 0 )
{
if( ret != POLARSSL_ERR_NET_WANT_READ && ret != POLARSSL_ERR_NET_WANT_WRITE )
{
- printf( " failed\n ! ssl_handshake returned -0x%x\n", -ret );
+ polarssl_printf( " failed\n ! ssl_handshake returned -0x%x\n", -ret );
if( ret == POLARSSL_ERR_X509_CERT_VERIFY_FAILED )
- printf(
+ polarssl_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" );
- printf( "\n" );
+ polarssl_printf( "\n" );
goto exit;
}
}
- 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 )
@@ -1233,58 +1238,58 @@
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
if( opt.reconnect != 0 )
{
- printf(" . Saving session for reuse..." );
+ polarssl_printf(" . Saving session for reuse..." );
fflush( stdout );
if( ( ret = ssl_get_session( &ssl, &saved_session ) ) != 0 )
{
- printf( " failed\n ! ssl_get_session returned -0x%x\n\n", -ret );
+ polarssl_printf( " failed\n ! ssl_get_session returned -0x%x\n\n", -ret );
goto exit;
}
- printf( " ok\n" );
+ polarssl_printf( " ok\n" );
}
#if defined(POLARSSL_X509_CRT_PARSE_C)
/*
* 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( ( ret & BADCERT_EXPIRED ) != 0 )
- printf( " ! server certificate has expired\n" );
+ polarssl_printf( " ! server certificate has expired\n" );
if( ( ret & BADCERT_REVOKED ) != 0 )
- printf( " ! server certificate has been revoked\n" );
+ polarssl_printf( " ! server certificate has been revoked\n" );
if( ( ret & BADCERT_CN_MISMATCH ) != 0 )
- printf( " ! CN mismatch (expected CN=%s)\n", opt.server_name );
+ polarssl_printf( " ! CN mismatch (expected CN=%s)\n", opt.server_name );
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 ) != NULL )
{
- 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 */
@@ -1295,18 +1300,18 @@
* Perform renegotiation (this must be done when the server is waiting
* for input from our side).
*/
- printf( " . Performing renegotiation..." );
+ polarssl_printf( " . Performing renegotiation..." );
fflush( stdout );
while( ( ret = ssl_renegotiate( &ssl ) ) != 0 )
{
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 exit;
}
}
- printf( " ok\n" );
+ polarssl_printf( " ok\n" );
}
#endif /* POLARSSL_SSL_RENEGOTIATION */
@@ -1315,7 +1320,7 @@
*/
retry_left = opt.max_resend;
send_request:
- printf( " > Write to server:" );
+ polarssl_printf( " > Write to server:" );
fflush( stdout );
len = snprintf( (char *) buf, sizeof(buf) - 1, GET_REQUEST,
@@ -1354,7 +1359,7 @@
if( ret != POLARSSL_ERR_NET_WANT_READ &&
ret != POLARSSL_ERR_NET_WANT_WRITE )
{
- printf( " failed\n ! ssl_write returned -0x%x\n\n", -ret );
+ polarssl_printf( " failed\n ! ssl_write returned -0x%x\n\n", -ret );
goto exit;
}
}
@@ -1377,12 +1382,12 @@
}
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 );
/*
* 7. Read the HTTP response
*/
- printf( " < Read from server:" );
+ polarssl_printf( " < Read from server:" );
fflush( stdout );
/*
@@ -1449,25 +1454,25 @@
switch( ret )
{
case POLARSSL_ERR_NET_TIMEOUT:
- printf( " timeout\n" );
+ polarssl_printf( " timeout\n" );
if( retry_left-- > 0 )
goto send_request;
goto exit;
case POLARSSL_ERR_SSL_PEER_CLOSE_NOTIFY:
- printf( " connection was closed gracefully\n" );
+ polarssl_printf( " connection was closed gracefully\n" );
ret = 0;
goto close_notify;
default:
- printf( " ssl_read returned -0x%x\n", -ret );
+ polarssl_printf( " ssl_read returned -0x%x\n", -ret );
goto exit;
}
}
len = ret;
buf[len] = '\0';
- printf( " %d bytes read\n\n%s", len, (char *) buf );
+ polarssl_printf( " %d bytes read\n\n%s", len, (char *) buf );
ret = 0;
}
@@ -1481,14 +1486,14 @@
* 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" );
/*
* 9. Reconnect?
@@ -1505,18 +1510,18 @@
m_sleep( 1000 * opt.reco_delay );
#endif
- printf( " . Reconnecting with saved session..." );
+ polarssl_printf( " . Reconnecting with saved session..." );
fflush( stdout );
if( ( ret = ssl_session_reset( &ssl ) ) != 0 )
{
- printf( " failed\n ! ssl_session_reset returned -0x%x\n\n", -ret );
+ polarssl_printf( " failed\n ! ssl_session_reset returned -0x%x\n\n", -ret );
goto exit;
}
if( ( ret = ssl_set_session( &ssl, &saved_session ) ) != 0 )
{
- printf( " failed\n ! ssl_set_session returned %d\n\n", ret );
+ polarssl_printf( " failed\n ! ssl_set_session returned %d\n\n", ret );
goto exit;
}
@@ -1524,7 +1529,7 @@
opt.transport == SSL_TRANSPORT_STREAM ?
NET_PROTO_TCP : NET_PROTO_UDP ) ) != 0 )
{
- printf( " failed\n ! net_connect returned -0x%x\n\n", -ret );
+ polarssl_printf( " failed\n ! net_connect returned -0x%x\n\n", -ret );
goto exit;
}
@@ -1544,12 +1549,12 @@
if( ret != POLARSSL_ERR_NET_WANT_READ &&
ret != POLARSSL_ERR_NET_WANT_WRITE )
{
- printf( " failed\n ! ssl_handshake returned -0x%x\n\n", -ret );
+ polarssl_printf( " failed\n ! ssl_handshake returned -0x%x\n\n", -ret );
goto exit;
}
}
- printf( " ok\n" );
+ polarssl_printf( " ok\n" );
goto send_request;
}
@@ -1563,7 +1568,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
@@ -1581,7 +1586,7 @@
entropy_free( &entropy );
#if defined(_WIN32)
- printf( " + Press Enter to exit this program.\n" );
+ polarssl_printf( " + Press Enter to exit this program.\n" );
fflush( stdout ); getchar();
#endif