diff options
Diffstat (limited to 'src/lib/libcrypto/des/ofb_enc.c')
-rw-r--r-- | src/lib/libcrypto/des/ofb_enc.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/lib/libcrypto/des/ofb_enc.c b/src/lib/libcrypto/des/ofb_enc.c index 4db0cdbd60..e887a3c6f4 100644 --- a/src/lib/libcrypto/des/ofb_enc.c +++ b/src/lib/libcrypto/des/ofb_enc.c | |||
@@ -64,13 +64,9 @@ | |||
64 | * the second. The second 12 bits will come from the 3rd and half the 4th | 64 | * the second. The second 12 bits will come from the 3rd and half the 4th |
65 | * byte. | 65 | * byte. |
66 | */ | 66 | */ |
67 | void des_ofb_encrypt(in, out, numbits, length, schedule, ivec) | 67 | void DES_ofb_encrypt(const unsigned char *in, unsigned char *out, int numbits, |
68 | unsigned char *in; | 68 | long length, DES_key_schedule *schedule, |
69 | unsigned char *out; | 69 | DES_cblock *ivec) |
70 | int numbits; | ||
71 | long length; | ||
72 | des_key_schedule schedule; | ||
73 | des_cblock (*ivec); | ||
74 | { | 70 | { |
75 | register DES_LONG d0,d1,vv0,vv1,v0,v1,n=(numbits+7)/8; | 71 | register DES_LONG d0,d1,vv0,vv1,v0,v1,n=(numbits+7)/8; |
76 | register DES_LONG mask0,mask1; | 72 | register DES_LONG mask0,mask1; |
@@ -97,7 +93,7 @@ des_cblock (*ivec); | |||
97 | mask1=0x00000000L; | 93 | mask1=0x00000000L; |
98 | } | 94 | } |
99 | 95 | ||
100 | iv=(unsigned char *)ivec; | 96 | iv = &(*ivec)[0]; |
101 | c2l(iv,v0); | 97 | c2l(iv,v0); |
102 | c2l(iv,v1); | 98 | c2l(iv,v1); |
103 | ti[0]=v0; | 99 | ti[0]=v0; |
@@ -106,7 +102,7 @@ des_cblock (*ivec); | |||
106 | { | 102 | { |
107 | ti[0]=v0; | 103 | ti[0]=v0; |
108 | ti[1]=v1; | 104 | ti[1]=v1; |
109 | des_encrypt((DES_LONG *)ti,schedule,DES_ENCRYPT); | 105 | DES_encrypt1((DES_LONG *)ti,schedule,DES_ENCRYPT); |
110 | vv0=ti[0]; | 106 | vv0=ti[0]; |
111 | vv1=ti[1]; | 107 | vv1=ti[1]; |
112 | c2ln(in,d0,d1,n); | 108 | c2ln(in,d0,d1,n); |
@@ -131,7 +127,7 @@ des_cblock (*ivec); | |||
131 | v1=((v1>>num)|(vv0<<(32-num)))&0xffffffffL; | 127 | v1=((v1>>num)|(vv0<<(32-num)))&0xffffffffL; |
132 | } | 128 | } |
133 | } | 129 | } |
134 | iv=(unsigned char *)ivec; | 130 | iv = &(*ivec)[0]; |
135 | l2c(v0,iv); | 131 | l2c(v0,iv); |
136 | l2c(v1,iv); | 132 | l2c(v1,iv); |
137 | v0=v1=d0=d1=ti[0]=ti[1]=vv0=vv1=0; | 133 | v0=v1=d0=d1=ti[0]=ti[1]=vv0=vv1=0; |