[rs-commit] r37 - in /mod_scep/trunk: ChangeLog mod_scep.c

[rs-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Sun Apr  7 23:06:03 2019
New Revision: 37

Log:
Add a cleanup for the EVP key.

Modified:
    mod_scep/trunk/ChangeLog
    mod_scep/trunk/mod_scep.c

Modified: mod_scep/trunk/ChangeLog
==============================================================================
--- mod_scep/trunk/ChangeLog	(original)
+++ mod_scep/trunk/ChangeLog	Sun Apr  7 23:06:03 2019
@@ -1,5 +1,7 @@
 
 Changes with v0.2.0
+
+ *) Add a cleanup for the EVP key. [Graham Leggett]
 
  *) PKIOperation request bodies are no longer application/x-pki-message,
     be specific about application/x-www-form-urlencoded when we parse

Modified: mod_scep/trunk/mod_scep.c
==============================================================================
--- mod_scep/trunk/mod_scep.c	(original)
+++ mod_scep/trunk/mod_scep.c	Sun Apr  7 23:06:03 2019
@@ -700,6 +700,12 @@
     return APR_SUCCESS;
 }
 
+static apr_status_t scep_EVP_PKEY_cleanup(void *data)
+{
+    EVP_PKEY_free((EVP_PKEY *) data);
+    return APR_SUCCESS;
+}
+
 static apr_status_t scep_X509_cleanup(void *data)
 {
     X509_free((X509 *) data);
@@ -2008,6 +2014,9 @@
 
         return HTTP_BAD_REQUEST;
     }
+    apr_pool_cleanup_register(r->pool, pktmp, scep_EVP_PKEY_cleanup,
+            apr_pool_cleanup_null);
+
     if (0 >= X509_REQ_verify(req, pktmp)) {
         log_message(r, APR_SUCCESS,
                 "certificate request signature could not be verified");
@@ -2760,6 +2769,7 @@
                     "                with the body containing the ASN.1 DER-encoded OCSP response.</wadl:doc>\n"
                     "     </wadl:representation>\n"
                     "    </wadl:response>\n"
+                    "   </wadl:method>\n"
                     "  </wadl:resource>\n"
                     " </wadl:resources>\n"
                     "</wadl:application>\n",