Changeset 808 for openssl/trunk/crypto/pkcs7/pk7_smime.c

Timestamp:

Aug 7, 2014, 8:25:37 PM (11 years ago)

Author:

dmik

Message:

openssl: Merge version 1.0.0n from vendor to trunk.

Location:

openssl/trunk

Files:

• . (modified) (1 prop)
• crypto/pkcs7/pk7_smime.c (modified) (3 diffs)

openssl/trunk/crypto/pkcs7/pk7_smime.c ¶

@@ -90 +90 @@
                 }
 
-        if(!(flags & PKCS7_NOCERTS))
-                {
-                for(i = 0; i < sk_X509_num(certs); i++)
-                        {
-                        if (!PKCS7_add_certificate(p7, sk_X509_value(certs, i)))
-                                goto err;
-                        }
+        for(i = 0; i < sk_X509_num(certs); i++)
+                {
+                if (!PKCS7_add_certificate(p7, sk_X509_value(certs, i)))
+                        goto err;
                 }
 
@@ -574 +571 @@
                 }
                 ret = SMIME_text(bread, data);
+                if (ret > 0 && BIO_method_type(tmpmem) == BIO_TYPE_CIPHER)
+                        {
+                        if (!BIO_get_cipher_status(tmpmem))
+                                ret = 0;
+                        }
                 BIO_free_all(bread);
                 return ret;
@@ -579 +581 @@
                 for(;;) {
                         i = BIO_read(tmpmem, buf, sizeof(buf));
-                        if(i <= 0) break;
-                        BIO_write(data, buf, i);
+                        if(i <= 0)
+                                {
+                                ret = 1;
+                                if (BIO_method_type(tmpmem) == BIO_TYPE_CIPHER)
+                                        {
+                                        if (!BIO_get_cipher_status(tmpmem))
+                                                ret = 0;
+                                        }
+                                        
+                                break;
+                                }
+                        if (BIO_write(data, buf, i) != i)
+                                {
+                                ret = 0;
+                                break;
+                                }
                 }
                 BIO_free_all(tmpmem);
-                return 1;
+                return ret;
         }
 }