diff options
author | rh <rh@pkgsrc.org> | 1999-12-08 13:57:42 +0000 |
---|---|---|
committer | rh <rh@pkgsrc.org> | 1999-12-08 13:57:42 +0000 |
commit | fb8e7a5c602816c843e328d404f101bf534d0e07 (patch) | |
tree | cd7f4b480ad7b23e93bf634816bf2f1b43d7dfac /net/ppp-mppe | |
parent | caf600989d2d79a814613d2ea4336c46f1e28655 (diff) | |
download | pkgsrc-fb8e7a5c602816c843e328d404f101bf534d0e07.tar.gz |
Update reachover dependency on openssl to 0.9.4
defuzz
Diffstat (limited to 'net/ppp-mppe')
-rw-r--r-- | net/ppp-mppe/Makefile | 30 | ||||
-rw-r--r-- | net/ppp-mppe/files/patch-sum | 10 | ||||
-rw-r--r-- | net/ppp-mppe/patches/patch-bh | 26 | ||||
-rw-r--r-- | net/ppp-mppe/patches/patch-bm | 22 | ||||
-rw-r--r-- | net/ppp-mppe/patches/patch-bx | 10 | ||||
-rw-r--r-- | net/ppp-mppe/patches/patch-by | 8 |
6 files changed, 53 insertions, 53 deletions
diff --git a/net/ppp-mppe/Makefile b/net/ppp-mppe/Makefile index 73a430d9e5c..1b52453f432 100644 --- a/net/ppp-mppe/Makefile +++ b/net/ppp-mppe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 1999/10/08 04:34:43 dbj Exp $ +# $NetBSD: Makefile,v 1.2 1999/12/08 13:57:42 rh Exp $ DISTNAME= ppp-2.3.9 PKGNAME= ppp-mppe-2.3.9 @@ -8,25 +8,27 @@ MASTER_SITES= ftp://cs.anu.edu.au/pub/software/ppp/ MAINTAINER= dbj@netbsd.org HOMEPAGE= http://www.moretonbay.com/vpn/releases/ -BUILD_DEPENDS= ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-0.9.2b/crypto/rc4:../../security/openssl:extract +OPENSSL_VER= 0.9.4 + +BUILD_DEPENDS= ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/rc4:../../security/openssl:extract HAS_CONFIGURE= yes MANCOMPRESSED_IF_MANZ= yes post-extract: @${MKDIR} ${WRKSRC}/netbsd-1.4 - @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-0.9.2b/crypto/sha/sha.h ${WRKSRC}/pppd/sha.h - @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-0.9.2b/crypto/sha/sha1dgst.c ${WRKSRC}/pppd/sha1dgst.c - @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-0.9.2b/crypto/sha/sha_locl.h ${WRKSRC}/pppd/sha_locl.h - @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-0.9.2b/crypto/opensslv.h ${WRKSRC}/pppd/opensslv.h - @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-0.9.2b/crypto/rc4/rc4_skey.c ${WRKSRC}/netbsd-1.4/rc4_skey.c - @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-0.9.2b/crypto/rc4/rc4.h ${WRKSRC}/netbsd-1.4/rc4.h - @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-0.9.2b/crypto/rc4/rc4_locl.h ${WRKSRC}/netbsd-1.4/rc4_locl.h - @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-0.9.2b/crypto/rc4/rc4_enc.c ${WRKSRC}/netbsd-1.4/rc4_enc.c - @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-0.9.2b/crypto/opensslv.h ${WRKSRC}/netbsd-1.4/opensslv.h - @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-0.9.2b/crypto/sha/sha1dgst.c ${WRKSRC}/netbsd-1.4/sha1dgst.c - @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-0.9.2b/crypto/sha/sha_locl.h ${WRKSRC}/netbsd-1.4/sha_locl.h - @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-0.9.2b/crypto/sha/sha.h ${WRKSRC}/netbsd-1.4/sha.h + @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/sha/sha.h ${WRKSRC}/pppd/sha.h + @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/sha/sha1dgst.c ${WRKSRC}/pppd/sha1dgst.c + @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/sha/sha_locl.h ${WRKSRC}/pppd/sha_locl.h + @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/opensslv.h ${WRKSRC}/pppd/opensslv.h + @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/rc4/rc4_skey.c ${WRKSRC}/netbsd-1.4/rc4_skey.c + @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/rc4/rc4.h ${WRKSRC}/netbsd-1.4/rc4.h + @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/rc4/rc4_locl.h ${WRKSRC}/netbsd-1.4/rc4_locl.h + @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/rc4/rc4_enc.c ${WRKSRC}/netbsd-1.4/rc4_enc.c + @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/opensslv.h ${WRKSRC}/netbsd-1.4/opensslv.h + @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/sha/sha1dgst.c ${WRKSRC}/netbsd-1.4/sha1dgst.c + @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/sha/sha_locl.h ${WRKSRC}/netbsd-1.4/sha_locl.h + @${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/sha/sha.h ${WRKSRC}/netbsd-1.4/sha.h @${MV} ${WRKSRC}/pppd/md4.h ${WRKSRC}/pppd/md4.h.hide @${MV} ${WRKSRC}/pppd/md5.h ${WRKSRC}/pppd/md5.h.hide diff --git a/net/ppp-mppe/files/patch-sum b/net/ppp-mppe/files/patch-sum index dd21b078e4f..65a1632cc24 100644 --- a/net/ppp-mppe/files/patch-sum +++ b/net/ppp-mppe/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.1 1999/11/11 17:23:24 dmcmahill Exp $ +$NetBSD: patch-sum,v 1.2 1999/12/08 13:57:43 rh Exp $ MD5 (patch-aa) = 5f9efcf826eceb65b448e0e38c98532d MD5 (patch-ab) = 8392c4c0cdb816bb14e5648fb1be80a2 @@ -28,12 +28,12 @@ MD5 (patch-bd) = 6d78e28ebf34c70edeeca1fe382a5c36 MD5 (patch-be) = 12cebfa5ec4ac236062a875011125f76 MD5 (patch-bf) = 0c2ce0e6ade04fcd024be9306ae4e99f MD5 (patch-bg) = 518fe5897807c33b8ea8e025c0a67932 -MD5 (patch-bh) = c7bfcbf556139e07431171e42c9d4d96 +MD5 (patch-bh) = 2c0b6f969bf84afdbe2c182f508c3db6 MD5 (patch-bi) = 0a1595cbe2b23314d6d69d85b50d0906 MD5 (patch-bj) = 9652b69f10c582e40e2d93c838a5cc18 MD5 (patch-bk) = 42f64a9e1d2f4d319b5bc96930a54567 MD5 (patch-bl) = 40b3bc6ba7e770b3b154771a039df11e -MD5 (patch-bm) = 71f882de43b57ee3ccafb4f39c806da9 +MD5 (patch-bm) = 0360df59f5869dbe03244d37aaad3e30 MD5 (patch-bn) = 3c6765df60a8ba71ac58a42fce76a4a4 MD5 (patch-bo) = dbf6d59091d6530abf88e1340b17d341 MD5 (patch-bp) = d7dbecdc45f65d1bc2d79d0b9bb1a355 @@ -44,8 +44,8 @@ MD5 (patch-bt) = e837bed871618115b33f3cfc2dd12bde MD5 (patch-bu) = cc269345ddc56fc2ae79f78cc34410ad MD5 (patch-bv) = 4264052342d9f49e9a597061ae20c032 MD5 (patch-bw) = bad7068e9a11f80d62c5c0bbd3ccd4e9 -MD5 (patch-bx) = 475dccf1bca65a439fd27a1b98b53f88 -MD5 (patch-by) = 8388b3045d42356da051fa8b86576144 +MD5 (patch-bx) = c5c1db004cfa269da7c897ff77c15212 +MD5 (patch-by) = 5ffc26cb35daf31e39725afa654f70be MD5 (patch-bz) = 79b1a33a575322e33eecdce343a9a456 MD5 (patch-ca) = 037ad1ae57c8df5718b9b80c7f2ef10a MD5 (patch-cb) = 3c7866418380f16dba4ba4dfe5442521 diff --git a/net/ppp-mppe/patches/patch-bh b/net/ppp-mppe/patches/patch-bh index 7d3aafc4237..28277b356d6 100644 --- a/net/ppp-mppe/patches/patch-bh +++ b/net/ppp-mppe/patches/patch-bh @@ -1,11 +1,11 @@ $NetBSD$ ---- pppd/chap_ms.c Mon Mar 15 19:14:24 1999 -+++ pppd/chap_ms.c Thu Jun 24 16:05:42 1999 -@@ -31,4 +31,12 @@ +--- pppd/chap_ms.c.orig Fri Aug 13 08:46:12 1999 ++++ pppd/chap_ms.c Wed Dec 8 14:52:48 1999 +@@ -31,6 +31,14 @@ * You should also use DOMAIN\\USERNAME as described in README.MSCHAP80 */ -+ + +/* + * Mods by Tim Hockin, Cobalt Networks Inc. <thockin@cobaltnet.com> June 1999 + * @@ -13,9 +13,11 @@ $NetBSD$ + * Migrated all MPPE code to mppe.c, shared crypto code to extra_crypto.c + * + */ ++ + #define RCSID "$Id: chap_ms.c,v 1.15 1999/08/13 06:46:12 paulus Exp $" - #ifndef lint -@@ -51,11 +59,13 @@ + #ifdef CHAPMS +@@ -49,11 +57,13 @@ #include "pppd.h" #include "chap.h" #include "chap_ms.h" @@ -31,8 +33,8 @@ $NetBSD$ #endif +#include "extra_crypto.h" - typedef struct { - u_char LANManResp[24]; + static const char rcsid[] = RCSID; + @@ -65,21 +75,19 @@ /* We use MS_CHAP_RESPONSE_LEN, rather than sizeof(MS_ChapResponse), in case this struct gets padded. */ @@ -265,8 +267,8 @@ $NetBSD$ +#ifdef MPPE + mppe_gen_master_key(secret, secret_len, rchallenge); +#endif - BCOPY(&response, cstate->response, MS_CHAP_RESPONSE_LEN); - cstate->resp_length = MS_CHAP_RESPONSE_LEN; ++ BCOPY(&response, cstate->response, MS_CHAP_RESPONSE_LEN); ++ cstate->resp_length = MS_CHAP_RESPONSE_LEN; +} + +int @@ -351,8 +353,8 @@ $NetBSD$ + cstate->resp_name, Challenge); + NtPasswordHash(Password, PasswordLen, PasswordHash); + ChallengeResponse(Challenge, PasswordHash, response.NTResp); -+ BCOPY(&response, cstate->response, MS_CHAP_RESPONSE_LEN); -+ cstate->resp_length = MS_CHAP_RESPONSE_LEN; + BCOPY(&response, cstate->response, MS_CHAP_RESPONSE_LEN); + cstate->resp_length = MS_CHAP_RESPONSE_LEN; +#ifdef MPPE + mppe_gen_master_key_v2(Password, PasswordLen, response.NTResp, 0); +#endif diff --git a/net/ppp-mppe/patches/patch-bm b/net/ppp-mppe/patches/patch-bm index 1ae4d8431d9..5aef63d7288 100644 --- a/net/ppp-mppe/patches/patch-bm +++ b/net/ppp-mppe/patches/patch-bm @@ -1,10 +1,10 @@ -$NetBSD: patch-bm,v 1.1.1.1 1999/10/08 04:34:43 dbj Exp $ +$NetBSD: patch-bm,v 1.2 1999/12/08 13:57:43 rh Exp $ ---- pppd/lcp.c.orig Wed May 12 17:33:32 1999 -+++ pppd/lcp.c Thu Jun 24 16:05:42 1999 +--- pppd/lcp.c.orig Fri Aug 13 08:46:14 1999 ++++ pppd/lcp.c Wed Dec 8 14:54:55 1999 @@ -35,6 +35,8 @@ - #include "chap.h" - #include "magic.h" + + static const char rcsid[] = RCSID; +extern bool refuse_chap; + @@ -15,7 +15,6 @@ $NetBSD: patch-bm,v 1.1.1.1 1999/10/08 04:34:43 dbj Exp $ wo->asyncmap = 0; wo->neg_chap = 0; /* Set to 1 on server */ wo->neg_upap = 0; /* Set to 1 on server */ -- wo->chap_mdtype = CHAP_DIGEST_MD5; + wo->use_digest = 1; +#ifdef CHAPMS + if(wo->use_chapms_v2) @@ -25,7 +24,7 @@ $NetBSD: patch-bm,v 1.1.1.1 1999/10/08 04:34:43 dbj Exp $ + else +#endif + if(wo->use_digest) -+ wo->chap_mdtype = CHAP_DIGEST_MD5; + wo->chap_mdtype = CHAP_DIGEST_MD5; + else + refuse_chap = 1; wo->neg_magicnumber = 1; @@ -43,7 +42,6 @@ $NetBSD: patch-bm,v 1.1.1.1 1999/10/08 04:34:43 dbj Exp $ ao->neg_asyncmap = 1; ao->asyncmap = 0; ao->neg_chap = 1; -- ao->chap_mdtype = CHAP_DIGEST_MD5; + ao->use_digest = 1; +#ifdef CHAPMS + ao->use_chapms_v2 = ao->use_chapms = 1; @@ -54,7 +52,7 @@ $NetBSD: patch-bm,v 1.1.1.1 1999/10/08 04:34:43 dbj Exp $ + else +#else + if(ao->use_digest) -+ ao->chap_mdtype = CHAP_DIGEST_MD5; + ao->chap_mdtype = CHAP_DIGEST_MD5; + else + refuse_chap = 1; +#endif @@ -120,8 +118,6 @@ $NetBSD: patch-bm,v 1.1.1.1 1999/10/08 04:34:43 dbj Exp $ /* Check rejected value. */ \ if (cishort != val || cichar != digest) \ goto bad; \ -- try.neg = 0; \ -- try.neg_upap = 0; \ + switch(digest) \ + { \ + case CHAP_MICROSOFT_V2: \ @@ -135,8 +131,8 @@ $NetBSD: patch-bm,v 1.1.1.1 1999/10/08 04:34:43 dbj Exp $ + } \ + if(!try.use_chapms_v2 && !try.use_chapms && !try.use_digest) \ + { \ -+ try.neg = 0; \ -+ try.neg_upap = 0; \ + try.neg = 0; \ + try.neg_upap = 0; \ + } \ } #define REJCILONG(opt, neg, val) \ diff --git a/net/ppp-mppe/patches/patch-bx b/net/ppp-mppe/patches/patch-bx index 1ab4e3af1c8..25f27de2f42 100644 --- a/net/ppp-mppe/patches/patch-bx +++ b/net/ppp-mppe/patches/patch-bx @@ -1,7 +1,7 @@ -$NetBSD: patch-bx,v 1.1.1.1 1999/10/08 04:34:43 dbj Exp $ +$NetBSD: patch-bx,v 1.2 1999/12/08 13:57:44 rh Exp $ ---- netbsd-1.4/sha_locl.h.orig Wed Sep 29 23:42:05 1999 -+++ netbsd-1.4/sha_locl.h Wed Sep 29 23:44:04 1999 +--- netbsd-1.4/sha_locl.h.orig Wed Dec 8 14:56:15 1999 ++++ netbsd-1.4/sha_locl.h Wed Dec 8 14:56:26 1999 @@ -56,8 +56,6 @@ * [including the GNU Public Licence.] */ @@ -9,5 +9,5 @@ $NetBSD: patch-bx,v 1.1.1.1 1999/10/08 04:34:43 dbj Exp $ -#include <stdlib.h> -#include <string.h> - #ifdef undef - /* one or the other needs to be defined */ + #include <openssl/opensslconf.h> + diff --git a/net/ppp-mppe/patches/patch-by b/net/ppp-mppe/patches/patch-by index bb05575c00e..654bf09f654 100644 --- a/net/ppp-mppe/patches/patch-by +++ b/net/ppp-mppe/patches/patch-by @@ -1,7 +1,7 @@ -$NetBSD: patch-by,v 1.1.1.1 1999/10/08 04:34:43 dbj Exp $ +$NetBSD: patch-by,v 1.2 1999/12/08 13:57:44 rh Exp $ ---- netbsd-1.4/sha1dgst.c.orig Wed Sep 29 23:42:05 1999 -+++ netbsd-1.4/sha1dgst.c Wed Sep 29 23:43:55 1999 +--- netbsd-1.4/sha1dgst.c.orig Wed Dec 8 14:56:15 1999 ++++ netbsd-1.4/sha1dgst.c Wed Dec 8 14:56:26 1999 @@ -56,8 +56,6 @@ * [including the GNU Public Licence.] */ @@ -10,4 +10,4 @@ $NetBSD: patch-by,v 1.1.1.1 1999/10/08 04:34:43 dbj Exp $ -#include <string.h> #undef SHA_0 #define SHA_1 - #include "sha.h" + #include <openssl/sha.h> |