Puts platform time abstraction into a own header
Places the platform time abstraction into a separate header file to avoid dependency issues where a build may need time but not the libc abstraction.
This commit is contained in:
parent
7247f99b3e
commit
8631143ae0
@ -29,6 +29,11 @@
|
|||||||
#include MBEDTLS_CONFIG_FILE
|
#include MBEDTLS_CONFIG_FILE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_HAVE_TIME)
|
||||||
|
#include "platform_time.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
@ -243,39 +248,6 @@ int mbedtls_platform_set_exit( void (*exit_func)( int status ) );
|
|||||||
#define MBEDTLS_EXIT_FAILURE 1
|
#define MBEDTLS_EXIT_FAILURE 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
|
||||||
* The time_t datatype
|
|
||||||
*/
|
|
||||||
#if defined(MBEDTLS_PLATFORM_TIME_TYPE_MACRO)
|
|
||||||
typedef MBEDTLS_PLATFORM_TIME_TYPE_MACRO mbedtls_time_t;
|
|
||||||
#else
|
|
||||||
/* For time_t */
|
|
||||||
#include <time.h>
|
|
||||||
typedef time_t mbedtls_time_t;
|
|
||||||
#endif /* MBEDTLS_PLATFORM_TIME_TYPE_MACRO */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* The function pointers for time
|
|
||||||
*/
|
|
||||||
#if defined(MBEDTLS_PLATFORM_TIME_ALT)
|
|
||||||
extern mbedtls_time_t (*mbedtls_time)( mbedtls_time_t* time );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* \brief Set your own time function pointer
|
|
||||||
*
|
|
||||||
* \param time_func the time function implementation
|
|
||||||
*
|
|
||||||
* \return 0
|
|
||||||
*/
|
|
||||||
int mbedtls_platform_set_time( mbedtls_time_t (*time_func)( mbedtls_time_t* time ) );
|
|
||||||
#else
|
|
||||||
#if defined(MBEDTLS_PLATFORM_TIME_MACRO)
|
|
||||||
#define mbedtls_time MBEDTLS_PLATFORM_TIME_MACRO
|
|
||||||
#else
|
|
||||||
#define mbedtls_time time
|
|
||||||
#endif /* MBEDTLS_PLATFORM_TIME_MACRO */
|
|
||||||
#endif /* MBEDTLS_PLATFORM_TIME_ALT */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The function pointers for reading from and writing a seed file to
|
* The function pointers for reading from and writing a seed file to
|
||||||
* Non-Volatile storage (NV) in a platform-independent way
|
* Non-Volatile storage (NV) in a platform-independent way
|
||||||
|
81
include/mbedtls/platform_time.h
Normal file
81
include/mbedtls/platform_time.h
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
/**
|
||||||
|
* \file platform_time.h
|
||||||
|
*
|
||||||
|
* \brief mbed TLS Platform time abstraction
|
||||||
|
*
|
||||||
|
* Copyright (C) 2006-2016, ARM Limited, All Rights Reserved
|
||||||
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
* not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
* This file is part of mbed TLS (https://tls.mbed.org)
|
||||||
|
*/
|
||||||
|
#ifndef MBEDTLS_PLATFORM_TIME_H
|
||||||
|
#define MBEDTLS_PLATFORM_TIME_H
|
||||||
|
|
||||||
|
#if !defined(MBEDTLS_CONFIG_FILE)
|
||||||
|
#include "config.h"
|
||||||
|
#else
|
||||||
|
#include MBEDTLS_CONFIG_FILE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \name SECTION: Module settings
|
||||||
|
*
|
||||||
|
* The configuration options you can set for this module are in this section.
|
||||||
|
* Either change them in config.h or define them on the compiler command line.
|
||||||
|
* \{
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The time_t datatype
|
||||||
|
*/
|
||||||
|
#if defined(MBEDTLS_PLATFORM_TIME_TYPE_MACRO)
|
||||||
|
typedef MBEDTLS_PLATFORM_TIME_TYPE_MACRO mbedtls_time_t;
|
||||||
|
#else
|
||||||
|
/* For time_t */
|
||||||
|
#include <time.h>
|
||||||
|
typedef time_t mbedtls_time_t;
|
||||||
|
#endif /* MBEDTLS_PLATFORM_TIME_TYPE_MACRO */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The function pointers for time
|
||||||
|
*/
|
||||||
|
#if defined(MBEDTLS_PLATFORM_TIME_ALT)
|
||||||
|
extern mbedtls_time_t (*mbedtls_time)( mbedtls_time_t* time );
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \brief Set your own time function pointer
|
||||||
|
*
|
||||||
|
* \param time_func the time function implementation
|
||||||
|
*
|
||||||
|
* \return 0
|
||||||
|
*/
|
||||||
|
int mbedtls_platform_set_time( mbedtls_time_t (*time_func)( mbedtls_time_t* time ) );
|
||||||
|
#else
|
||||||
|
#if defined(MBEDTLS_PLATFORM_TIME_MACRO)
|
||||||
|
#define mbedtls_time MBEDTLS_PLATFORM_TIME_MACRO
|
||||||
|
#else
|
||||||
|
#define mbedtls_time time
|
||||||
|
#endif /* MBEDTLS_PLATFORM_TIME_MACRO */
|
||||||
|
#endif /* MBEDTLS_PLATFORM_TIME_ALT */
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* platform_time.h */
|
@ -52,7 +52,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(MBEDTLS_HAVE_TIME)
|
#if defined(MBEDTLS_HAVE_TIME)
|
||||||
#include "platform.h"
|
#include "mbedtls/platform_time.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user