Rename ssl_internal.h to ssl_misc.h
Signed-off-by: Chris Jones <christopher.jones@arm.com>
This commit is contained in:
parent
4c5819c318
commit
84a773f8e6
15 changed files with 20 additions and 20 deletions
|
@ -229,13 +229,13 @@ enum {
|
||||||
/** Maximum length of any IV, in Bytes. */
|
/** Maximum length of any IV, in Bytes. */
|
||||||
/* This should ideally be derived automatically from list of ciphers.
|
/* This should ideally be derived automatically from list of ciphers.
|
||||||
* This should be kept in sync with MBEDTLS_SSL_MAX_IV_LENGTH defined
|
* This should be kept in sync with MBEDTLS_SSL_MAX_IV_LENGTH defined
|
||||||
* in ssl_internal.h. */
|
* in ssl_misc.h. */
|
||||||
#define MBEDTLS_MAX_IV_LENGTH 16
|
#define MBEDTLS_MAX_IV_LENGTH 16
|
||||||
|
|
||||||
/** Maximum block size of any cipher, in Bytes. */
|
/** Maximum block size of any cipher, in Bytes. */
|
||||||
/* This should ideally be derived automatically from list of ciphers.
|
/* This should ideally be derived automatically from list of ciphers.
|
||||||
* This should be kept in sync with MBEDTLS_SSL_MAX_BLOCK_LENGTH defined
|
* This should be kept in sync with MBEDTLS_SSL_MAX_BLOCK_LENGTH defined
|
||||||
* in ssl_internal.h. */
|
* in ssl_misc.h. */
|
||||||
#define MBEDTLS_MAX_BLOCK_LENGTH 16
|
#define MBEDTLS_MAX_BLOCK_LENGTH 16
|
||||||
|
|
||||||
/** Maximum key length, in Bytes. */
|
/** Maximum key length, in Bytes. */
|
||||||
|
@ -243,7 +243,7 @@ enum {
|
||||||
* For now, only check whether XTS is enabled which uses 64 Byte keys,
|
* For now, only check whether XTS is enabled which uses 64 Byte keys,
|
||||||
* and use 32 Bytes as an upper bound for the maximum key length otherwise.
|
* and use 32 Bytes as an upper bound for the maximum key length otherwise.
|
||||||
* This should be kept in sync with MBEDTLS_SSL_MAX_BLOCK_LENGTH defined
|
* This should be kept in sync with MBEDTLS_SSL_MAX_BLOCK_LENGTH defined
|
||||||
* in ssl_internal.h, which however deliberately ignores the case of XTS
|
* in ssl_misc.h, which however deliberately ignores the case of XTS
|
||||||
* since the latter isn't used in SSL/TLS. */
|
* since the latter isn't used in SSL/TLS. */
|
||||||
#if defined(MBEDTLS_CIPHER_MODE_XTS)
|
#if defined(MBEDTLS_CIPHER_MODE_XTS)
|
||||||
#define MBEDTLS_MAX_KEY_LENGTH 64
|
#define MBEDTLS_MAX_KEY_LENGTH 64
|
||||||
|
|
|
@ -619,7 +619,7 @@ typedef struct mbedtls_ssl_session mbedtls_ssl_session;
|
||||||
typedef struct mbedtls_ssl_context mbedtls_ssl_context;
|
typedef struct mbedtls_ssl_context mbedtls_ssl_context;
|
||||||
typedef struct mbedtls_ssl_config mbedtls_ssl_config;
|
typedef struct mbedtls_ssl_config mbedtls_ssl_config;
|
||||||
|
|
||||||
/* Defined in ssl_internal.h */
|
/* Defined in ssl_misc.h */
|
||||||
typedef struct mbedtls_ssl_transform mbedtls_ssl_transform;
|
typedef struct mbedtls_ssl_transform mbedtls_ssl_transform;
|
||||||
typedef struct mbedtls_ssl_handshake_params mbedtls_ssl_handshake_params;
|
typedef struct mbedtls_ssl_handshake_params mbedtls_ssl_handshake_params;
|
||||||
typedef struct mbedtls_ssl_sig_hash_set_t mbedtls_ssl_sig_hash_set_t;
|
typedef struct mbedtls_ssl_sig_hash_set_t mbedtls_ssl_sig_hash_set_t;
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "mbedtls/ssl_cache.h"
|
#include "mbedtls/ssl_cache.h"
|
||||||
#include "ssl_internal.h"
|
#include "ssl_misc.h"
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "mbedtls/ssl.h"
|
#include "mbedtls/ssl.h"
|
||||||
#include "ssl_internal.h"
|
#include "ssl_misc.h"
|
||||||
#include "mbedtls/debug.h"
|
#include "mbedtls/debug.h"
|
||||||
#include "mbedtls/error.h"
|
#include "mbedtls/error.h"
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "mbedtls/ssl_cookie.h"
|
#include "mbedtls/ssl_cookie.h"
|
||||||
#include "ssl_internal.h"
|
#include "ssl_misc.h"
|
||||||
#include "mbedtls/error.h"
|
#include "mbedtls/error.h"
|
||||||
#include "mbedtls/platform_util.h"
|
#include "mbedtls/platform_util.h"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/**
|
/**
|
||||||
* \file ssl_internal.h
|
* \file ssl_misc.h
|
||||||
*
|
*
|
||||||
* \brief Internal functions shared by the SSL modules
|
* \brief Internal functions shared by the SSL modules
|
||||||
*/
|
*/
|
||||||
|
@ -19,8 +19,8 @@
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
#ifndef MBEDTLS_SSL_INTERNAL_H
|
#ifndef MBEDTLS_SSL_MISC_H
|
||||||
#define MBEDTLS_SSL_INTERNAL_H
|
#define MBEDTLS_SSL_MISC_H
|
||||||
|
|
||||||
#if !defined(MBEDTLS_CONFIG_FILE)
|
#if !defined(MBEDTLS_CONFIG_FILE)
|
||||||
#include "mbedtls/config.h"
|
#include "mbedtls/config.h"
|
||||||
|
@ -1306,4 +1306,4 @@ void mbedtls_ssl_buffering_free( mbedtls_ssl_context *ssl );
|
||||||
void mbedtls_ssl_flight_free( mbedtls_ssl_flight_item *flight );
|
void mbedtls_ssl_flight_free( mbedtls_ssl_flight_item *flight );
|
||||||
#endif /* MBEDTLS_SSL_PROTO_DTLS */
|
#endif /* MBEDTLS_SSL_PROTO_DTLS */
|
||||||
|
|
||||||
#endif /* ssl_internal.h */
|
#endif /* ssl_misc.h */
|
|
@ -39,7 +39,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "mbedtls/ssl.h"
|
#include "mbedtls/ssl.h"
|
||||||
#include "ssl_internal.h"
|
#include "ssl_misc.h"
|
||||||
#include "mbedtls/debug.h"
|
#include "mbedtls/debug.h"
|
||||||
#include "mbedtls/error.h"
|
#include "mbedtls/error.h"
|
||||||
#include "mbedtls/platform_util.h"
|
#include "mbedtls/platform_util.h"
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "mbedtls/ssl.h"
|
#include "mbedtls/ssl.h"
|
||||||
#include "ssl_internal.h"
|
#include "ssl_misc.h"
|
||||||
#include "mbedtls/debug.h"
|
#include "mbedtls/debug.h"
|
||||||
#include "mbedtls/error.h"
|
#include "mbedtls/error.h"
|
||||||
#include "mbedtls/platform_util.h"
|
#include "mbedtls/platform_util.h"
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#define mbedtls_free free
|
#define mbedtls_free free
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "ssl_internal.h"
|
#include "ssl_misc.h"
|
||||||
#include "mbedtls/ssl_ticket.h"
|
#include "mbedtls/ssl_ticket.h"
|
||||||
#include "mbedtls/error.h"
|
#include "mbedtls/error.h"
|
||||||
#include "mbedtls/platform_util.h"
|
#include "mbedtls/platform_util.h"
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "mbedtls/ssl.h"
|
#include "mbedtls/ssl.h"
|
||||||
#include "ssl_internal.h"
|
#include "ssl_misc.h"
|
||||||
#include "mbedtls/debug.h"
|
#include "mbedtls/debug.h"
|
||||||
#include "mbedtls/error.h"
|
#include "mbedtls/error.h"
|
||||||
#include "mbedtls/platform_util.h"
|
#include "mbedtls/platform_util.h"
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL)
|
#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL)
|
||||||
|
|
||||||
#include "mbedtls/hkdf.h"
|
#include "mbedtls/hkdf.h"
|
||||||
#include "ssl_internal.h"
|
#include "ssl_misc.h"
|
||||||
#include "ssl_tls13_keys.h"
|
#include "ssl_tls13_keys.h"
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
|
@ -101,7 +101,7 @@
|
||||||
#include "mbedtls/x509_crt.h"
|
#include "mbedtls/x509_crt.h"
|
||||||
#include "mbedtls/x509_csr.h"
|
#include "mbedtls/x509_csr.h"
|
||||||
#include "mbedtls/xtea.h"
|
#include "mbedtls/xtea.h"
|
||||||
#include "../../library/ssl_internal.h"
|
#include "../../library/ssl_misc.h"
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
|
|
@ -101,7 +101,7 @@
|
||||||
#include "mbedtls/x509_crt.h"
|
#include "mbedtls/x509_crt.h"
|
||||||
#include "mbedtls/x509_csr.h"
|
#include "mbedtls/x509_csr.h"
|
||||||
#include "mbedtls/xtea.h"
|
#include "mbedtls/xtea.h"
|
||||||
#include "../../library/ssl_internal.h"
|
#include "../../library/ssl_misc.h"
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* BEGIN_HEADER */
|
/* BEGIN_HEADER */
|
||||||
#include <mbedtls/ssl.h>
|
#include <mbedtls/ssl.h>
|
||||||
#include <ssl_internal.h>
|
#include <ssl_misc.h>
|
||||||
#include <mbedtls/ctr_drbg.h>
|
#include <mbedtls/ctr_drbg.h>
|
||||||
#include <mbedtls/entropy.h>
|
#include <mbedtls/entropy.h>
|
||||||
#include <mbedtls/certs.h>
|
#include <mbedtls/certs.h>
|
||||||
|
|
|
@ -251,8 +251,8 @@
|
||||||
<ClInclude Include="..\..\library\psa_crypto_slot_management.h" />
|
<ClInclude Include="..\..\library\psa_crypto_slot_management.h" />
|
||||||
<ClInclude Include="..\..\library\psa_crypto_storage.h" />
|
<ClInclude Include="..\..\library\psa_crypto_storage.h" />
|
||||||
<ClInclude Include="..\..\library\rsa_internal.h" />
|
<ClInclude Include="..\..\library\rsa_internal.h" />
|
||||||
<ClInclude Include="..\..\library\ssl_internal.h" />
|
|
||||||
<ClInclude Include="..\..\library\ssl_invasive.h" />
|
<ClInclude Include="..\..\library\ssl_invasive.h" />
|
||||||
|
<ClInclude Include="..\..\library\ssl_misc.h" />
|
||||||
<ClInclude Include="..\..\library\ssl_tls13_keys.h" />
|
<ClInclude Include="..\..\library\ssl_tls13_keys.h" />
|
||||||
<ClInclude Include="..\..\3rdparty\everest\include\everest\everest.h" />
|
<ClInclude Include="..\..\3rdparty\everest\include\everest\everest.h" />
|
||||||
<ClInclude Include="..\..\3rdparty\everest\include\everest\Hacl_Curve25519.h" />
|
<ClInclude Include="..\..\3rdparty\everest\include\everest\Hacl_Curve25519.h" />
|
||||||
|
|
Loading…
Reference in a new issue