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

[rs-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Mon Feb 24 23:39:15 2020
New Revision: 306

Log:
Revert - this breaks interop with MacOS.

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 23:39:15 2020
@@ -1,9 +1,5 @@
 
 Changes with v0.2.4
-
- *) Remove attempt to set an additional wrapped PKCS7 structure
-    with PKCS7_content_new(), and revert to setting the wrapped
-    type from first principles. [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 23:39:15 2020
@@ -1136,7 +1136,7 @@
     }
 
     PKCS7_set_type(p7s, NID_pkcs7_signed);
-    p7s->d.sign->contents->type=OBJ_nid2obj(NID_pkcs7_data);
+    PKCS7_content_new(p7s, NID_pkcs7_data);
 
     /* get the CA certificate */
     rv = ap_run_ca_getca(r, &der, &len, &validity);
@@ -1360,7 +1360,7 @@
                 apr_pool_cleanup_null);
     }
     PKCS7_set_type(p7s, NID_pkcs7_signed);
-    p7s->d.sign->contents->type=OBJ_nid2obj(NID_pkcs7_data);
+    PKCS7_content_new(p7s, NID_pkcs7_data);
 
     tmp = der;
     if (!d2i_X509(&next_cert, &tmp, len)) {
@@ -1590,7 +1590,7 @@
                 apr_pool_cleanup_null);
     }
     PKCS7_set_type(p7s, NID_pkcs7_signed);
-    p7s->d.sign->contents->type=OBJ_nid2obj(NID_pkcs7_data);
+    PKCS7_content_new(p7s, NID_pkcs7_data);
 
     /* if a successful CertRep, return the certificate chain */
 //    if (rscep->messageType == SCEP_MESSAGETYPE_CERTREP