Move gmtime functions to crypto.h.

openssl · Feb 19, 2014 · ff49a94 · ff49a94
1 parent e91fb53
commit ff49a94
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 71 deletions.
diff --git a/crypto/Makefile b/crypto/Makefile
@@ -45,7 +45,7 @@ SRC= $(LIBSRC)
 
 EXHEADER= crypto.h opensslv.h opensslconf.h ebcdic.h symhacks.h \
 	ossl_typ.h
-HEADER=	cryptlib.h buildinf.h md32_common.h o_time.h o_str.h o_dir.h $(EXHEADER)
+HEADER=	cryptlib.h buildinf.h md32_common.h o_str.h o_dir.h $(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 

diff --git a/crypto/crypto.h b/crypto/crypto.h
@@ -118,6 +118,7 @@
 #define HEADER_CRYPTO_H
 
 #include <stdlib.h>
+#include <time.h>
 
 #include <openssl/e_os2.h>
 
@@ -580,6 +581,11 @@ int CRYPTO_memcmp(const void *a, const void *b, size_t len);
  */
 void ERR_load_CRYPTO_strings(void);
 
+struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result);
+int OPENSSL_gmtime_adj(struct tm *tm, int offset_day, long offset_sec);
+int OPENSSL_gmtime_diff(int *pday, int *psec,
+			const struct tm *from, const struct tm *to);
+
 /* Error codes for the CRYPTO functions. */
 
 /* Function codes. */

diff --git a/crypto/o_time.c b/crypto/o_time.c
@@ -61,7 +61,7 @@
 
 #include <openssl/e_os2.h>
 #include <string.h>
-#include "o_time.h"
+#include "crypto.h"
 
 #ifdef OPENSSL_SYS_VMS
 # if __CRTL_VER >= 70000000 && \

diff --git a/crypto/o_time.h b/crypto/o_time.h