[ros-diffs] [akhaldi] 69513: [MBEDTLS] Missed these files in svn. Addendum to r69512. CORE-10318

Author: akhaldi
Date: Mon Oct 12 12:50:06 2015
New Revision: 69513

URL: http://svn.reactos.org/svn/reactos?rev=69513&view=rev
Log:
[MBEDTLS] Missed these files in svn. Addendum to r69512. CORE-10318

Modified:
    trunk/reactos/include/reactos/libs/mbedtls/base64.h
    trunk/reactos/include/reactos/libs/mbedtls/cipher.h
    trunk/reactos/include/reactos/libs/mbedtls/config.h
    trunk/reactos/include/reactos/libs/mbedtls/ctr_drbg.h
    trunk/reactos/include/reactos/libs/mbedtls/hmac_drbg.h
    trunk/reactos/include/reactos/libs/mbedtls/md.h
    trunk/reactos/include/reactos/libs/mbedtls/pk.h
    trunk/reactos/include/reactos/libs/mbedtls/pkcs11.h
    trunk/reactos/include/reactos/libs/mbedtls/ssl.h
    trunk/reactos/include/reactos/libs/mbedtls/ssl_internal.h
    trunk/reactos/include/reactos/libs/mbedtls/timing.h
    trunk/reactos/include/reactos/libs/mbedtls/version.h

Modified: trunk/reactos/include/reactos/libs/mbedtls/base64.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt…
==============================================================================
--- trunk/reactos/include/reactos/libs/mbedtls/base64.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/mbedtls/base64.h	[iso-8859-1] Mon Oct 12 12:50:06
2015
@@ -44,6 +44,9 @@
  * \return         0 if successful, or MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL.
  *                 *olen is always updated to reflect the amount
  *                 of data that has (or would have) been written.
+ *                 If that length cannot be represented, then no data is
+ *                 written to the buffer and *olen is set to the maximum
+ *                 length representable as a size_t.
  *
  * \note           Call this function with dlen = 0 to obtain the
  *                 required buffer size in *olen

Modified: trunk/reactos/include/reactos/libs/mbedtls/cipher.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt…
==============================================================================
--- trunk/reactos/include/reactos/libs/mbedtls/cipher.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/mbedtls/cipher.h	[iso-8859-1] Mon Oct 12 12:50:06
2015
@@ -46,7 +46,8 @@
 #define MBEDTLS_CIPHER_MODE_STREAM
 #endif
 
-#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline)
+#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
+    !defined(inline) && !defined(__cplusplus)
 #define inline __inline
 #endif
 

Modified: trunk/reactos/include/reactos/libs/mbedtls/config.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt…
==============================================================================
--- trunk/reactos/include/reactos/libs/mbedtls/config.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/mbedtls/config.h	[iso-8859-1] Mon Oct 12 12:50:06
2015
@@ -1245,6 +1245,8 @@
  *
  * If set, the X509 parser will not break-off when parsing an X509 certificate
  * and encountering an unknown critical extension.
+ *
+ * \warning Depending on your PKI use, enabling this can be a security risk!
  *
  * Uncomment to prevent an error.
  */

Modified: trunk/reactos/include/reactos/libs/mbedtls/ctr_drbg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt…
==============================================================================
--- trunk/reactos/include/reactos/libs/mbedtls/ctr_drbg.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/mbedtls/ctr_drbg.h	[iso-8859-1] Mon Oct 12 12:50:06
2015
@@ -111,7 +111,7 @@
 
 /**
  * \brief               CTR_DRBG context initialization
- *                      Makes the context ready for mbetls_ctr_drbg_seed() or
+ *                      Makes the context ready for mbedtls_ctr_drbg_seed() or
  *                      mbedtls_ctr_drbg_free().
  *
  * \param ctx           CTR_DRBG context to be initialized

Modified: trunk/reactos/include/reactos/libs/mbedtls/hmac_drbg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt…
==============================================================================
--- trunk/reactos/include/reactos/libs/mbedtls/hmac_drbg.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/mbedtls/hmac_drbg.h	[iso-8859-1] Mon Oct 12
12:50:06 2015
@@ -98,7 +98,7 @@
 
 /**
  * \brief               HMAC_DRBG context initialization
- *                      Makes the context ready for mbetls_hmac_drbg_seed(),
+ *                      Makes the context ready for mbedtls_hmac_drbg_seed(),
  *                      mbedtls_hmac_drbg_seed_buf() or
  *                      mbedtls_hmac_drbg_free().
  *

Modified: trunk/reactos/include/reactos/libs/mbedtls/md.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt…
==============================================================================
--- trunk/reactos/include/reactos/libs/mbedtls/md.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/mbedtls/md.h	[iso-8859-1] Mon Oct 12 12:50:06 2015
@@ -26,10 +26,6 @@
 #define MBEDTLS_MD_H
 
 #include <stddef.h>
-
-#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline)
-#define inline __inline
-#endif
 
 #define MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE                -0x5080  /**< The selected
feature is not available. */
 #define MBEDTLS_ERR_MD_BAD_INPUT_DATA                     -0x5100  /**< Bad input
parameters to function. */

Modified: trunk/reactos/include/reactos/libs/mbedtls/pk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt…
==============================================================================
--- trunk/reactos/include/reactos/libs/mbedtls/pk.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/mbedtls/pk.h	[iso-8859-1] Mon Oct 12 12:50:06 2015
@@ -42,6 +42,11 @@
 
 #if defined(MBEDTLS_ECDSA_C)
 #include "ecdsa.h"
