Reformat/tidy some of the ASN1 code.

[openssl.git] / crypto / des / pcbc_enc.c

diff --git a/crypto/des/pcbc_enc.c b/crypto/des/pcbc_enc.c
index 1880217560c373d1794ddad1fec974dba7e5b117..17a40f9520f0efe9f0382828480d3165fce8f36f 100644 (file)
--- a/crypto/des/pcbc_enc.c
+++ b/crypto/des/pcbc_enc.c
@@ -58,8 +58,9 @@
 
 #include "des_locl.h"
 
-void des_pcbc_encrypt(const unsigned char *input, unsigned char *output,
-            long length, des_key_schedule schedule, des_cblock ivec, int enc)
+void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output,
+                     long length, DES_key_schedule *schedule,
+                     DES_cblock *ivec, int enc)
        {
        register DES_LONG sin0,sin1,xor0,xor1,tout0,tout1;
        DES_LONG tin[2];
@@ -68,7 +69,7 @@ void des_pcbc_encrypt(const unsigned char *input, unsigned char *output,
 
        in=input;
        out=output;
-       iv=ivec;
+       iv = &(*ivec)[0];
 
        if (enc)
                {
@@ -85,7 +86,7 @@ void des_pcbc_encrypt(const unsigned char *input, unsigned char *output,
                                c2ln(in,sin0,sin1,length);
                        tin[0]=sin0^xor0;
                        tin[1]=sin1^xor1;
-                       des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
+                       DES_encrypt1((DES_LONG *)tin,schedule,DES_ENCRYPT);
                        tout0=tin[0];
                        tout1=tin[1];
                        xor0=sin0^tout0;
@@ -103,7 +104,7 @@ void des_pcbc_encrypt(const unsigned char *input, unsigned char *output,
                        c2l(in,sin1);
                        tin[0]=sin0;
                        tin[1]=sin1;
-                       des_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT);
+                       DES_encrypt1((DES_LONG *)tin,schedule,DES_DECRYPT);
                        tout0=tin[0]^xor0;
                        tout1=tin[1]^xor1;
                        if (length >= 8)