freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sysutils/condor: replace deprecated des_ and fix LibreSSL build

Browse Source 
The default build is unaffected.

PR:		198370
Submitted by:	Bernard Spil
Approved by:	maintainer (jwbacon@tds.net)
This commit is contained in:
Rene Ladan
2015-04-07 18:04:56 +00:00
parent 02580c63c3
commit 9ec58fcb77
2 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sysutils/condor/files/patch-src__condor_includes__condor_crypt_3des.h Normal file
View File

@@ -0,0 +1,11 @@
--- src/condor_includes/condor_crypt_3des.h.orig 2014-12-09 23:15:18.000000000 +0100
+++ src/condor_includes/condor_crypt_3des.h 2015-02-28 19:35:54.722059602 +0100
@@ -61,7 +61,7 @@
//------------------------------------------
// Private constructor
//------------------------------------------
- des_key_schedule keySchedule1_, keySchedule2_, keySchedule3_;
+ DES_key_schedule keySchedule1_, keySchedule2_, keySchedule3_;
unsigned char ivec_[8];
int num_;
};

41
sysutils/condor/files/patch-src__condor_io__condor_crypt_3des.cpp Normal file
View File

@@ -0,0 +1,41 @@
--- src/condor_io/condor_crypt_3des.cpp.orig 2014-12-09 23:15:18.000000000 +0100
+++ src/condor_io/condor_crypt_3des.cpp 2015-02-28 19:38:25.216863132 +0100
@@ -35,9 +35,9 @@
unsigned char * keyData = k.getPaddedKeyData(24);
ASSERT(keyData);
- des_set_key((des_cblock *) keyData , keySchedule1_);
- des_set_key((des_cblock *) (keyData+8) , keySchedule2_);
- des_set_key((des_cblock *) (keyData+16), keySchedule3_);
+ DES_set_key((DES_cblock *) keyData , &keySchedule1_);
+ DES_set_key((DES_cblock *) (keyData+8) , &keySchedule2_);
+ DES_set_key((DES_cblock *) (keyData+16), &keySchedule3_);
// initialize ivsec
resetState();
@@ -71,9 +71,9 @@
output = (unsigned char *) malloc(input_len);
if (output) {
- des_ede3_cfb64_encrypt(input, output, output_len,
- keySchedule1_, keySchedule2_, keySchedule3_,
- (des_cblock *)ivec_, &num_, DES_ENCRYPT);
+ DES_ede3_cfb64_encrypt(input, output, output_len,
+ &keySchedule1_, &keySchedule2_, &keySchedule3_,
+ (DES_cblock *)ivec_, &num_, DES_ENCRYPT);
return true;
}
else {
@@ -95,9 +95,9 @@
if (output) {
output_len = input_len;
- des_ede3_cfb64_encrypt(input, output, output_len,
- keySchedule1_, keySchedule2_, keySchedule3_,
- (des_cblock *)ivec_, &num_, DES_DECRYPT);
+ DES_ede3_cfb64_encrypt(input, output, output_len,
+ &keySchedule1_, &keySchedule2_, &keySchedule3_,
+ (DES_cblock *)ivec_, &num_, DES_DECRYPT);
return true; // Should be changed
}