+#endif
+
+#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
+    !defined(inline) && !defined(__cplusplus)
+#define inline __inline
 #endif
 
 #define MBEDTLS_ERR_PK_ALLOC_FAILED        -0x3F80  /**< Memory allocation failed. */
@@ -59,7 +64,6 @@
 #define MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE -0x3980  /**< Unavailable feature, e.g. RSA
disabled for RSA key. */
 #define MBEDTLS_ERR_PK_SIG_LEN_MISMATCH    -0x3900  /**< The signature is valid but
its length is less than expected. */
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif

Modified: trunk/reactos/include/reactos/libs/mbedtls/pkcs11.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt…
==============================================================================
--- trunk/reactos/include/reactos/libs/mbedtls/pkcs11.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/mbedtls/pkcs11.h	[iso-8859-1] Mon Oct 12 12:50:06
2015
@@ -37,7 +37,8 @@
 
 #include <pkcs11-helper-1.0/pkcs11h-certificate.h>
 
-#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline)
+#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
+    !defined(inline) && !defined(__cplusplus)
 #define inline __inline
 #endif
 
@@ -54,7 +55,7 @@
 } mbedtls_pkcs11_context;
 
 /**
- * Initialize a mbetls_pkcs11_context.
+ * Initialize a mbedtls_pkcs11_context.
  * (Just making memory references valid.)
  */
 void mbedtls_pkcs11_init( mbedtls_pkcs11_context *ctx );

Modified: trunk/reactos/include/reactos/libs/mbedtls/ssl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt…
==============================================================================
--- trunk/reactos/include/reactos/libs/mbedtls/ssl.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/mbedtls/ssl.h	[iso-8859-1] Mon Oct 12 12:50:06
2015
@@ -139,6 +139,8 @@
 #define MBEDTLS_SSL_TRANSPORT_STREAM            0   /*!< TLS      */
 #define MBEDTLS_SSL_TRANSPORT_DATAGRAM          1   /*!< DTLS     */
 
+#define MBEDTLS_SSL_MAX_HOST_NAME_LEN           255 /*!< Maximum host name defined in
RFC 1035 */
+
 /* RFC 6066 section 4, see also mfl_code_to_length in ssl_tls.c
  * NONE must be zero so that memset()ing structure to zero works */
 #define MBEDTLS_SSL_MAX_FRAG_LEN_NONE           0   /*!< don't use this extension 
 */
@@ -840,7 +842,7 @@
 
 /**
  * \brief          Initialize an SSL context
- *                 Just makes the context ready for mbetls_ssl_setup() or
+ *                 Just makes the context ready for mbedtls_ssl_setup() or
  *                 mbedtls_ssl_free()
  *
  * \param ssl      SSL context

Modified: trunk/reactos/include/reactos/libs/mbedtls/ssl_internal.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt…
==============================================================================
--- trunk/reactos/include/reactos/libs/mbedtls/ssl_internal.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/mbedtls/ssl_internal.h	[iso-8859-1] Mon Oct 12
12:50:06 2015
@@ -41,7 +41,8 @@
 #include "sha512.h"
 #endif
 
-#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline)
+#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
+    !defined(inline) && !defined(__cplusplus)
 #define inline __inline
 #endif
 

Modified: trunk/reactos/include/reactos/libs/mbedtls/timing.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt…
==============================================================================
--- trunk/reactos/include/reactos/libs/mbedtls/timing.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/mbedtls/timing.h	[iso-8859-1] Mon Oct 12 12:50:06
2015
@@ -92,7 +92,7 @@
  *                 (See \c mbedtls_timing_get_delay().)
  *
  * \param data     Pointer to timing data
- *                 Must point to a valid \c mbetls_timing_delay_context struct.
+ *                 Must point to a valid \c mbedtls_timing_delay_context struct.
  * \param int_ms   First (intermediate) delay in milliseconds.
  * \param fin_ms   Second (final) delay in milliseconds.
  *                 Pass 0 to cancel the current delay.
@@ -104,7 +104,7 @@
  *                 (Memory helper: number of delays passed.)
  *
  * \param data     Pointer to timing data
- *                 Must point to a valid \c mbetls_timing_delay_context struct.
+ *                 Must point to a valid \c mbedtls_timing_delay_context struct.
  *
  * \return         -1 if cancelled (fin_ms = 0)
  *                  0 if none of the delays are passed,

Modified: trunk/reactos/include/reactos/libs/mbedtls/version.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt…
==============================================================================
--- trunk/reactos/include/reactos/libs/mbedtls/version.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/mbedtls/version.h	[iso-8859-1] Mon Oct 12 12:50:06
2015
@@ -39,19 +39,18 @@
  */
 #define MBEDTLS_VERSION_MAJOR  2
 #define MBEDTLS_VERSION_MINOR  1
-#define MBEDTLS_VERSION_PATCH  1
+#define MBEDTLS_VERSION_PATCH  2
 
 /**
  * The single version number has the following structure:
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define MBEDTLS_VERSION_NUMBER         0x02010100
-#define MBEDTLS_VERSION_STRING         "2.1.1"
-#define MBEDTLS_VERSION_STRING_FULL    "mbed TLS 2.1.1"
+#define MBEDTLS_VERSION_NUMBER         0x02010200
+#define MBEDTLS_VERSION_STRING         "2.1.2"
+#define MBEDTLS_VERSION_STRING_FULL    "mbed TLS 2.1.2"
 
 #if defined(MBEDTLS_VERSION_C)
-
 #ifdef __cplusplus
 extern "C" {
 #endif