rsaz-x86_64.pl: add MULX/ADCX/ADOX code path.

[openssl.git] / crypto / bf / bf_cbc.c

diff --git a/crypto/bf/bf_cbc.c b/crypto/bf/bf_cbc.c
index e0fa9ad7631956994fbc87a00a06a3191122fd23..f949629dc67609229b6a1aa136cade467ef09b7b 100644 (file)
--- a/crypto/bf/bf_cbc.c
+++ b/crypto/bf/bf_cbc.c
@@ -56,16 +56,11 @@
  * [including the GNU Public Licence.]
  */
 
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 #include "bf_locl.h"
 
-void BF_cbc_encrypt(in, out, length, ks, iv, encrypt)
-unsigned char *in;
-unsigned char *out;
-long length;
-BF_KEY *ks;
-unsigned char *iv;
-int encrypt;
+void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
+            const BF_KEY *schedule, unsigned char *ivec, int encrypt)
        {
        register BF_LONG tin0,tin1;
        register BF_LONG tout0,tout1,xor0,xor1;
@@ -74,9 +69,9 @@ int encrypt;
 
        if (encrypt)
                {
-               n2l(iv,tout0);
-               n2l(iv,tout1);
-               iv-=8;
+               n2l(ivec,tout0);
+               n2l(ivec,tout1);
+               ivec-=8;
                for (l-=8; l>=0; l-=8)
                        {
                        n2l(in,tin0);
@@ -85,7 +80,7 @@ int encrypt;
                        tin1^=tout1;
                        tin[0]=tin0;
                        tin[1]=tin1;
-                       BF_encrypt(tin,ks);
+                       BF_encrypt(tin,schedule);
                        tout0=tin[0];
                        tout1=tin[1];
                        l2n(tout0,out);
@@ -98,27 +93,27 @@ int encrypt;
                        tin1^=tout1;
                        tin[0]=tin0;
                        tin[1]=tin1;
-                       BF_encrypt(tin,ks);
+                       BF_encrypt(tin,schedule);
                        tout0=tin[0];
                        tout1=tin[1];
                        l2n(tout0,out);
                        l2n(tout1,out);
                        }
-               l2n(tout0,iv);
-               l2n(tout1,iv);
+               l2n(tout0,ivec);
+               l2n(tout1,ivec);
                }
        else
                {
-               n2l(iv,xor0);
-               n2l(iv,xor1);
-               iv-=8;
+               n2l(ivec,xor0);
+               n2l(ivec,xor1);
+               ivec-=8;
                for (l-=8; l>=0; l-=8)
                        {
                        n2l(in,tin0);
                        n2l(in,tin1);
                        tin[0]=tin0;
                        tin[1]=tin1;
-                       BF_decrypt(tin,ks);
+                       BF_decrypt(tin,schedule);
                        tout0=tin[0]^xor0;
                        tout1=tin[1]^xor1;
                        l2n(tout0,out);
@@ -132,15 +127,15 @@ int encrypt;
                        n2l(in,tin1);
                        tin[0]=tin0;
                        tin[1]=tin1;
-                       BF_decrypt(tin,ks);
+                       BF_decrypt(tin,schedule);
                        tout0=tin[0]^xor0;
                        tout1=tin[1]^xor1;
                        l2nn(tout0,tout1,out,l+8);
                        xor0=tin0;
                        xor1=tin1;
                        }
-               l2n(xor0,iv);
-               l2n(xor1,iv);
+               l2n(xor0,ivec);
+               l2n(xor1,ivec);
                }
        tin0=tin1=tout0=tout1=xor0=xor1=0;
        tin[0]=tin[1]=0;