diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/des/cfb64ede.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/libcrypto/des/cfb64ede.c b/src/lib/libcrypto/des/cfb64ede.c index 5362a551bf..60c1aa08db 100644 --- a/src/lib/libcrypto/des/cfb64ede.c +++ b/src/lib/libcrypto/des/cfb64ede.c | |||
| @@ -63,9 +63,10 @@ | |||
| 63 | * 64bit block we have used is contained in *num; | 63 | * 64bit block we have used is contained in *num; |
| 64 | */ | 64 | */ |
| 65 | 65 | ||
| 66 | void des_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out, | 66 | void DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out, |
| 67 | long length, des_key_schedule ks1, des_key_schedule ks2, | 67 | long length, DES_key_schedule *ks1, |
| 68 | des_key_schedule ks3, des_cblock *ivec, int *num, int enc) | 68 | DES_key_schedule *ks2, DES_key_schedule *ks3, |
| 69 | DES_cblock *ivec, int *num, int enc) | ||
| 69 | { | 70 | { |
| 70 | register DES_LONG v0,v1; | 71 | register DES_LONG v0,v1; |
| 71 | register long l=length; | 72 | register long l=length; |
| @@ -85,7 +86,7 @@ void des_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out, | |||
| 85 | 86 | ||
| 86 | ti[0]=v0; | 87 | ti[0]=v0; |
| 87 | ti[1]=v1; | 88 | ti[1]=v1; |
| 88 | des_encrypt3(ti,ks1,ks2,ks3); | 89 | DES_encrypt3(ti,ks1,ks2,ks3); |
| 89 | v0=ti[0]; | 90 | v0=ti[0]; |
| 90 | v1=ti[1]; | 91 | v1=ti[1]; |
| 91 | 92 | ||
| @@ -111,7 +112,7 @@ void des_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out, | |||
| 111 | 112 | ||
| 112 | ti[0]=v0; | 113 | ti[0]=v0; |
| 113 | ti[1]=v1; | 114 | ti[1]=v1; |
| 114 | des_encrypt3(ti,ks1,ks2,ks3); | 115 | DES_encrypt3(ti,ks1,ks2,ks3); |
| 115 | v0=ti[0]; | 116 | v0=ti[0]; |
| 116 | v1=ti[1]; | 117 | v1=ti[1]; |
| 117 | 118 | ||
| @@ -132,10 +133,10 @@ void des_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out, | |||
| 132 | } | 133 | } |
| 133 | 134 | ||
| 134 | #ifdef undef /* MACRO */ | 135 | #ifdef undef /* MACRO */ |
| 135 | void des_ede2_cfb64_encrypt(unsigned char *in, unsigned char *out, long length, | 136 | void DES_ede2_cfb64_encrypt(unsigned char *in, unsigned char *out, long length, |
| 136 | des_key_schedule ks1, des_key_schedule ks2, des_cblock (*ivec), | 137 | DES_key_schedule ks1, DES_key_schedule ks2, DES_cblock (*ivec), |
| 137 | int *num, int enc) | 138 | int *num, int enc) |
| 138 | { | 139 | { |
| 139 | des_ede3_cfb64_encrypt(in,out,length,ks1,ks2,ks1,ivec,num,enc); | 140 | DES_ede3_cfb64_encrypt(in,out,length,ks1,ks2,ks1,ivec,num,enc); |
| 140 | } | 141 | } |
| 141 | #endif | 142 | #endif |
