diff options
Diffstat (limited to 'src/lib/libcrypto/des/des_enc.c')
-rw-r--r-- | src/lib/libcrypto/des/des_enc.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/libcrypto/des/des_enc.c b/src/lib/libcrypto/des/des_enc.c index 9f14cc96e4..1de35e1e34 100644 --- a/src/lib/libcrypto/des/des_enc.c +++ b/src/lib/libcrypto/des/des_enc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: des_enc.c,v 1.11 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: des_enc.c,v 1.12 2014/10/28 07:35:58 jsg Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -63,14 +63,14 @@ | |||
63 | 63 | ||
64 | void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc) | 64 | void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc) |
65 | { | 65 | { |
66 | register DES_LONG l,r,t,u; | 66 | DES_LONG l,r,t,u; |
67 | #ifdef DES_PTR | 67 | #ifdef DES_PTR |
68 | register const unsigned char *des_SP=(const unsigned char *)DES_SPtrans; | 68 | const unsigned char *des_SP=(const unsigned char *)DES_SPtrans; |
69 | #endif | 69 | #endif |
70 | #ifndef DES_UNROLL | 70 | #ifndef DES_UNROLL |
71 | register int i; | 71 | int i; |
72 | #endif | 72 | #endif |
73 | register DES_LONG *s; | 73 | DES_LONG *s; |
74 | 74 | ||
75 | r=data[0]; | 75 | r=data[0]; |
76 | l=data[1]; | 76 | l=data[1]; |
@@ -157,14 +157,14 @@ void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc) | |||
157 | 157 | ||
158 | void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc) | 158 | void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc) |
159 | { | 159 | { |
160 | register DES_LONG l,r,t,u; | 160 | DES_LONG l,r,t,u; |
161 | #ifdef DES_PTR | 161 | #ifdef DES_PTR |
162 | register const unsigned char *des_SP=(const unsigned char *)DES_SPtrans; | 162 | const unsigned char *des_SP=(const unsigned char *)DES_SPtrans; |
163 | #endif | 163 | #endif |
164 | #ifndef DES_UNROLL | 164 | #ifndef DES_UNROLL |
165 | register int i; | 165 | int i; |
166 | #endif | 166 | #endif |
167 | register DES_LONG *s; | 167 | DES_LONG *s; |
168 | 168 | ||
169 | r=data[0]; | 169 | r=data[0]; |
170 | l=data[1]; | 170 | l=data[1]; |
@@ -247,7 +247,7 @@ void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc) | |||
247 | void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1, | 247 | void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1, |
248 | DES_key_schedule *ks2, DES_key_schedule *ks3) | 248 | DES_key_schedule *ks2, DES_key_schedule *ks3) |
249 | { | 249 | { |
250 | register DES_LONG l,r; | 250 | DES_LONG l,r; |
251 | 251 | ||
252 | l=data[0]; | 252 | l=data[0]; |
253 | r=data[1]; | 253 | r=data[1]; |
@@ -267,7 +267,7 @@ void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1, | |||
267 | void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1, | 267 | void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1, |
268 | DES_key_schedule *ks2, DES_key_schedule *ks3) | 268 | DES_key_schedule *ks2, DES_key_schedule *ks3) |
269 | { | 269 | { |
270 | register DES_LONG l,r; | 270 | DES_LONG l,r; |
271 | 271 | ||
272 | l=data[0]; | 272 | l=data[0]; |
273 | r=data[1]; | 273 | r=data[1]; |
@@ -294,11 +294,11 @@ void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output, | |||
294 | DES_key_schedule *ks2, DES_key_schedule *ks3, | 294 | DES_key_schedule *ks2, DES_key_schedule *ks3, |
295 | DES_cblock *ivec, int enc) | 295 | DES_cblock *ivec, int enc) |
296 | { | 296 | { |
297 | register DES_LONG tin0,tin1; | 297 | DES_LONG tin0,tin1; |
298 | register DES_LONG tout0,tout1,xor0,xor1; | 298 | DES_LONG tout0,tout1,xor0,xor1; |
299 | register const unsigned char *in; | 299 | const unsigned char *in; |
300 | unsigned char *out; | 300 | unsigned char *out; |
301 | register long l=length; | 301 | long l=length; |
302 | DES_LONG tin[2]; | 302 | DES_LONG tin[2]; |
303 | unsigned char *iv; | 303 | unsigned char *iv; |
304 | 304 | ||
@@ -347,7 +347,7 @@ void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output, | |||
347 | } | 347 | } |
348 | else | 348 | else |
349 | { | 349 | { |
350 | register DES_LONG t0,t1; | 350 | DES_LONG t0,t1; |
351 | 351 | ||
352 | c2l(iv,xor0); | 352 | c2l(iv,xor0); |
353 | c2l(iv,xor1); | 353 | c2l(iv,xor1); |