From rs-commit at redwax.eu  Fri Apr 25 20:22:34 2025
From: rs-commit at redwax.eu (rs-commit at redwax.eu)
Date: Fri, 25 Apr 2025 18:22:34 -0000
Subject: [rs-commit] r497 - in /mod_csr/trunk: ChangeLog mod_csr.c
Message-ID: <20250425182234.C40476AA115@chestnut.redwax.eu>

Author: minfrin at redwax.eu
Date: Fri Apr 25 20:22:33 2025
New Revision: 497

Log:
Declare bit fields as unsigned.

Modified:
    mod_csr/trunk/ChangeLog
    mod_csr/trunk/mod_csr.c

Modified: mod_csr/trunk/ChangeLog
==============================================================================
--- mod_csr/trunk/ChangeLog	(original)
+++ mod_csr/trunk/ChangeLog	Fri Apr 25 20:22:33 2025
@@ -1,3 +1,7 @@
+
+Changes with v0.2.5
+
+ *) Declare bit fields as unsigned. [Graham Leggett]
 
 Changes with v0.2.4
 

Modified: mod_csr/trunk/mod_csr.c
==============================================================================
--- mod_csr/trunk/mod_csr.c	(original)
+++ mod_csr/trunk/mod_csr.c	Fri Apr 25 20:22:33 2025
@@ -70,13 +70,13 @@
 
 typedef struct
 {
-    int size_set:1;
-    int param_pkcs10_set:1;
-    int param_challenge_set:1;
-    int location_set:1;
-    int freshness_set:1;
-    int subject_set :1;
-    int subjectaltname_set :1;
+    unsigned int size_set:1;
+    unsigned int param_pkcs10_set:1;
+    unsigned int param_challenge_set:1;
+    unsigned int location_set:1;
+    unsigned int freshness_set:1;
+    unsigned int subject_set :1;
+    unsigned int subjectaltname_set :1;
     apr_off_t size;
     const char *param_pkcs10;
     const char *param_challenge;


From rs-commit at redwax.eu  Fri Apr 25 20:28:22 2025
From: rs-commit at redwax.eu (rs-commit at redwax.eu)
Date: Fri, 25 Apr 2025 18:28:22 -0000
Subject: [rs-commit] r498 - in /mod_csr/trunk: ChangeLog mod_csr.c
Message-ID: <20250425182823.162636AA115@chestnut.redwax.eu>

Author: minfrin at redwax.eu
Date: Fri Apr 25 20:28:22 2025
New Revision: 498

Log:
Use signed lengths returned by i2d_X509_REQ.

Modified:
    mod_csr/trunk/ChangeLog
    mod_csr/trunk/mod_csr.c

Modified: mod_csr/trunk/ChangeLog
==============================================================================
--- mod_csr/trunk/ChangeLog	(original)
+++ mod_csr/trunk/ChangeLog	Fri Apr 25 20:28:22 2025
@@ -1,5 +1,7 @@
 
 Changes with v0.2.5
+
+ *) Use signed lengths returned by i2d_X509_REQ. [Graham Leggett]
 
  *) Declare bit fields as unsigned. [Graham Leggett]
 

Modified: mod_csr/trunk/mod_csr.c
==============================================================================
--- mod_csr/trunk/mod_csr.c	(original)
+++ mod_csr/trunk/mod_csr.c	Fri Apr 25 20:28:22 2025
@@ -770,6 +770,7 @@
     BIO *out = NULL;
     BUF_MEM *bptr = NULL;
 
+    apr_ssize_t slen;
     apr_size_t len;
     int idx;
 
@@ -940,20 +941,21 @@
     }
 
     /* write out the certificate */
-    len = i2d_X509_REQ(creq, NULL);
-    if (len <= 0) {
+    slen = i2d_X509_REQ(creq, NULL);
+    if (slen <= 0) {
         log_message(r, APR_SUCCESS,
                 "could not DER encode the certificate request");
 
         return HTTP_INTERNAL_SERVER_ERROR;
     }
-    der = p = apr_palloc(r->pool, len);
+    der = p = apr_palloc(r->pool, slen);
     if (!i2d_X509_REQ(creq, &p)) {
         log_message(r, APR_SUCCESS,
                 "could not DER encode the certificate request");
 
         return HTTP_INTERNAL_SERVER_ERROR;
     }
+    len = slen;
 
     /* do the authz */
     rv = ap_run_ca_reqauthz(r, params, der, len);