|
Line 0
Link Here
|
|
|
1 |
--- src/condor_io/condor_crypt_3des.cpp.orig 2014-12-09 23:15:18.000000000 +0100 |
| 2 |
+++ src/condor_io/condor_crypt_3des.cpp 2015-02-28 19:38:25.216863132 +0100 |
| 3 |
@@ -35,9 +35,9 @@ |
| 4 |
unsigned char * keyData = k.getPaddedKeyData(24); |
| 5 |
ASSERT(keyData); |
| 6 |
|
| 7 |
- des_set_key((des_cblock *) keyData , keySchedule1_); |
| 8 |
- des_set_key((des_cblock *) (keyData+8) , keySchedule2_); |
| 9 |
- des_set_key((des_cblock *) (keyData+16), keySchedule3_); |
| 10 |
+ DES_set_key((DES_cblock *) keyData , &keySchedule1_); |
| 11 |
+ DES_set_key((DES_cblock *) (keyData+8) , &keySchedule2_); |
| 12 |
+ DES_set_key((DES_cblock *) (keyData+16), &keySchedule3_); |
| 13 |
|
| 14 |
// initialize ivsec |
| 15 |
resetState(); |
| 16 |
@@ -71,9 +71,9 @@ |
| 17 |
output = (unsigned char *) malloc(input_len); |
| 18 |
|
| 19 |
if (output) { |
| 20 |
- des_ede3_cfb64_encrypt(input, output, output_len, |
| 21 |
- keySchedule1_, keySchedule2_, keySchedule3_, |
| 22 |
- (des_cblock *)ivec_, &num_, DES_ENCRYPT); |
| 23 |
+ DES_ede3_cfb64_encrypt(input, output, output_len, |
| 24 |
+ &keySchedule1_, &keySchedule2_, &keySchedule3_, |
| 25 |
+ (DES_cblock *)ivec_, &num_, DES_ENCRYPT); |
| 26 |
return true; |
| 27 |
} |
| 28 |
else { |
| 29 |
@@ -95,9 +95,9 @@ |
| 30 |
if (output) { |
| 31 |
output_len = input_len; |
| 32 |
|
| 33 |
- des_ede3_cfb64_encrypt(input, output, output_len, |
| 34 |
- keySchedule1_, keySchedule2_, keySchedule3_, |
| 35 |
- (des_cblock *)ivec_, &num_, DES_DECRYPT); |
| 36 |
+ DES_ede3_cfb64_encrypt(input, output, output_len, |
| 37 |
+ &keySchedule1_, &keySchedule2_, &keySchedule3_, |
| 38 |
+ (DES_cblock *)ivec_, &num_, DES_DECRYPT); |
| 39 |
|
| 40 |
return true; // Should be changed |
| 41 |
} |