[rs-commit] r63 - in /mod_ca/trunk: mod_ca_engine.c mod_ca_simple.c

[rs-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Thu Aug 29 00:50:37 2019
New Revision: 63

Log:
Use apr_hash_this(), as it works on more versions of apr.

Modified:
    mod_ca/trunk/mod_ca_engine.c
    mod_ca/trunk/mod_ca_simple.c

Modified: mod_ca/trunk/mod_ca_engine.c
==============================================================================
--- mod_ca/trunk/mod_ca_engine.c	(original)
+++ mod_ca/trunk/mod_ca_engine.c	Thu Aug 29 00:50:37 2019
@@ -406,10 +406,13 @@
 
     X509V3_set_ctx(&ext_ctx, conf->signer, cert, NULL, NULL, 0);
     for (iter = apr_hash_first(r->pool, conf->ext); iter; iter = apr_hash_next(iter)) {
+    	const void *vname;
+    	void *vval;
         const char *name, *val;
 
-        name = apr_hash_this_key(iter);
-        val = apr_hash_this_val(iter);
+        apr_hash_this(iter, &vname, NULL, &vval);
+        name = vname;
+        val = vval;
 
         X509_EXTENSION *extension = X509V3_EXT_conf(NULL, &ext_ctx, (char *) name,
                 (char *) val);

Modified: mod_ca/trunk/mod_ca_simple.c
==============================================================================
--- mod_ca/trunk/mod_ca_simple.c	(original)
+++ mod_ca/trunk/mod_ca_simple.c	Thu Aug 29 00:50:37 2019
@@ -402,10 +402,13 @@
     X509V3_set_ctx(&ext_ctx, conf->signer, cert, NULL, NULL, 0);
     for (iter = apr_hash_first(r->pool, conf->ext); iter;
             iter = apr_hash_next(iter)) {
+    	const void *vname;
+    	void *vval;
         const char *name, *val;
 
-        name = apr_hash_this_key(iter);
-        val = apr_hash_this_val(iter);
+        apr_hash_this(iter, &vname, NULL, &vval);
+        name = vname;
+        val = vval;
 
         X509_EXTENSION *extension = X509V3_EXT_conf(NULL, &ext_ctx,
                 (char *) name, (char *) val);