diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2015-04-08 02:04:56 +0800 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2015-04-08 02:04:56 +0800 |
| commit | 9ec58fcb7751855dfeec3d6be974bd29df3f892d (patch) | |
| tree | 03ee3e60d4c2d0cbf7851dd0fcf1212963bebef2 /sysutils/condor | |
| parent | 02580c63c3600b37715c87210a90d06c90cf215d (diff) | |
| download | freebsd-ports-gnome-9ec58fcb7751855dfeec3d6be974bd29df3f892d.tar.gz freebsd-ports-gnome-9ec58fcb7751855dfeec3d6be974bd29df3f892d.tar.zst freebsd-ports-gnome-9ec58fcb7751855dfeec3d6be974bd29df3f892d.zip | |
sysutils/condor: replace deprecated des_ and fix LibreSSL build
The default build is unaffected.
PR: 198370
Submitted by: Bernard Spil
Approved by: maintainer (jwbacon@tds.net)
Diffstat (limited to 'sysutils/condor')
| -rw-r--r-- | sysutils/condor/files/patch-src__condor_includes__condor_crypt_3des.h | 11 | ||||
| -rw-r--r-- | sysutils/condor/files/patch-src__condor_io__condor_crypt_3des.cpp | 41 |
2 files changed, 52 insertions, 0 deletions
diff --git a/sysutils/condor/files/patch-src__condor_includes__condor_crypt_3des.h b/sysutils/condor/files/patch-src__condor_includes__condor_crypt_3des.h new file mode 100644 index 000000000000..ab44059c2465 --- /dev/null +++ b/sysutils/condor/files/patch-src__condor_includes__condor_crypt_3des.h @@ -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_; + }; diff --git a/sysutils/condor/files/patch-src__condor_io__condor_crypt_3des.cpp b/sysutils/condor/files/patch-src__condor_io__condor_crypt_3des.cpp new file mode 100644 index 000000000000..f5a3c31039de --- /dev/null +++ b/sysutils/condor/files/patch-src__condor_io__condor_crypt_3des.cpp @@ -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 + } |