| asn1.h | | asn1.h | |
| | | | |
| skipping to change at line 215 | | skipping to change at line 215 | |
| int asn1_get_bitstring( unsigned char **p, const unsigned char *end, | | int asn1_get_bitstring( unsigned char **p, const unsigned char *end, | |
| asn1_bitstring *bs); | | asn1_bitstring *bs); | |
| | | | |
| /** | | /** | |
| * Parses and splits an ASN.1 "SEQUENCE OF <tag>" | | * Parses and splits an ASN.1 "SEQUENCE OF <tag>" | |
| * Updated the pointer to immediately behind the full sequence tag. | | * Updated the pointer to immediately behind the full sequence tag. | |
| * | | * | |
| * \param p The position in the ASN.1 data | | * \param p The position in the ASN.1 data | |
| * \param end End of data | | * \param end End of data | |
| * \param cur First variable in the chain to fill | | * \param cur First variable in the chain to fill | |
|
| | | * \param tag Type of sequence | |
| * | | * | |
| * \return 0 if successful or a specific ASN.1 error code. | | * \return 0 if successful or a specific ASN.1 error code. | |
| */ | | */ | |
| int asn1_get_sequence_of( unsigned char **p, | | int asn1_get_sequence_of( unsigned char **p, | |
| const unsigned char *end, | | const unsigned char *end, | |
| asn1_sequence *cur, | | asn1_sequence *cur, | |
| int tag); | | int tag); | |
| | | | |
| #if defined(POLARSSL_BIGNUM_C) | | #if defined(POLARSSL_BIGNUM_C) | |
| /** | | /** | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 1 lines changed or added | |
|
| bignum.h | | bignum.h | |
| | | | |
| skipping to change at line 33 | | skipping to change at line 33 | |
| * You should have received a copy of the GNU General Public License along | | * You should have received a copy of the GNU General Public License along | |
| * with this program; if not, write to the Free Software Foundation, Inc., | | * with this program; if not, write to the Free Software Foundation, Inc., | |
| * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | |
| */ | | */ | |
| #ifndef POLARSSL_BIGNUM_H | | #ifndef POLARSSL_BIGNUM_H | |
| #define POLARSSL_BIGNUM_H | | #define POLARSSL_BIGNUM_H | |
| | | | |
| #include <stdio.h> | | #include <stdio.h> | |
| #include <string.h> | | #include <string.h> | |
| | | | |
|
| | | #include "config.h" | |
| | | | |
| #define POLARSSL_ERR_MPI_FILE_IO_ERROR -0x0002 /**< An
error occurred while reading from or writing to a file. */ | | #define POLARSSL_ERR_MPI_FILE_IO_ERROR -0x0002 /**< An
error occurred while reading from or writing to a file. */ | |
| #define POLARSSL_ERR_MPI_BAD_INPUT_DATA -0x0004 /**< Ba
d input parameters to function. */ | | #define POLARSSL_ERR_MPI_BAD_INPUT_DATA -0x0004 /**< Ba
d input parameters to function. */ | |
| #define POLARSSL_ERR_MPI_INVALID_CHARACTER -0x0006 /**< Th
ere is an invalid character in the digit string. */ | | #define POLARSSL_ERR_MPI_INVALID_CHARACTER -0x0006 /**< Th
ere is an invalid character in the digit string. */ | |
| #define POLARSSL_ERR_MPI_BUFFER_TOO_SMALL -0x0008 /**< Th
e buffer is too small to write to. */ | | #define POLARSSL_ERR_MPI_BUFFER_TOO_SMALL -0x0008 /**< Th
e buffer is too small to write to. */ | |
| #define POLARSSL_ERR_MPI_NEGATIVE_VALUE -0x000A /**< Th
e input arguments are negative or result in illegal output. */ | | #define POLARSSL_ERR_MPI_NEGATIVE_VALUE -0x000A /**< Th
e input arguments are negative or result in illegal output. */ | |
| #define POLARSSL_ERR_MPI_DIVISION_BY_ZERO -0x000C /**< Th
e input argument for division is zero, which is not allowed. */ | | #define POLARSSL_ERR_MPI_DIVISION_BY_ZERO -0x000C /**< Th
e input argument for division is zero, which is not allowed. */ | |
| #define POLARSSL_ERR_MPI_NOT_ACCEPTABLE -0x000E /**< Th
e input arguments are not acceptable. */ | | #define POLARSSL_ERR_MPI_NOT_ACCEPTABLE -0x000E /**< Th
e input arguments are not acceptable. */ | |
| #define POLARSSL_ERR_MPI_MALLOC_FAILED -0x0010 /**< Me
mory allocation failed. */ | | #define POLARSSL_ERR_MPI_MALLOC_FAILED -0x0010 /**< Me
mory allocation failed. */ | |
| | | | |
| #define MPI_CHK(f) if( ( ret = f ) != 0 ) goto cleanup | | #define MPI_CHK(f) if( ( ret = f ) != 0 ) goto cleanup | |
| | | | |
| skipping to change at line 98 | | skipping to change at line 100 | |
| #if defined(POLARSSL_HAVE_INT16) | | #if defined(POLARSSL_HAVE_INT16) | |
| typedef signed short t_sint; | | typedef signed short t_sint; | |
| typedef unsigned short t_uint; | | typedef unsigned short t_uint; | |
| typedef unsigned long t_udbl; | | typedef unsigned long t_udbl; | |
| #else | | #else | |
| typedef signed long t_sint; | | typedef signed long t_sint; | |
| typedef unsigned long t_uint; | | typedef unsigned long t_uint; | |
| #if defined(_MSC_VER) && defined(_M_IX86) | | #if defined(_MSC_VER) && defined(_M_IX86) | |
| typedef unsigned __int64 t_udbl; | | typedef unsigned __int64 t_udbl; | |
| #else | | #else | |
|
| #if defined(__amd64__) || defined(__x86_64__) || \ | | #if defined(__GNUC__) && ( \ | |
| | | defined(__amd64__) || defined(__x86_64__) || \ | |
| defined(__ppc64__) || defined(__powerpc64__) || \ | | defined(__ppc64__) || defined(__powerpc64__) || \ | |
| defined(__ia64__) || defined(__alpha__) || \ | | defined(__ia64__) || defined(__alpha__) || \ | |
| (defined(__sparc__) && defined(__arch64__)) || \ | | (defined(__sparc__) && defined(__arch64__)) || \ | |
|
| defined(__s390x__) | | defined(__s390x__) ) | |
| typedef unsigned int t_udbl __attribute__((mode(TI))); | | typedef unsigned int t_udbl __attribute__((mode(TI))); | |
|
| | | #define POLARSSL_HAVE_LONGLONG | |
| #else | | #else | |
| #if defined(POLARSSL_HAVE_LONGLONG) | | #if defined(POLARSSL_HAVE_LONGLONG) | |
| typedef unsigned long long t_udbl; | | typedef unsigned long long t_udbl; | |
| #endif | | #endif | |
| #endif | | #endif | |
| #endif | | #endif | |
| #endif | | #endif | |
| #endif | | #endif | |
| | | | |
| /** | | /** | |
| | | | |
End of changes. 4 change blocks. |
| 2 lines changed or deleted | | 6 lines changed or added | |
|
| bn_mul.h | | bn_mul.h | |
| | | | |
| skipping to change at line 44 | | skipping to change at line 44 | |
| * . IA-32 (SSE2) . Motorola 68000 | | * . IA-32 (SSE2) . Motorola 68000 | |
| * . PowerPC, 32-bit . MicroBlaze | | * . PowerPC, 32-bit . MicroBlaze | |
| * . PowerPC, 64-bit . TriCore | | * . PowerPC, 64-bit . TriCore | |
| * . SPARC v8 . ARM v3+ | | * . SPARC v8 . ARM v3+ | |
| * . Alpha . MIPS32 | | * . Alpha . MIPS32 | |
| * . C, longlong . C, generic | | * . C, longlong . C, generic | |
| */ | | */ | |
| #ifndef POLARSSL_BN_MUL_H | | #ifndef POLARSSL_BN_MUL_H | |
| #define POLARSSL_BN_MUL_H | | #define POLARSSL_BN_MUL_H | |
| | | | |
|
| #include "config.h" | | #include "bignum.h" | |
| | | | |
| #if defined(POLARSSL_HAVE_ASM) | | #if defined(POLARSSL_HAVE_ASM) | |
| | | | |
| #if defined(__GNUC__) | | #if defined(__GNUC__) | |
| #if defined(__i386__) | | #if defined(__i386__) | |
| | | | |
| #define MULADDC_INIT \ | | #define MULADDC_INIT \ | |
| asm( " \ | | asm( " \ | |
| movl %%ebx, %0; \ | | movl %%ebx, %0; \ | |
| movl %5, %%esi; \ | | movl %5, %%esi; \ | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| md.h | | md.h | |
| | | | |
| skipping to change at line 45 | | skipping to change at line 45 | |
| #define inline _inline | | #define inline _inline | |
| #else | | #else | |
| #if defined(__ARMCC_VERSION) && !defined(inline) | | #if defined(__ARMCC_VERSION) && !defined(inline) | |
| #define inline __inline | | #define inline __inline | |
| #endif /* __ARMCC_VERSION */ | | #endif /* __ARMCC_VERSION */ | |
| #endif /*_MSC_VER */ | | #endif /*_MSC_VER */ | |
| | | | |
| #define POLARSSL_ERR_MD_FEATURE_UNAVAILABLE -0x5080 /**< Th
e selected feature is not available. */ | | #define POLARSSL_ERR_MD_FEATURE_UNAVAILABLE -0x5080 /**< Th
e selected feature is not available. */ | |
| #define POLARSSL_ERR_MD_BAD_INPUT_DATA -0x5100 /**< Ba
d input parameters to function. */ | | #define POLARSSL_ERR_MD_BAD_INPUT_DATA -0x5100 /**< Ba
d input parameters to function. */ | |
| #define POLARSSL_ERR_MD_ALLOC_FAILED -0x5180 /**< Fa
iled to allocate memory. */ | | #define POLARSSL_ERR_MD_ALLOC_FAILED -0x5180 /**< Fa
iled to allocate memory. */ | |
|
| #define POLARSSL_ERR_MD_FILE_OPEN_FAILED -0x5200 /**< Op | | #define POLARSSL_ERR_MD_FILE_IO_ERROR -0x5200 /**< Op | |
| ening of file failed. */ | | ening or reading of file failed. */ | |
| #define POLARSSL_ERR_MD_FILE_READ_FAILED -0x5280 /**< Fa | | | |
| ilure when reading from file. */ | | | |
| | | | |
| typedef enum { | | typedef enum { | |
| POLARSSL_MD_NONE=0, | | POLARSSL_MD_NONE=0, | |
| POLARSSL_MD_MD2, | | POLARSSL_MD_MD2, | |
| POLARSSL_MD_MD4, | | POLARSSL_MD_MD4, | |
| POLARSSL_MD_MD5, | | POLARSSL_MD_MD5, | |
| POLARSSL_MD_SHA1, | | POLARSSL_MD_SHA1, | |
| POLARSSL_MD_SHA224, | | POLARSSL_MD_SHA224, | |
| POLARSSL_MD_SHA256, | | POLARSSL_MD_SHA256, | |
| POLARSSL_MD_SHA384, | | POLARSSL_MD_SHA384, | |
| | | | |
End of changes. 1 change blocks. |
| 4 lines changed or deleted | | 2 lines changed or added | |
|
| ssl.h | | ssl.h | |
| | | | |
| skipping to change at line 565 | | skipping to change at line 565 | |
| */ | | */ | |
| int ssl_set_dh_param_ctx( ssl_context *ssl, dhm_context *dhm_ctx ); | | int ssl_set_dh_param_ctx( ssl_context *ssl, dhm_context *dhm_ctx ); | |
| | | | |
| /** | | /** | |
| * \brief Set hostname for ServerName TLS Extension | | * \brief Set hostname for ServerName TLS Extension | |
| * | | * | |
| * | | * | |
| * \param ssl SSL context | | * \param ssl SSL context | |
| * \param hostname the server hostname | | * \param hostname the server hostname | |
| * | | * | |
|
| * \return 0 if successful | | * \return 0 if successful or POLARSSL_ERR_SSL_MALLOC_FAILED | |
| */ | | */ | |
| int ssl_set_hostname( ssl_context *ssl, const char *hostname ); | | int ssl_set_hostname( ssl_context *ssl, const char *hostname ); | |
| | | | |
| /** | | /** | |
| * \brief Set the maximum supported version sent from the client s
ide | | * \brief Set the maximum supported version sent from the client s
ide | |
| * | | * | |
| * \param ssl SSL context | | * \param ssl SSL context | |
| * \param major Major version number (only SSL_MAJOR_VERSION_3 supported
) | | * \param major Major version number (only SSL_MAJOR_VERSION_3 supported
) | |
| * \param minor Minor version number (SSL_MINOR_VERSION_0, | | * \param minor Minor version number (SSL_MINOR_VERSION_0, | |
| * SSL_MINOR_VERSION_1 and SSL_MINOR_VERSION_2 supported) | | * SSL_MINOR_VERSION_1 and SSL_MINOR_VERSION_2 supported) | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 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 1 | | #define POLARSSL_VERSION_MINOR 1 | |
|
| #define POLARSSL_VERSION_PATCH 0 | | #define POLARSSL_VERSION_PATCH 1 | |
| | | | |
| /** | | /** | |
| * 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 0x01010000 | | #define POLARSSL_VERSION_NUMBER 0x01010100 | |
| #define POLARSSL_VERSION_STRING "1.1.0" | | #define POLARSSL_VERSION_STRING "1.1.1" | |
| #define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.1.0" | | #define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.1.1" | |
| | | | |
| #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 | |
|