[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  c32b9dcac2d70f3868b4b22fd7be0e5ccd854c52 (commit)
      from  edeb3fd2955c42c3e249a0539ef75c21db8c5ca1 (commit)


- Log -----------------------------------------------------------------
commit c32b9dcac2d70f3868b4b22fd7be0e5ccd854c52
Author: Kirill Marinushkin <k.marinushkin at gmail.com>
Date:   Thu May 5 20:51:07 2016 +0200

    Fix engine cryptodev: pointer to IV
    
    Currently point to wrong address
    
    Signed-off-by: Kirill Marinushkin <k.marinushkin at gmail.com>
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

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

diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
index 1959123..bb7f59e 100644
--- a/crypto/engine/eng_cryptodev.c
+++ b/crypto/engine/eng_cryptodev.c
@@ -446,7 +446,7 @@ cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     cryp.op = EVP_CIPHER_CTX_encrypting(ctx) ? COP_ENCRYPT : COP_DECRYPT;
 
     if (EVP_CIPHER_CTX_iv_length(ctx) > 0) {
-        cryp.iv = *(caddr_t*) EVP_CIPHER_CTX_iv(ctx);
+        cryp.iv = (caddr_t) EVP_CIPHER_CTX_iv(ctx);
         if (!EVP_CIPHER_CTX_encrypting(ctx)) {
             iiv = in + inl - EVP_CIPHER_CTX_iv_length(ctx);
             memcpy(save_iv, iiv, EVP_CIPHER_CTX_iv_length(ctx));