Date: Tue, 7 Apr 2015 18:04:57 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383528 - head/sysutils/condor/files Message-ID: <201504071804.t37I4vXV064663@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Tue Apr 7 18:04:56 2015 New Revision: 383528 URL: https://svnweb.freebsd.org/changeset/ports/383528 Log: 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) Added: head/sysutils/condor/files/patch-src__condor_includes__condor_crypt_3des.h (contents, props changed) head/sysutils/condor/files/patch-src__condor_io__condor_crypt_3des.cpp (contents, props changed) Added: head/sysutils/condor/files/patch-src__condor_includes__condor_crypt_3des.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/condor/files/patch-src__condor_includes__condor_crypt_3des.h Tue Apr 7 18:04:56 2015 (r383528) @@ -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_; + }; Added: head/sysutils/condor/files/patch-src__condor_io__condor_crypt_3des.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/condor/files/patch-src__condor_io__condor_crypt_3des.cpp Tue Apr 7 18:04:56 2015 (r383528) @@ -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 + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504071804.t37I4vXV064663>