[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  e680311770bd480ab6b4e17562c160855178e5ab (commit)
      from  beb30941d6b2d663144d74dc3846d5d49c127454 (commit)


- Log -----------------------------------------------------------------
commit e680311770bd480ab6b4e17562c160855178e5ab
Author: Mouse <mouse008 at gmail.com>
Date:   Tue Oct 10 14:02:56 2017 -0400

    Code hygiene; initialize some pointers.
    
    CLA: trivial
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4515)

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

Summary of changes:
 crypto/cms/cms_sd.c     | 2 +-
 crypto/pkcs7/pk7_doit.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
index a31e849..7647816 100644
--- a/crypto/cms/cms_sd.c
+++ b/crypto/cms/cms_sd.c
@@ -635,7 +635,7 @@ int cms_SignedData_final(CMS_ContentInfo *cms, BIO *chain)
 int CMS_SignerInfo_sign(CMS_SignerInfo *si)
 {
     EVP_MD_CTX *mctx = si->mctx;
-    EVP_PKEY_CTX *pctx;
+    EVP_PKEY_CTX *pctx = NULL;
     unsigned char *abuf = NULL;
     int alen;
     size_t siglen;
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index 0ff9e93..9883a4f 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -813,7 +813,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
 int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
 {
     EVP_MD_CTX *mctx;
-    EVP_PKEY_CTX *pctx;
+    EVP_PKEY_CTX *pctx = NULL;
     unsigned char *abuf = NULL;
     int alen;
     size_t siglen;