[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Andy Polyakov]

The branch OpenSSL_1_0_2-stable has been updated
       via  b393a4ad38093f54a0e7251ac8694e320a150e12 (commit)
      from  43be582e9b88577b84854954602f131c4edbdde1 (commit)


- Log -----------------------------------------------------------------
commit b393a4ad38093f54a0e7251ac8694e320a150e12
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Feb 18 14:08:55 2016 +0100

    evp/e_des3.c: address compiler warning.
    
    In backporting from master one modification was mistreated.
    
    RT#4210
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

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

diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c
index f006d1b..0e910d6 100644
--- a/crypto/evp/e_des3.c
+++ b/crypto/evp/e_des3.c
@@ -163,7 +163,7 @@ static int des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     }
 # endif                         /* KSSL_DEBUG */
     if (dat->stream.cbc) {
-        (*dat->stream.cbc) (in, out, inl, &dat->ks, ctx->iv);
+        (*dat->stream.cbc) (in, out, inl, dat->ks.ks, ctx->iv);
         return 1;
     }