[rs-commit] r21 - in /mod_timestamp/trunk: ChangeLog mod_timestamp.c

[rs-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Sun Feb 24 00:38:07 2019
New Revision: 21

Log:
Fix the ap_run_ca_makeserial and ap_run_ca_gettime hooks to match
mod_ca v0.2.0 and above.

Modified:
    mod_timestamp/trunk/ChangeLog
    mod_timestamp/trunk/mod_timestamp.c

Modified: mod_timestamp/trunk/ChangeLog
==============================================================================
--- mod_timestamp/trunk/ChangeLog	(original)
+++ mod_timestamp/trunk/ChangeLog	Sun Feb 24 00:38:07 2019
@@ -1,5 +1,8 @@
 
 Changes with v0.2.0
+
+ *) Fix the ap_run_ca_makeserial and ap_run_ca_gettime hooks to match
+    mod_ca v0.2.0 and above. [Graham Leggett]
 
  *) Honour CFLAGS during build. [Graham Leggett]
 

Modified: mod_timestamp/trunk/mod_timestamp.c
==============================================================================
--- mod_timestamp/trunk/mod_timestamp.c	(original)
+++ mod_timestamp/trunk/mod_timestamp.c	Sun Feb 24 00:38:07 2019
@@ -523,23 +523,23 @@
     ASN1_INTEGER *sno = NULL;
 
     /* read in the serial number */
-    rv = ap_run_ca_make_serial(r, NULL, &buffer, &len);
+    rv = ap_run_ca_makeserial(r, NULL, &buffer, &len);
     if (rv == DECLINED) {
         TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                "No module configured to generate the serial number (ca_make_serial)");
+                "No module configured to generate the serial number (ca_makeserial)");
         TS_RESP_CTX_add_failure_info(ctx, TS_INFO_ADD_INFO_NOT_AVAILABLE);
         return NULL;
     }
     if (rv != OK) {
         TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                "Unable to generate the serial number (ca_make_serial)");
+                "Unable to generate the serial number (ca_makeserial)");
         TS_RESP_CTX_add_failure_info(ctx, TS_INFO_ADD_INFO_NOT_AVAILABLE);
         return NULL;
     }
 
     if (!d2i_ASN1_INTEGER(&sno, &buffer, len)) {
         TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                "Could not DER decode the serial number (ca_make_serial)");
+                "Could not DER decode the serial number (ca_makeserial)");
         TS_RESP_CTX_add_failure_info(ctx, TS_INFO_ADD_INFO_NOT_AVAILABLE);
         return NULL;
     }
@@ -556,16 +556,16 @@
     apr_interval_time_t as = 0, ams = 0, amicro = 0;
 
     /* read in the time */
-    rv = ap_run_ca_get_time(r, &time, &as, &ams, &amicro);
+    rv = ap_run_ca_gettime(r, &time, &as, &ams, &amicro);
     if (rv == DECLINED) {
         TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                "No module configured to generate the time (ca_get_time)");
+                "No module configured to generate the time (ca_gettime)");
         TS_RESP_CTX_add_failure_info(ctx, TS_INFO_TIME_NOT_AVAILABLE);
         return 0;
     }
     if (rv != OK) {
         TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                "Unable to generate the time (ca_get_time)");
+                "Unable to generate the time (ca_gettime)");
         TS_RESP_CTX_add_failure_info(ctx, TS_INFO_TIME_NOT_AVAILABLE);
         return 0;
     }