From owner-svn-ports-head@freebsd.org Fri Dec 18 17:53:42 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 29822A4BB1E; Fri, 18 Dec 2015 17:53:42 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 00C3F11D3; Fri, 18 Dec 2015 17:53:41 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBIHrfKR070109; Fri, 18 Dec 2015 17:53:41 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBIHrete070107; Fri, 18 Dec 2015 17:53:40 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201512181753.tBIHrete070107@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 18 Dec 2015 17:53:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403981 - head/security/isakmpd/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2015 17:53:42 -0000 Author: feld Date: Fri Dec 18 17:53:40 2015 New Revision: 403981 URL: https://svnweb.freebsd.org/changeset/ports/403981 Log: security/isakmpd: Fix building with libressl PR: 198535 Added: head/security/isakmpd/files/patch-crypto.c (contents, props changed) head/security/isakmpd/files/patch-crypto.h (contents, props changed) Added: head/security/isakmpd/files/patch-crypto.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/isakmpd/files/patch-crypto.c Fri Dec 18 17:53:40 2015 (r403981) @@ -0,0 +1,82 @@ +--- crypto.c.orig 2004-06-14 11:55:41.000000000 +0200 ++++ crypto.c 2015-02-28 13:23:13.232107608 +0100 +@@ -100,7 +100,7 @@ + + /* Hmm, the function prototypes for des are really dumb */ + #ifdef __OpenBSD__ +-#define DC (des_cblock *) ++#define DC (DES_cblock *) + #else + #define DC (void *) + #endif +@@ -109,8 +109,8 @@ + des1_init(struct keystate *ks, u_int8_t *key, u_int16_t len) + { + /* des_set_key returns -1 for parity problems, and -2 for weak keys */ +- des_set_odd_parity(DC key); +- switch (des_set_key(DC key, ks->ks_des[0])) { ++ DES_set_odd_parity(DC key); ++ switch (DES_set_key(DC key, &ks->ks_des[0])) { + case -2: + return EWEAKKEY; + default: +@@ -121,14 +121,14 @@ + void + des1_encrypt(struct keystate *ks, u_int8_t *d, u_int16_t len) + { +- des_cbc_encrypt(DC d, DC d, len, ks->ks_des[0], DC ks->riv, ++ DES_cbc_encrypt(DC d, DC d, len, &ks->ks_des[0], DC ks->riv, + DES_ENCRYPT); + } + + void + des1_decrypt(struct keystate *ks, u_int8_t *d, u_int16_t len) + { +- des_cbc_encrypt(DC d, DC d, len, ks->ks_des[0], DC ks->riv, ++ DES_cbc_encrypt(DC d, DC d, len, &ks->ks_des[0], DC ks->riv, + DES_DECRYPT); + } + +@@ -136,14 +136,14 @@ + enum cryptoerr + des3_init(struct keystate *ks, u_int8_t *key, u_int16_t len) + { +- des_set_odd_parity(DC key); +- des_set_odd_parity(DC(key + 8)); +- des_set_odd_parity(DC(key + 16)); ++ DES_set_odd_parity(DC key); ++ DES_set_odd_parity(DC(key + 8)); ++ DES_set_odd_parity(DC(key + 16)); + + /* As of the draft Tripe-DES does not check for weak keys */ +- des_set_key(DC key, ks->ks_des[0]); +- des_set_key(DC(key + 8), ks->ks_des[1]); +- des_set_key(DC(key + 16), ks->ks_des[2]); ++ DES_set_key(DC key, &ks->ks_des[0]); ++ DES_set_key(DC(key + 8), &ks->ks_des[1]); ++ DES_set_key(DC(key + 16), &ks->ks_des[2]); + + return EOKAY; + } +@@ -154,8 +154,8 @@ + u_int8_t iv[MAXBLK]; + + memcpy(iv, ks->riv, ks->xf->blocksize); +- des_ede3_cbc_encrypt(DC data, DC data, len, ks->ks_des[0], +- ks->ks_des[1], ks->ks_des[2], DC iv, DES_ENCRYPT); ++ DES_ede3_cbc_encrypt(DC data, DC data, len, &ks->ks_des[0], ++ &ks->ks_des[1], &ks->ks_des[2], DC iv, DES_ENCRYPT); + } + + void +@@ -164,8 +164,8 @@ + u_int8_t iv[MAXBLK]; + + memcpy(iv, ks->riv, ks->xf->blocksize); +- des_ede3_cbc_encrypt(DC data, DC data, len, ks->ks_des[0], +- ks->ks_des[1], ks->ks_des[2], DC iv, DES_DECRYPT); ++ DES_ede3_cbc_encrypt(DC data, DC data, len, &ks->ks_des[0], ++ &ks->ks_des[1], &ks->ks_des[2], DC iv, DES_DECRYPT); + } + #undef DC + #endif /* USE_TRIPLEDES */ Added: head/security/isakmpd/files/patch-crypto.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/isakmpd/files/patch-crypto.h Fri Dec 18 17:53:40 2015 (r403981) @@ -0,0 +1,11 @@ +--- crypto.h.orig 2004-05-14 10:42:56.000000000 +0200 ++++ crypto.h 2015-02-28 13:01:05.491296206 +0100 +@@ -108,7 +108,7 @@ + u_int8_t iv2[MAXBLK]; + u_int8_t *riv, *liv; + union { +- des_key_schedule desks[3]; ++ DES_key_schedule desks[3]; + #ifdef USE_BLOWFISH + blf_ctx blfks; + #endif