[rs-commit] r56 - /mod_pkcs12/trunk/mod_pkcs12.c

[rs-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Thu Apr 25 13:57:31 2019
New Revision: 56

Log:
Parse the nickname parameter if present.

Modified:
    mod_pkcs12/trunk/mod_pkcs12.c

Modified: mod_pkcs12/trunk/mod_pkcs12.c
==============================================================================
--- mod_pkcs12/trunk/mod_pkcs12.c	(original)
+++ mod_pkcs12/trunk/mod_pkcs12.c	Thu Apr 25 13:57:31 2019
@@ -829,6 +829,7 @@
     const char *challenge = NULL;
     unsigned char *p;
     const char *nickname = NULL;
+    apr_size_t nickname_size;
     const unsigned char *der;
     apr_hash_t *params = apr_hash_make(r->pool);
     apr_hash_t *seen = apr_hash_make(r->pool);
@@ -904,6 +905,16 @@
             challenge_size = (apr_size_t) offset;
             challenge = apr_pcalloc(r->pool, challenge_size + 1);
             apr_brigade_flatten(pair->value, (char *)challenge, &challenge_size);
+
+        }
+
+        /* handle the param_nickname */
+        else if (conf->param_nickname && !strcmp(pair->name, conf->param_nickname)) {
+
+            apr_brigade_length(pair->value, 1, &offset);
+            nickname_size = (apr_size_t) offset;
+            nickname = apr_pcalloc(r->pool, nickname_size + 1);
+            apr_brigade_flatten(pair->value, (char *)nickname, &nickname_size);
 
         }