Really fix PKCS7_set_detached this time...

diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index d4804f8837c8b0275d4dc1eb1c7994d162fd8b11..9b647b212182a74eaadb04fc313a97555d439446 100644 (file)
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -74,7 +74,7 @@ long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
                if (nid == NID_pkcs7_signed)
                        {
                        ret=p7->detached=(int)larg;
-                       if (PKCS7_type_is_data(p7->d.sign->contents))
+                       if (ret && PKCS7_type_is_data(p7->d.sign->contents))
                                        {
                                        ASN1_OCTET_STRING *os;
                                        os=p7->d.sign->contents->d.data;