214 lines
4.7 KiB
Diff
214 lines
4.7 KiB
Diff
Index: polarssl-1.3.7/include/polarssl/config.h
|
|
===================================================================
|
|
--- polarssl-1.3.7.orig/include/polarssl/config.h 2014-06-01 11:46:18.981400804 +0200
|
|
+++ polarssl-1.3.7/include/polarssl/config.h 2014-06-01 11:46:18.977400804 +0200
|
|
@@ -382,8 +382,8 @@
|
|
* TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
|
|
* TLS_PSK_WITH_3DES_EDE_CBC_SHA
|
|
* TLS_PSK_WITH_RC4_128_SHA
|
|
- */
|
|
#define POLARSSL_KEY_EXCHANGE_PSK_ENABLED
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED
|
|
@@ -406,8 +406,8 @@
|
|
* TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
|
|
* TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
|
|
* TLS_DHE_PSK_WITH_RC4_128_SHA
|
|
- */
|
|
#define POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED
|
|
@@ -426,8 +426,8 @@
|
|
* TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
|
|
* TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
|
|
* TLS_ECDHE_PSK_WITH_RC4_128_SHA
|
|
- */
|
|
#define POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED
|
|
@@ -451,8 +451,8 @@
|
|
* TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256
|
|
* TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
|
|
* TLS_RSA_PSK_WITH_RC4_128_SHA
|
|
- */
|
|
#define POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_KEY_EXCHANGE_RSA_ENABLED
|
|
@@ -530,8 +530,8 @@
|
|
* TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
|
|
* TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
|
|
* TLS_ECDHE_RSA_WITH_RC4_128_SHA
|
|
- */
|
|
#define POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
|
|
@@ -554,8 +554,8 @@
|
|
* TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
|
|
* TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
|
|
* TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
|
|
- */
|
|
#define POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
|
|
@@ -578,8 +578,8 @@
|
|
* TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
|
|
* TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
|
|
* TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
|
|
- */
|
|
#define POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED
|
|
@@ -602,8 +602,8 @@
|
|
* TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384
|
|
* TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
|
|
* TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
|
|
- */
|
|
#define POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_PK_PARSE_EC_EXTENDED
|
|
@@ -758,8 +758,8 @@
|
|
* \def POLARSSL_SELF_TEST
|
|
*
|
|
* Enable the checkup functions (*_self_test).
|
|
- */
|
|
#define POLARSSL_SELF_TEST
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_SSL_ALL_ALERT_MESSAGES
|
|
@@ -1271,8 +1271,8 @@
|
|
* TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384
|
|
* TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
|
|
* TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
|
|
- */
|
|
#define POLARSSL_CAMELLIA_C
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_CERTS_C
|
|
@@ -1285,8 +1285,8 @@
|
|
* Requires: POLARSSL_PEM_PARSE_C
|
|
*
|
|
* This module is used for testing (ssl_client/server).
|
|
- */
|
|
#define POLARSSL_CERTS_C
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_CIPHER_C
|
|
@@ -1325,8 +1325,8 @@
|
|
* library/ssl_tls.c
|
|
*
|
|
* This module provides debugging functions.
|
|
- */
|
|
#define POLARSSL_DEBUG_C
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_DES_C
|
|
@@ -1381,8 +1381,8 @@
|
|
* ECDHE-ECDSA, ECDHE-RSA, DHE-PSK
|
|
*
|
|
* Requires: POLARSSL_ECP_C
|
|
- */
|
|
#define POLARSSL_ECDH_C
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_ECDSA_C
|
|
@@ -1396,8 +1396,8 @@
|
|
* ECDHE-ECDSA
|
|
*
|
|
* Requires: POLARSSL_ECP_C, POLARSSL_ASN1_WRITE_C, POLARSSL_ASN1_PARSE_C
|
|
- */
|
|
#define POLARSSL_ECDSA_C
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_ECP_C
|
|
@@ -1409,8 +1409,8 @@
|
|
* library/ecdsa.c
|
|
*
|
|
* Requires: POLARSSL_BIGNUM_C and at least one POLARSSL_ECP_DP_XXX_ENABLED
|
|
- */
|
|
#define POLARSSL_ECP_C
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_ENTROPY_C
|
|
@@ -1449,8 +1449,8 @@
|
|
*
|
|
* This module enables the AES-GCM and CAMELLIA-GCM ciphersuites, if other
|
|
* requisites are enabled as well.
|
|
- */
|
|
#define POLARSSL_GCM_C
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_HAVEGE_C
|
|
@@ -1607,8 +1607,8 @@
|
|
* Requires: POLARSSL_HAVE_ASM
|
|
*
|
|
* This modules adds support for the VIA PadLock on x86.
|
|
- */
|
|
#define POLARSSL_PADLOCK_C
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_PBKDF2_C
|
|
@@ -1768,8 +1768,8 @@
|
|
* Module: library/ripemd160.c
|
|
* Caller: library/md.c
|
|
*
|
|
- */
|
|
#define POLARSSL_RIPEMD160_C
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_RSA_C
|
|
@@ -1848,8 +1848,8 @@
|
|
* Caller:
|
|
*
|
|
* Requires: POLARSSL_SSL_CACHE_C
|
|
- */
|
|
#define POLARSSL_SSL_CACHE_C
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_SSL_CLI_C
|
|
@@ -1925,8 +1925,8 @@
|
|
* Caller: library/havege.c
|
|
*
|
|
* This module is used by the HAVEGE random number generator.
|
|
- */
|
|
#define POLARSSL_TIMING_C
|
|
+ */
|
|
|
|
/**
|
|
* \def POLARSSL_VERSION_C
|
|
@@ -2046,8 +2046,8 @@
|
|
*
|
|
* Module: library/xtea.c
|
|
* Caller:
|
|
- */
|
|
#define POLARSSL_XTEA_C
|
|
+ */
|
|
|
|
/* \} name SECTION: PolarSSL modules */
|
|
|