diff options
Diffstat (limited to 'src/lib/libcrypto/des/pcbc_enc.c')
-rw-r--r-- | src/lib/libcrypto/des/pcbc_enc.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/lib/libcrypto/des/pcbc_enc.c b/src/lib/libcrypto/des/pcbc_enc.c index 4513207d90..17a40f9520 100644 --- a/src/lib/libcrypto/des/pcbc_enc.c +++ b/src/lib/libcrypto/des/pcbc_enc.c | |||
@@ -58,21 +58,18 @@ | |||
58 | 58 | ||
59 | #include "des_locl.h" | 59 | #include "des_locl.h" |
60 | 60 | ||
61 | void des_pcbc_encrypt(input, output, length, schedule, ivec, enc) | 61 | void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output, |
62 | des_cblock (*input); | 62 | long length, DES_key_schedule *schedule, |
63 | des_cblock (*output); | 63 | DES_cblock *ivec, int enc) |
64 | long length; | ||
65 | des_key_schedule schedule; | ||
66 | des_cblock (*ivec); | ||
67 | int enc; | ||
68 | { | 64 | { |
69 | register DES_LONG sin0,sin1,xor0,xor1,tout0,tout1; | 65 | register DES_LONG sin0,sin1,xor0,xor1,tout0,tout1; |
70 | DES_LONG tin[2]; | 66 | DES_LONG tin[2]; |
71 | unsigned char *in,*out,*iv; | 67 | const unsigned char *in; |
68 | unsigned char *out,*iv; | ||
72 | 69 | ||
73 | in=(unsigned char *)input; | 70 | in=input; |
74 | out=(unsigned char *)output; | 71 | out=output; |
75 | iv=(unsigned char *)ivec; | 72 | iv = &(*ivec)[0]; |
76 | 73 | ||
77 | if (enc) | 74 | if (enc) |
78 | { | 75 | { |
@@ -89,7 +86,7 @@ int enc; | |||
89 | c2ln(in,sin0,sin1,length); | 86 | c2ln(in,sin0,sin1,length); |
90 | tin[0]=sin0^xor0; | 87 | tin[0]=sin0^xor0; |
91 | tin[1]=sin1^xor1; | 88 | tin[1]=sin1^xor1; |
92 | des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT); | 89 | DES_encrypt1((DES_LONG *)tin,schedule,DES_ENCRYPT); |
93 | tout0=tin[0]; | 90 | tout0=tin[0]; |
94 | tout1=tin[1]; | 91 | tout1=tin[1]; |
95 | xor0=sin0^tout0; | 92 | xor0=sin0^tout0; |
@@ -107,7 +104,7 @@ int enc; | |||
107 | c2l(in,sin1); | 104 | c2l(in,sin1); |
108 | tin[0]=sin0; | 105 | tin[0]=sin0; |
109 | tin[1]=sin1; | 106 | tin[1]=sin1; |
110 | des_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT); | 107 | DES_encrypt1((DES_LONG *)tin,schedule,DES_DECRYPT); |
111 | tout0=tin[0]^xor0; | 108 | tout0=tin[0]^xor0; |
112 | tout1=tin[1]^xor1; | 109 | tout1=tin[1]^xor1; |
113 | if (length >= 8) | 110 | if (length >= 8) |