diff options
Diffstat (limited to 'src/lib/libcrypto/des/fcrypt_b.c')
-rw-r--r-- | src/lib/libcrypto/des/fcrypt_b.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/lib/libcrypto/des/fcrypt_b.c b/src/lib/libcrypto/des/fcrypt_b.c index 1544634bc1..1390138787 100644 --- a/src/lib/libcrypto/des/fcrypt_b.c +++ b/src/lib/libcrypto/des/fcrypt_b.c | |||
@@ -58,7 +58,7 @@ | |||
58 | 58 | ||
59 | #include <stdio.h> | 59 | #include <stdio.h> |
60 | 60 | ||
61 | /* This version of crypt has been developed from my MIT compatable | 61 | /* This version of crypt has been developed from my MIT compatible |
62 | * DES library. | 62 | * DES library. |
63 | * The library is available at pub/Crypto/DES at ftp.psy.uq.oz.au | 63 | * The library is available at pub/Crypto/DES at ftp.psy.uq.oz.au |
64 | * Eric Young (eay@cryptsoft.com) | 64 | * Eric Young (eay@cryptsoft.com) |
@@ -77,15 +77,12 @@ | |||
77 | #define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\ | 77 | #define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\ |
78 | (a)=(a)^(t)^(t>>(16-(n))))\ | 78 | (a)=(a)^(t)^(t>>(16-(n))))\ |
79 | 79 | ||
80 | void fcrypt_body(out, ks, Eswap0, Eswap1) | 80 | void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0, |
81 | DES_LONG *out; | 81 | DES_LONG Eswap1) |
82 | des_key_schedule ks; | ||
83 | DES_LONG Eswap0; | ||
84 | DES_LONG Eswap1; | ||
85 | { | 82 | { |
86 | register DES_LONG l,r,t,u; | 83 | register DES_LONG l,r,t,u; |
87 | #ifdef DES_PTR | 84 | #ifdef DES_PTR |
88 | register unsigned char *des_SP=(unsigned char *)des_SPtrans; | 85 | register const unsigned char *des_SP=(const unsigned char *)DES_SPtrans; |
89 | #endif | 86 | #endif |
90 | register DES_LONG *s; | 87 | register DES_LONG *s; |
91 | register int j; | 88 | register int j; |
@@ -100,7 +97,7 @@ DES_LONG Eswap1; | |||
100 | 97 | ||
101 | for (j=0; j<25; j++) | 98 | for (j=0; j<25; j++) |
102 | { | 99 | { |
103 | #ifdef DES_UNROLL | 100 | #ifndef DES_UNROLL |
104 | register int i; | 101 | register int i; |
105 | 102 | ||
106 | for (i=0; i<32; i+=8) | 103 | for (i=0; i<32; i+=8) |