bignum.h   bignum.h 
skipping to change at line 80 skipping to change at line 80
* *
* Result is an array of ( 2 << POLARSSL_MPI_WINDOW_SIZE ) MPIs used * Result is an array of ( 2 << POLARSSL_MPI_WINDOW_SIZE ) MPIs used
* for the sliding window calculation. (So 64 by default) * for the sliding window calculation. (So 64 by default)
* *
* Reduction in size, reduces speed. * Reduction in size, reduces speed.
*/ */
#define POLARSSL_MPI_WINDOW_SIZE 6 /**< Ma ximum windows size used. */ #define POLARSSL_MPI_WINDOW_SIZE 6 /**< Ma ximum windows size used. */
/* /*
* Maximum size of MPIs allowed in bits and bytes for user-MPIs. * Maximum size of MPIs allowed in bits and bytes for user-MPIs.
* ( Default: 512 bytes => 4096 bits, Maximum: 1024 bytes => 8192 bits ) * ( Default: 512 bytes => 4096 bits, Maximum tested: 2048 bytes => 16384 b its )
* *
* Note: Calculations can results temporarily in larger MPIs. So the number * Note: Calculations can results temporarily in larger MPIs. So the number
* of limbs required (POLARSSL_MPI_MAX_LIMBS) is higher. * of limbs required (POLARSSL_MPI_MAX_LIMBS) is higher.
*/ */
#define POLARSSL_MPI_MAX_SIZE 512 /**< Ma ximum number of bytes for usable MPIs. */ #define POLARSSL_MPI_MAX_SIZE 512 /**< Ma ximum number of bytes for usable MPIs. */
#define POLARSSL_MPI_MAX_BITS ( 8 * POLARSSL_M PI_MAX_SIZE ) /**< Maximum number of bits for usable MPIs. */ #define POLARSSL_MPI_MAX_BITS ( 8 * POLARSSL_M PI_MAX_SIZE ) /**< Maximum number of bits for usable MPIs. */
/* /*
* When reading from files with mpi_read_file() and writing to files with * When reading from files with mpi_read_file() and writing to files with
* mpi_write_file() the buffer should have space * mpi_write_file() the buffer should have space
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 ssl.h   ssl.h 
skipping to change at line 972 skipping to change at line 972
* \brief Perform the SSL handshake * \brief Perform the SSL handshake
* *
* \param ssl SSL context * \param ssl SSL context
* *
* \return 0 if successful, POLARSSL_ERR_NET_WANT_READ, * \return 0 if successful, POLARSSL_ERR_NET_WANT_READ,
* POLARSSL_ERR_NET_WANT_WRITE, or a specific SSL error cod e. * POLARSSL_ERR_NET_WANT_WRITE, or a specific SSL error cod e.
*/ */
int ssl_handshake( ssl_context *ssl ); int ssl_handshake( ssl_context *ssl );
/** /**
* \brief Perform a single step of the SSL handshake
*
* Note: the state of the context (ssl->state) will be at
* the following state after execution of this function.
* Do not call this function if state is SSL_HANDSHAKE_OVER
.
*
* \param ssl SSL context
*
* \return 0 if successful, POLARSSL_ERR_NET_WANT_READ,
* POLARSSL_ERR_NET_WANT_WRITE, or a specific SSL error cod
e.
*/
int ssl_handshake_step( ssl_context *ssl );
/**
* \brief Perform an SSL renegotiation on the running connection * \brief Perform an SSL renegotiation on the running connection
* *
* \param ssl SSL context * \param ssl SSL context
* *
* \return 0 if succesful, or any ssl_handshake() return value. * \return 0 if succesful, or any ssl_handshake() return value.
*/ */
int ssl_renegotiate( ssl_context *ssl ); int ssl_renegotiate( ssl_context *ssl );
/** /**
* \brief Read at most 'len' application data bytes * \brief Read at most 'len' application data bytes
skipping to change at line 1062 skipping to change at line 1076
* \brief Free referenced items in an SSL handshake context and c lear * \brief Free referenced items in an SSL handshake context and c lear
* memory * memory
* *
* \param handshake SSL handshake context * \param handshake SSL handshake context
*/ */
void ssl_handshake_free( ssl_handshake_params *handshake ); void ssl_handshake_free( ssl_handshake_params *handshake );
/* /*
* Internal functions (do not call directly) * Internal functions (do not call directly)
*/ */
int ssl_handshake_client( ssl_context *ssl ); int ssl_handshake_client_step( ssl_context *ssl );
int ssl_handshake_server( ssl_context *ssl ); int ssl_handshake_server_step( ssl_context *ssl );
void ssl_handshake_wrapup( ssl_context *ssl ); void ssl_handshake_wrapup( ssl_context *ssl );
int ssl_send_fatal_handshake_failure( ssl_context *ssl ); int ssl_send_fatal_handshake_failure( ssl_context *ssl );
int ssl_derive_keys( ssl_context *ssl ); int ssl_derive_keys( ssl_context *ssl );
int ssl_read_record( ssl_context *ssl ); int ssl_read_record( ssl_context *ssl );
/** /**
* \return 0 if successful, POLARSSL_ERR_SSL_CONN_EOF on EOF or * \return 0 if successful, POLARSSL_ERR_SSL_CONN_EOF on EOF or
* another negative error code. * another negative error code.
 End of changes. 2 change blocks. 
2 lines changed or deleted 18 lines changed or added


 version.h   version.h 
skipping to change at line 42 skipping to change at line 42
#define POLARSSL_VERSION_H #define POLARSSL_VERSION_H
#include "config.h" #include "config.h"
/** /**
* The version number x.y.z is split into three parts. * The version number x.y.z is split into three parts.
* Major, Minor, Patchlevel * Major, Minor, Patchlevel
*/ */
#define POLARSSL_VERSION_MAJOR 1 #define POLARSSL_VERSION_MAJOR 1
#define POLARSSL_VERSION_MINOR 2 #define POLARSSL_VERSION_MINOR 2
#define POLARSSL_VERSION_PATCH 3 #define POLARSSL_VERSION_PATCH 4
/** /**
* The single version number has the following structure: * The single version number has the following structure:
* MMNNPP00 * MMNNPP00
* Major version | Minor version | Patch version * Major version | Minor version | Patch version
*/ */
#define POLARSSL_VERSION_NUMBER 0x01020300 #define POLARSSL_VERSION_NUMBER 0x01020400
#define POLARSSL_VERSION_STRING "1.2.3" #define POLARSSL_VERSION_STRING "1.2.4"
#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.3" #define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.4"
#if defined(POLARSSL_VERSION_C) #if defined(POLARSSL_VERSION_C)
/** /**
* Get the version number. * Get the version number.
* *
* \return The constructed version number in the format * \return The constructed version number in the format
* MMNNPP00 (Major, Minor, Patch). * MMNNPP00 (Major, Minor, Patch).
*/ */
unsigned int version_get_number( void ); unsigned int version_get_number( void );
 End of changes. 2 change blocks. 
4 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/