[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  719122c759f86f1057b9d7aa8a9f7f2a9edd424c (commit)
      from  06cf881a3a10d5af3c1255c08cfd0c6ddb5f1cc3 (commit)


- Log -----------------------------------------------------------------
commit 719122c759f86f1057b9d7aa8a9f7f2a9edd424c
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Feb 9 08:58:43 2015 +0100

    des/asm/des_enc.m4: fix brown-bag typo in last commit.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 crypto/des/asm/des_enc.m4 |    1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/des/asm/des_enc.m4 b/crypto/des/asm/des_enc.m4
index 6ae17fd..3efe246 100644
--- a/crypto/des/asm/des_enc.m4
+++ b/crypto/des/asm/des_enc.m4
@@ -1610,6 +1610,7 @@ DES_ede3_cbc_encrypt:
 	LDPTR	[%fp+BIAS+ARG0+6*ARGSZ], local4          ! ivec
 	cmp	local3, 0                 ! enc
 
+	be	.ede3.dec
 	STPTR	in4, KS2
 
 	STPTR	in5, KS3