diff options
Diffstat (limited to 'src/lib/libcrypto/cast/c_ofb64.c')
-rw-r--r-- | src/lib/libcrypto/cast/c_ofb64.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/lib/libcrypto/cast/c_ofb64.c b/src/lib/libcrypto/cast/c_ofb64.c index 2aad2d6d96..fd0469a62f 100644 --- a/src/lib/libcrypto/cast/c_ofb64.c +++ b/src/lib/libcrypto/cast/c_ofb64.c | |||
@@ -56,20 +56,16 @@ | |||
56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
57 | */ | 57 | */ |
58 | 58 | ||
59 | #include "cast.h" | 59 | #include <openssl/cast.h> |
60 | #include "cast_lcl.h" | 60 | #include "cast_lcl.h" |
61 | 61 | ||
62 | /* The input and output encrypted as though 64bit ofb mode is being | 62 | /* The input and output encrypted as though 64bit ofb mode is being |
63 | * used. The extra state information to record how much of the | 63 | * used. The extra state information to record how much of the |
64 | * 64bit block we have used is contained in *num; | 64 | * 64bit block we have used is contained in *num; |
65 | */ | 65 | */ |
66 | void CAST_ofb64_encrypt(in, out, length, schedule, ivec, num) | 66 | void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out, |
67 | unsigned char *in; | 67 | long length, CAST_KEY *schedule, unsigned char *ivec, |
68 | unsigned char *out; | 68 | int *num) |
69 | long length; | ||
70 | CAST_KEY *schedule; | ||
71 | unsigned char *ivec; | ||
72 | int *num; | ||
73 | { | 69 | { |
74 | register CAST_LONG v0,v1,t; | 70 | register CAST_LONG v0,v1,t; |
75 | register int n= *num; | 71 | register int n= *num; |
@@ -80,7 +76,7 @@ int *num; | |||
80 | unsigned char *iv; | 76 | unsigned char *iv; |
81 | int save=0; | 77 | int save=0; |
82 | 78 | ||
83 | iv=(unsigned char *)ivec; | 79 | iv=ivec; |
84 | n2l(iv,v0); | 80 | n2l(iv,v0); |
85 | n2l(iv,v1); | 81 | n2l(iv,v1); |
86 | ti[0]=v0; | 82 | ti[0]=v0; |
@@ -105,7 +101,7 @@ int *num; | |||
105 | { | 101 | { |
106 | v0=ti[0]; | 102 | v0=ti[0]; |
107 | v1=ti[1]; | 103 | v1=ti[1]; |
108 | iv=(unsigned char *)ivec; | 104 | iv=ivec; |
109 | l2n(v0,iv); | 105 | l2n(v0,iv); |
110 | l2n(v1,iv); | 106 | l2n(v1,iv); |
111 | } | 107 | } |