crypto/armcap.c: detect ARMv8 capabilities [in 32-bit build].

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

diff --git a/crypto/des/pcbc_enc.c b/crypto/des/pcbc_enc.c
index 8adba1aad33d89e1ffb7cbcf37f2bd746d14dac6..17a40f9520f0efe9f0382828480d3165fce8f36f 100644 (file)
--- a/crypto/des/pcbc_enc.c
+++ b/crypto/des/pcbc_enc.c
@@ -1,5 +1,5 @@
 /* crypto/des/pcbc_enc.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -58,21 +58,18 @@
 
 #include "des_locl.h"
 
-void des_pcbc_encrypt(input, output, length, schedule, ivec, enc)
-des_cblock (*input);
-des_cblock (*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];
-       unsigned char *in,*out,*iv;
+       const unsigned char *in;
+       unsigned char *out,*iv;
 
-       in=(unsigned char *)input;
-       out=(unsigned char *)output;
-       iv=(unsigned char *)ivec;
+       in=input;
+       out=output;
+       iv = &(*ivec)[0];
 
        if (enc)
                {
@@ -89,7 +86,7 @@ int enc;
                                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;
@@ -107,7 +104,7 @@ int enc;
                        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)