[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  297172294c5bf2b94976ac6911d4d01176fb1921 (commit)
      from  afc12d76f80d6ee14df3fc655e3c7e868ae0f368 (commit)


- Log -----------------------------------------------------------------
commit 297172294c5bf2b94976ac6911d4d01176fb1921
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Sep 6 12:56:33 2015 +0200

    Remove warning about use of uninitialised variable
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/pkcs7/pk7_smime.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c
index 6522a51..16df4ea 100644
--- a/crypto/pkcs7/pk7_smime.c
+++ b/crypto/pkcs7/pk7_smime.c
@@ -513,7 +513,7 @@ PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher,
 int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags)
 {
     BIO *tmpmem;
-    int ret, i;
+    int ret = 0, i;
     char *buf = NULL;
 
     if (!p7) {
@@ -575,7 +575,6 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags)
             break;
         }
         if (BIO_write(data, buf, i) != i) {
-            ret = 0;
             break;
         }
     }