Fix from HEAD.

diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c
index 1f4a0a17952fa7cc03994bbc5d8f0f515ffe183a..d192ef3191652472c18dc52adfe5cf6e543e959d 100644 (file)
--- a/crypto/pkcs7/pk7_smime.c
+++ b/crypto/pkcs7/pk7_smime.c
@@ -130,6 +130,8 @@ PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
        if (flags & PKCS7_STREAM)
                return p7;
 
+       if(flags & PKCS7_DETACHED)PKCS7_set_detached(p7, 1);
+
        if (!(p7bio = PKCS7_dataInit(p7, NULL))) {
                PKCS7err(PKCS7_F_PKCS7_SIGN,ERR_R_MALLOC_FAILURE);
                PKCS7_free(p7);
@@ -138,7 +140,6 @@ PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
 
        SMIME_crlf_copy(data, p7bio, flags);
 
-       if(flags & PKCS7_DETACHED)PKCS7_set_detached(p7, 1);
 
         if (!PKCS7_dataFinal(p7,p7bio)) {
                PKCS7err(PKCS7_F_PKCS7_SIGN,PKCS7_R_PKCS7_DATASIGN);