config.h   config.h 
skipping to change at line 455 skipping to change at line 455
* *
* This module enables err_strerror(). * This module enables err_strerror().
*/ */
#define POLARSSL_ERROR_C #define POLARSSL_ERROR_C
/** /**
* \def POLARSSL_HAVEGE_C * \def POLARSSL_HAVEGE_C
* *
* Enable the HAVEGE random generator. * Enable the HAVEGE random generator.
* *
* Warning: the HAVEGE random generator is not suitable for virtualized
* environments
*
* Warning: the HAVEGE random generator is dependent on timing and specific
* processor traits. It is therefore not advised to use HAVEGE as
* your applications primary random generator or primary entropy p
ool
* input. As a secondary input to your entropy pool, it IS able ad
d
* the (limited) extra entropy it provides.
*
* Module: library/havege.c * Module: library/havege.c
* Caller: * Caller:
* *
* Requires: POLARSSL_TIMING_C * Requires: POLARSSL_TIMING_C
* *
* This module enables the HAVEGE random number generator. * Uncomment to enable the HAVEGE random generator.
*/
#define POLARSSL_HAVEGE_C #define POLARSSL_HAVEGE_C
*/
/** /**
* \def POLARSSL_MD_C * \def POLARSSL_MD_C
* *
* Enable the generic message digest layer. * Enable the generic message digest layer.
* *
* Module: library/md.c * Module: library/md.c
* Caller: * Caller:
* *
* Uncomment to enable generic message digest wrappers. * Uncomment to enable generic message digest wrappers.
 End of changes. 3 change blocks. 
2 lines changed or deleted 13 lines changed or added


 error.h   error.h 
skipping to change at line 71 skipping to change at line 71
* ENTROPY 3 0x003C-0x0040 * ENTROPY 3 0x003C-0x0040
* MD2 1 0x0070-0x0070 * MD2 1 0x0070-0x0070
* MD4 1 0x0072-0x0072 * MD4 1 0x0072-0x0072
* MD5 1 0x0074-0x0074 * MD5 1 0x0074-0x0074
* SHA1 1 0x0076-0x0076 * SHA1 1 0x0076-0x0076
* SHA2 1 0x0078-0x0078 * SHA2 1 0x0078-0x0078
* SHA4 1 0x007A-0x007A * SHA4 1 0x007A-0x007A
* *
* High-level module nr (3 bits - 0x1...-0x8...) * High-level module nr (3 bits - 0x1...-0x8...)
* Name ID Nr of Errors * Name ID Nr of Errors
* PEM 1 8 * PEM 1 9
* X509 2 21 * X509 2 21
* DHM 3 6 * DHM 3 6
* RSA 4 9 * RSA 4 9
* MD 5 4 * MD 5 4
* CIPHER 6 5 * CIPHER 6 5
* SSL 7 30 * SSL 7 30
* *
* Module dependent error code (5 bits 0x.08.-0x.F8.) * Module dependent error code (5 bits 0x.08.-0x.F8.)
*/ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 pem.h   pem.h 
/** /**
* \file pem.h * \file pem.h
* *
* \brief Privacy Enhanced Mail (PEM) decoding * \brief Privacy Enhanced Mail (PEM) decoding
* *
* Copyright (C) 2006-2010, Brainspark B.V. * Copyright (C) 2006-2013, Brainspark B.V.
* *
* This file is part of PolarSSL (http://www.polarssl.org) * This file is part of PolarSSL (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org> * Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
* *
* All rights reserved. * All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
skipping to change at line 38 skipping to change at line 38
#define POLARSSL_PEM_H #define POLARSSL_PEM_H
#include <string.h> #include <string.h>
/** /**
* \name PEM Error codes * \name PEM Error codes
* These error codes are returned in case of errors reading the * These error codes are returned in case of errors reading the
* PEM data. * PEM data.
* \{ * \{
*/ */
#define POLARSSL_ERR_PEM_NO_HEADER_PRESENT -0x1080 /**< No PEM header found. */ #define POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT -0x1080 /**< No PEM header or footer found. */
#define POLARSSL_ERR_PEM_INVALID_DATA -0x1100 /**< PE M string is not as expected. */ #define POLARSSL_ERR_PEM_INVALID_DATA -0x1100 /**< PE M string is not as expected. */
#define POLARSSL_ERR_PEM_MALLOC_FAILED -0x1180 /**< Fa iled to allocate memory. */ #define POLARSSL_ERR_PEM_MALLOC_FAILED -0x1180 /**< Fa iled to allocate memory. */
#define POLARSSL_ERR_PEM_INVALID_ENC_IV -0x1200 /**< RS A IV is not in hex-format. */ #define POLARSSL_ERR_PEM_INVALID_ENC_IV -0x1200 /**< RS A IV is not in hex-format. */
#define POLARSSL_ERR_PEM_UNKNOWN_ENC_ALG -0x1280 /**< Un supported key encryption algorithm. */ #define POLARSSL_ERR_PEM_UNKNOWN_ENC_ALG -0x1280 /**< Un supported key encryption algorithm. */
#define POLARSSL_ERR_PEM_PASSWORD_REQUIRED -0x1300 /**< Pr ivate key password can't be empty. */ #define POLARSSL_ERR_PEM_PASSWORD_REQUIRED -0x1300 /**< Pr ivate key password can't be empty. */
#define POLARSSL_ERR_PEM_PASSWORD_MISMATCH -0x1380 /**< Gi ven private key password does not allow for correct decryption. */ #define POLARSSL_ERR_PEM_PASSWORD_MISMATCH -0x1380 /**< Gi ven private key password does not allow for correct decryption. */
#define POLARSSL_ERR_PEM_FEATURE_UNAVAILABLE -0x1400 /**< Un available feature, e.g. hashing/encryption combination. */ #define POLARSSL_ERR_PEM_FEATURE_UNAVAILABLE -0x1400 /**< Un available feature, e.g. hashing/encryption combination. */
#define POLARSSL_ERR_PEM_BAD_INPUT_DATA -0x1480 /**< Ba d input parameters to function. */
/* \} name */ /* \} name */
/** /**
* \brief PEM context structure * \brief PEM context structure
*/ */
typedef struct typedef struct
{ {
unsigned char *buf; /*!< buffer for decoded data */ unsigned char *buf; /*!< buffer for decoded data */
size_t buflen; /*!< length of the buffer */ size_t buflen; /*!< length of the buffer */
unsigned char *info; /*!< buffer for extra header information */ unsigned char *info; /*!< buffer for extra header information */
skipping to change at line 80 skipping to change at line 81
/** /**
* \brief Read a buffer for PEM information and store the resulting * \brief Read a buffer for PEM information and store the resulting
* data into the specified context buffers. * data into the specified context buffers.
* *
* \param ctx context to use * \param ctx context to use
* \param header header string to seek and expect * \param header header string to seek and expect
* \param footer footer string to seek and expect * \param footer footer string to seek and expect
* \param data source data to look in * \param data source data to look in
* \param pwd password for decryption (can be NULL) * \param pwd password for decryption (can be NULL)
* \param pwdlen length of password * \param pwdlen length of password
* \param use_len destination for total length used * \param use_len destination for total length used (set after header is
* correctly read, so unless you get
* POLARSSL_ERR_PEM_BAD_INPUT_DATA or
* POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT, use_len is
* the length to skip)
* *
* \return 0 on success, ior a specific PEM error code * \return 0 on success, ior a specific PEM error code
*/ */
int pem_read_buffer( pem_context *ctx, char *header, char *footer, int pem_read_buffer( pem_context *ctx, char *header, char *footer,
const unsigned char *data, const unsigned char *data,
const unsigned char *pwd, const unsigned char *pwd,
size_t pwdlen, size_t *use_len ); size_t pwdlen, size_t *use_len );
/** /**
* \brief PEM context memory freeing * \brief PEM context memory freeing
 End of changes. 4 change blocks. 
3 lines changed or deleted 8 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 6 #define POLARSSL_VERSION_PATCH 7
/** /**
* 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 0x01010600 #define POLARSSL_VERSION_NUMBER 0x01010700
#define POLARSSL_VERSION_STRING "1.1.6" #define POLARSSL_VERSION_STRING "1.1.7"
#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.1.6" #define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.1.7"
#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


 x509.h   x509.h 
skipping to change at line 419 skipping to change at line 419
extern "C" { extern "C" {
#endif #endif
/** /**
* \name Functions to read in DHM parameters, a certificate, CRL or private RSA key * \name Functions to read in DHM parameters, a certificate, CRL or private RSA key
* \{ * \{
*/ */
/** \ingroup x509_module */ /** \ingroup x509_module */
/** /**
* \brief Parse a single DER formatted certificate and add it
* to the chained list.
*
* \param chain points to the start of the chain
* \param buf buffer holding the certificate DER data
* \param buflen size of the buffer
*
* \return 0 if successful, or a specific X509 or PEM error code
*/
int x509parse_crt_der( x509_cert *chain, const unsigned char *buf, size_t b
uflen );
/**
* \brief Parse one or more certificates and add them * \brief Parse one or more certificates and add them
* to the chained list. Parses permissively. If some * to the chained list. Parses permissively. If some
* certificates can be parsed, the result is the number * certificates can be parsed, the result is the number
* of failed certificates it encountered. If none complete * of failed certificates it encountered. If none complete
* correctly, the first error is returned. * correctly, the first error is returned.
* *
* \param chain points to the start of the chain * \param chain points to the start of the chain
* \param buf buffer holding the certificate data * \param buf buffer holding the certificate data
* \param buflen size of the buffer * \param buflen size of the buffer
* *
 End of changes. 1 change blocks. 
0 lines changed or deleted 13 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/