diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/des/ofb64ede.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/src/lib/libcrypto/des/ofb64ede.c b/src/lib/libcrypto/des/ofb64ede.c index 4b1b0199f1..6eafe908da 100644 --- a/src/lib/libcrypto/des/ofb64ede.c +++ b/src/lib/libcrypto/des/ofb64ede.c | |||
| @@ -62,13 +62,10 @@ | |||
| 62 | * used. The extra state information to record how much of the | 62 | * used. The extra state information to record how much of the |
| 63 | * 64bit block we have used is contained in *num; | 63 | * 64bit block we have used is contained in *num; |
| 64 | */ | 64 | */ |
| 65 | void des_ede3_ofb64_encrypt(in, out, length, k1,k2,k3, ivec, num) | 65 | void des_ede3_ofb64_encrypt(register const unsigned char *in, |
| 66 | register unsigned char *in; | 66 | register unsigned char *out, long length, des_key_schedule k1, |
| 67 | register unsigned char *out; | 67 | des_key_schedule k2, des_key_schedule k3, des_cblock *ivec, |
| 68 | long length; | 68 | int *num) |
| 69 | des_key_schedule k1,k2,k3; | ||
| 70 | des_cblock (*ivec); | ||
| 71 | int *num; | ||
| 72 | { | 69 | { |
| 73 | register DES_LONG v0,v1; | 70 | register DES_LONG v0,v1; |
| 74 | register int n= *num; | 71 | register int n= *num; |
| @@ -79,7 +76,7 @@ int *num; | |||
| 79 | unsigned char *iv; | 76 | unsigned char *iv; |
| 80 | int save=0; | 77 | int save=0; |
| 81 | 78 | ||
| 82 | iv=(unsigned char *)ivec; | 79 | iv = &(*ivec)[0]; |
| 83 | c2l(iv,v0); | 80 | c2l(iv,v0); |
| 84 | c2l(iv,v1); | 81 | c2l(iv,v1); |
| 85 | ti[0]=v0; | 82 | ti[0]=v0; |
| @@ -93,7 +90,7 @@ int *num; | |||
| 93 | { | 90 | { |
| 94 | /* ti[0]=v0; */ | 91 | /* ti[0]=v0; */ |
| 95 | /* ti[1]=v1; */ | 92 | /* ti[1]=v1; */ |
| 96 | des_encrypt3((DES_LONG *)ti,k1,k2,k3); | 93 | des_encrypt3(ti,k1,k2,k3); |
| 97 | v0=ti[0]; | 94 | v0=ti[0]; |
| 98 | v1=ti[1]; | 95 | v1=ti[1]; |
| 99 | 96 | ||
| @@ -109,7 +106,7 @@ int *num; | |||
| 109 | { | 106 | { |
| 110 | /* v0=ti[0]; | 107 | /* v0=ti[0]; |
| 111 | v1=ti[1];*/ | 108 | v1=ti[1];*/ |
| 112 | iv=(unsigned char *)ivec; | 109 | iv = &(*ivec)[0]; |
| 113 | l2c(v0,iv); | 110 | l2c(v0,iv); |
| 114 | l2c(v1,iv); | 111 | l2c(v1,iv); |
| 115 | } | 112 | } |
| @@ -118,13 +115,9 @@ int *num; | |||
| 118 | } | 115 | } |
| 119 | 116 | ||
| 120 | #ifdef undef /* MACRO */ | 117 | #ifdef undef /* MACRO */ |
| 121 | void des_ede2_ofb64_encrypt(in, out, length, k1,k2, ivec, num) | 118 | void des_ede2_ofb64_encrypt(register unsigned char *in, |
| 122 | register unsigned char *in; | 119 | register unsigned char *out, long length, des_key_schedule k1, |
| 123 | register unsigned char *out; | 120 | des_key_schedule k2, des_cblock (*ivec), int *num) |
| 124 | long length; | ||
| 125 | des_key_schedule k1,k2; | ||
| 126 | des_cblock (*ivec); | ||
| 127 | int *num; | ||
| 128 | { | 121 | { |
| 129 | des_ede3_ofb64_encrypt(in, out, length, k1,k2,k1, ivec, num); | 122 | des_ede3_ofb64_encrypt(in, out, length, k1,k2,k1, ivec, num); |
| 130 | } | 123 | } |
