Unexport time_support.h.
These are only used by crypto/asn1 and not externally.
Change-Id: I2e6a28828fd81a4e3421eed1e98f0a65197f4b88
Reviewed-on: https://boringssl-review.googlesource.com/13868
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 6afb43d..fbfc4b2 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -129,7 +129,6 @@
thread_none.c
thread_pthread.c
thread_win.c
- time_support.c
$<TARGET_OBJECTS:stack>
$<TARGET_OBJECTS:lhash>
diff --git a/crypto/asn1/CMakeLists.txt b/crypto/asn1/CMakeLists.txt
index 25d8ba2..cd1ee8c 100644
--- a/crypto/asn1/CMakeLists.txt
+++ b/crypto/asn1/CMakeLists.txt
@@ -35,6 +35,7 @@
tasn_new.c
tasn_typ.c
tasn_utl.c
+ time_support.c
x_bignum.c
x_long.c
)
diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c
index 2f29868..d130cdf 100644
--- a/crypto/asn1/a_gentm.c
+++ b/crypto/asn1/a_gentm.c
@@ -61,7 +61,6 @@
#include <openssl/err.h>
#include <openssl/mem.h>
-#include <openssl/time_support.h>
#include "asn1_locl.h"
diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c
index a12b38f..4b58429 100644
--- a/crypto/asn1/a_time.c
+++ b/crypto/asn1/a_time.c
@@ -63,7 +63,6 @@
#include <openssl/buf.h>
#include <openssl/err.h>
#include <openssl/mem.h>
-#include <openssl/time_support.h>
#include "asn1_locl.h"
diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
index 3b9d257..193b83f 100644
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c
@@ -61,7 +61,6 @@
#include <openssl/err.h>
#include <openssl/mem.h>
-#include <openssl/time_support.h>
#include "asn1_locl.h"
diff --git a/crypto/asn1/asn1_locl.h b/crypto/asn1/asn1_locl.h
index 982bfd6..ce8146b 100644
--- a/crypto/asn1/asn1_locl.h
+++ b/crypto/asn1/asn1_locl.h
@@ -57,7 +57,42 @@
*
*/
+#ifndef OPENSSL_HEADER_ASN1_ASN1_LOCL_H
+#define OPENSSL_HEADER_ASN1_ASN1_LOCL_H
+
+#include <time.h>
+
+#include <openssl/asn1.h>
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+
+/* Wrapper functions for time functions. */
+
+/* OPENSSL_gmtime wraps |gmtime_r|. See the manual page for that function. */
+struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result);
+
+/* OPENSSL_gmtime_adj updates |tm| by adding |offset_day| days and |offset_sec|
+ * seconds. */
+int OPENSSL_gmtime_adj(struct tm *tm, int offset_day, long offset_sec);
+
+/* OPENSSL_gmtime_diff calculates the difference between |from| and |to| and
+ * outputs the difference as a number of days and seconds in |*out_days| and
+ * |*out_secs|. */
+int OPENSSL_gmtime_diff(int *out_days, int *out_secs, const struct tm *from,
+ const struct tm *to);
+
+
/* Internal ASN1 structures and functions: not for application use */
int asn1_utctime_to_tm(struct tm *tm, const ASN1_UTCTIME *d);
int asn1_generalizedtime_to_tm(struct tm *tm, const ASN1_GENERALIZEDTIME *d);
+
+
+#if defined(__cplusplus)
+} /* extern C */
+#endif
+
+#endif /* OPENSSL_HEADER_ASN1_ASN1_LOCL_H */
diff --git a/crypto/time_support.c b/crypto/asn1/time_support.c
similarity index 99%
rename from crypto/time_support.c
rename to crypto/asn1/time_support.c
index ae0f496..194dc3a 100644
--- a/crypto/time_support.c
+++ b/crypto/asn1/time_support.c
@@ -59,7 +59,7 @@
#define _POSIX_C_SOURCE 201410L /* for gmtime_r */
#endif
-#include <openssl/time_support.h>
+#include "asn1_locl.h"
#include <time.h>