Changeset 0831437 in mod_gnutls

Timestamp:

Jun 11, 2016, 7:03:01 PM (3 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, master, upstream

Children:

04addef

Parents:

47a909e

git-author:

Thomas Klute <thomas2.klute@…> (06/11/16 18:36:47)

git-committer:

Thomas Klute <thomas2.klute@…> (06/11/16 19:03:01)

Message:

Clarify the purpose of mgs_time2sz()

I've renamed the CTIME macro to OPENSSL_TIME_FORMAT because its name
is misleading: ctime() uses a different output format.

Location:

src

Files:

• gnutls_cache.c (modified) (2 diffs)
• gnutls_cache.h (modified) (1 diff)

src/gnutls_cache.c

@@ -101 +101 @@
 }
 
-#define CTIME "%b %d %k:%M:%S %Y %Z"
-
-char *mgs_time2sz(time_t in_time, char *str, int strsize) {
+/* The OPENSSL_TIME_FORMAT macro and mgs_time2sz() serve to print time
+ * in a format compatible with OpenSSL's ASN1_TIME_print()
+ * function. */
+
+#define OPENSSL_TIME_FORMAT "%b %d %k:%M:%S %Y %Z"
+
+char *mgs_time2sz(time_t in_time, char *str, int strsize)
+{
     apr_time_exp_t vtm;
     apr_size_t ret_size;
@@ -111 +116 @@
     apr_time_ansi_put(&t, in_time);
     apr_time_exp_gmt(&vtm, t);
-    apr_strftime(str, &ret_size, strsize - 1, CTIME, &vtm);
+    apr_strftime(str, &ret_size, strsize - 1, OPENSSL_TIME_FORMAT, &vtm);
 
     return str;

src/gnutls_cache.h

@@ -44 +44 @@
 
 /**
- * Convert a time_t into a Null Terminated String
+ * Convert a time_t into a null terminated string in a format
+ * compatible with OpenSSL's ASN1_TIME_print()
+ *
  * @param t time_t time
- * @param str Location to store the Hex Encoded String
- * @param strsize The Maximum Length that can be stored in str
+ * @param str Location to store the time string
+ * @param strsize The maximum length that can be stored in str
  */
 char *mgs_time2sz(time_t t, char *str, int strsize);