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

[rs-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Mon Feb 24 22:12:30 2020
New Revision: 304

Log:
Remove a stray attempt to set an additional wrapped PKCS7 structure
with PKCS7_content_new().

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	Mon Feb 24 22:12:30 2020
@@ -1,5 +1,8 @@
 
 Changes with v0.2.4
+
+ *) Remove a stray attempt to set an additional wrapped PKCS7 structure
+    with PKCS7_content_new(). [Graham Leggett]
 
  *) Encrypt responses with AES instead of DES3. [Graham Leggett]
 

Modified: mod_scep/trunk/mod_scep.c
==============================================================================
--- mod_scep/trunk/mod_scep.c	(original)
+++ mod_scep/trunk/mod_scep.c	Mon Feb 24 22:12:30 2020
@@ -1122,7 +1122,7 @@
 
     ap_set_content_type(r, "application/x-x509-ca-ra-cert");
 
-    /* create a new signed data PKCS#7                              */
+    /* create a new signed data PKCS#7 */
     p7s = PKCS7_new();
     if (!p7s) {
         log_message(r, APR_SUCCESS,
@@ -1134,8 +1134,8 @@
         apr_pool_cleanup_register(r->pool, p7s, scep_PKCS7_cleanup,
                 apr_pool_cleanup_null);
     }
+
     PKCS7_set_type(p7s, NID_pkcs7_signed);
-    PKCS7_content_new(p7s, NID_pkcs7_data);
 
     /* get the CA certificate */
     rv = ap_run_ca_getca(r, &der, &len, &validity);
@@ -1359,7 +1359,6 @@
                 apr_pool_cleanup_null);
     }
     PKCS7_set_type(p7s, NID_pkcs7_signed);
-    PKCS7_content_new(p7s, NID_pkcs7_data);
 
     tmp = der;
     if (!d2i_X509(&next_cert, &tmp, len)) {
@@ -1589,7 +1588,6 @@
                 apr_pool_cleanup_null);
     }
     PKCS7_set_type(p7s, NID_pkcs7_signed);
-    PKCS7_content_new(p7s, NID_pkcs7_data);
 
     /* if a successful CertRep, return the certificate chain */
 //    if (rscep->messageType == SCEP_MESSAGETYPE_CERTREP