X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fdes%2Fede_cbcm_enc.c;h=c53062481ddd5441080f7d5589209b89024b872f;hb=a3fe382e2d2d794c598921cd39117581a2a8941b;hp=41890df327742db8e32e35e964aedbc5d9e5984b;hpb=a49498969e998701c63ec84f0f69a719f5e4fc6a;p=oweals%2Fopenssl.git

diff --git a/crypto/des/ede_cbcm_enc.c b/crypto/des/ede_cbcm_enc.c
index 41890df327..c53062481d 100644
--- a/crypto/des/ede_cbcm_enc.c
+++ b/crypto/des/ede_cbcm_enc.c
@@ -68,14 +68,13 @@ http://www.cs.technion.ac.il/users/wwwb/cgi-bin/tr-get.cgi/1998/CS/CS0928.ps.gz
 
 */
 
+#ifndef NO_DESCBCM
 #include "des_locl.h"
 
-void des_ede3_cbcm_encrypt(const unsigned char *in,unsigned char *out,
-			   long length,
-			   des_key_schedule ks1,des_key_schedule ks2,
-			   des_key_schedule ks3,
-			   des_cblock ivec1,des_cblock ivec2,
-			   int enc)
+void des_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out,
+	     long length, des_key_schedule ks1, des_key_schedule ks2,
+	     des_key_schedule ks3, des_cblock *ivec1, des_cblock *ivec2,
+	     int enc)
     {
     register DES_LONG tin0,tin1;
     register DES_LONG tout0,tout1,xor0,xor1,m0,m1;
@@ -83,8 +82,8 @@ void des_ede3_cbcm_encrypt(const unsigned char *in,unsigned char *out,
     DES_LONG tin[2];
     unsigned char *iv1,*iv2;
 
-    iv1=ivec1;
-    iv2=ivec2;
+    iv1 = &(*ivec1)[0];
+    iv2 = &(*ivec2)[0];
 
     if (enc)
 	{
@@ -127,11 +126,11 @@ void des_ede3_cbcm_encrypt(const unsigned char *in,unsigned char *out,
 	    l2c(tout0,out);
 	    l2c(tout1,out);
 	    }
-	iv1=ivec1;
+	iv1=&(*ivec1)[0];
 	l2c(m0,iv1);
 	l2c(m1,iv1);
 
-	iv2=ivec2;
+	iv2=&(*ivec2)[0];
 	l2c(tout0,iv2);
 	l2c(tout1,iv2);
 	}
@@ -184,14 +183,15 @@ void des_ede3_cbcm_encrypt(const unsigned char *in,unsigned char *out,
 	    xor1=t1;
 	    }
 
-	iv1=ivec1;
+	iv1=&(*ivec1)[0];
 	l2c(m0,iv1);
 	l2c(m1,iv1);
 
-	iv2=ivec2;
+	iv2=&(*ivec2)[0];
 	l2c(xor0,iv2);
 	l2c(xor1,iv2);
 	}
     tin0=tin1=tout0=tout1=xor0=xor1=0;
     tin[0]=tin[1]=0;
     }
+#endif