[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  574cffd5d5b8f57f811c8d36d930205041deedee (commit)
      from  05c16493c9fb445a1ccec947de903586503d776c (commit)


- Log -----------------------------------------------------------------
commit 574cffd5d5b8f57f811c8d36d930205041deedee
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Wed Oct 12 14:32:05 2016 +0200

    Engine afalg: properly set operation type also on big endian.
    
    Copy the whole ALG_OP_TYPE to CMSG_DATA.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 engines/afalg/e_afalg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/afalg/e_afalg.c b/engines/afalg/e_afalg.c
index 2c13ba8..658de42 100644
--- a/engines/afalg/e_afalg.c
+++ b/engines/afalg/e_afalg.c
@@ -322,12 +322,12 @@ int afalg_fin_cipher_aio(afalg_aio *aio, int sfd, unsigned char *buf,
 }
 
 static ossl_inline void afalg_set_op_sk(struct cmsghdr *cmsg,
-                                   const unsigned int op)
+                                   const ALG_OP_TYPE op)
 {
     cmsg->cmsg_level = SOL_ALG;
     cmsg->cmsg_type = ALG_SET_OP;
     cmsg->cmsg_len = CMSG_LEN(ALG_OP_LEN);
-    *CMSG_DATA(cmsg) = (char)op;
+    memcpy(CMSG_DATA(cmsg), &op, ALG_OP_LEN);
 }
 
 static void afalg_set_iv_sk(struct cmsghdr *cmsg, const unsigned char *iv,