[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  3cb9fd97ced4a74ba5d4751c455146899164a202 (commit)
      from  47abe380042cad34b78a1a9c7c18995f3e8f8ad2 (commit)


- Log -----------------------------------------------------------------
commit 3cb9fd97ced4a74ba5d4751c455146899164a202
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Dec 8 00:11:47 2015 +0100

    Remove double semi (;)
    
    When in the middle of declarations, some C compilers will complain.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/pem/pvkfmt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c
index c95967c..58cbd07 100644
--- a/crypto/pem/pvkfmt.c
+++ b/crypto/pem/pvkfmt.c
@@ -650,7 +650,7 @@ static int derive_pvk_key(unsigned char *key,
                           const unsigned char *salt, unsigned int saltlen,
                           const unsigned char *pass, int passlen)
 {
-    EVP_MD_CTX *mctx = EVP_MD_CTX_new();;
+    EVP_MD_CTX *mctx = EVP_MD_CTX_new();
     int rv = 1;
     if (mctx == NULL
         || !EVP_DigestInit_ex(mctx, EVP_sha1(), NULL)