Permalink
Browse files

* Fixed a potential security issue in parsing option files (CVE-2014-…

…3158).

* There is a new "stop-bits" option, which takes an argument of 1 or 2,
  indicating the number of stop bits to use for async serial ports.
* Various bug fixes.
  • Loading branch information...
1 parent 790dd16 commit 213ecf12303e0f089d05e0d01c55b46f39134070 christos committed Oct 25, 2014
Showing with 45 additions and 45 deletions.
  1. +1 −1 external/bsd/ppp/dist/PLUGINS
  2. +1 −1 external/bsd/ppp/dist/chat/chat.8
  3. +1 −1 external/bsd/ppp/dist/chat/chat.c
  4. +1 −1 external/bsd/ppp/dist/pppd/auth.c
  5. +1 −1 external/bsd/ppp/dist/pppd/cbcp.c
  6. +1 −1 external/bsd/ppp/dist/pppd/ccp.c
  7. +1 −1 external/bsd/ppp/dist/pppd/ccp.h
  8. +1 −1 external/bsd/ppp/dist/pppd/chap-md5.c
  9. +1 −1 external/bsd/ppp/dist/pppd/chap-new.c
  10. +1 −1 external/bsd/ppp/dist/pppd/chap_ms.c
  11. +1 −1 external/bsd/ppp/dist/pppd/chap_ms.h
  12. +1 −1 external/bsd/ppp/dist/pppd/demand.c
  13. +1 −1 external/bsd/ppp/dist/pppd/eap.c
  14. +1 −1 external/bsd/ppp/dist/pppd/eap.h
  15. +1 −1 external/bsd/ppp/dist/pppd/ecp.c
  16. +1 −1 external/bsd/ppp/dist/pppd/ecp.h
  17. +2 −2 external/bsd/ppp/dist/pppd/eui64.c
  18. +1 −1 external/bsd/ppp/dist/pppd/eui64.h
  19. +1 −1 external/bsd/ppp/dist/pppd/fsm.c
  20. +1 −1 external/bsd/ppp/dist/pppd/fsm.h
  21. +1 −1 external/bsd/ppp/dist/pppd/ipcp.c
  22. +1 −1 external/bsd/ppp/dist/pppd/ipcp.h
  23. +2 −2 external/bsd/ppp/dist/pppd/ipv6cp.c
  24. +1 −1 external/bsd/ppp/dist/pppd/ipv6cp.h
  25. +1 −1 external/bsd/ppp/dist/pppd/ipxcp.c
  26. +1 −1 external/bsd/ppp/dist/pppd/ipxcp.h
  27. +1 −1 external/bsd/ppp/dist/pppd/lcp.c
  28. +1 −1 external/bsd/ppp/dist/pppd/lcp.h
  29. +1 −1 external/bsd/ppp/dist/pppd/magic.c
  30. +1 −1 external/bsd/ppp/dist/pppd/magic.h
  31. +1 −1 external/bsd/ppp/dist/pppd/main.c
  32. +1 −1 external/bsd/ppp/dist/pppd/options.c
  33. +1 −1 external/bsd/ppp/dist/pppd/pathnames.h
  34. +1 −1 external/bsd/ppp/dist/pppd/pppd.8
  35. +1 −1 external/bsd/ppp/dist/pppd/pppd.h
  36. +1 −1 external/bsd/ppp/dist/pppd/tty.c
  37. +1 −1 external/bsd/ppp/dist/pppd/upap.c
  38. +1 −1 external/bsd/ppp/dist/pppd/upap.h
  39. +1 −1 external/bsd/ppp/dist/pppd/utils.c
  40. +1 −1 external/bsd/ppp/dist/pppdump/deflate.c
  41. +1 −1 external/bsd/ppp/dist/pppdump/pppdump.8
  42. +1 −1 external/bsd/ppp/dist/pppstats/pppstats.8
  43. +1 −1 external/bsd/ppp/dist/pppstats/pppstats.c
@@ -284,4 +284,4 @@ Here is a list of the currently-implemented notifiers in pppd.
-## $Id: PLUGINS,v 1.1.1.2 2014/10/25 18:43:25 christos Exp $ ##
+## Id: PLUGINS,v 1.8 2008/06/15 07:02:18 paulus Exp ##
@@ -1,6 +1,6 @@
.\" -*- nroff -*-
.\" manual page [] for chat 1.8
-.\" $Id: chat.8,v 1.1.1.2 2014/10/25 18:43:25 christos Exp $
+.\" Id: chat.8,v 1.11 2004/11/13 12:22:49 paulus Exp
.\" SH section heading
.\" SS subsection heading
.\" LP paragraph
@@ -87,7 +87,7 @@
#endif
#ifndef lint
-static const char rcsid[] = "$Id: chat.c,v 1.1.1.2 2014/10/25 18:43:26 christos Exp $";
+static const char rcsid[] = "Id: chat.c,v 1.30 2004/01/17 05:47:55 carlsonj Exp ";
#endif
#include <stdio.h>
@@ -68,7 +68,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: auth.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $"
+#define RCSID "Id: auth.c,v 1.117 2008/07/01 12:27:56 paulus Exp "
#include <stdio.h>
#include <stddef.h>
@@ -33,7 +33,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: cbcp.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $"
+#define RCSID "Id: cbcp.c,v 1.17 2006/05/22 00:04:07 paulus Exp "
#include <stdio.h>
#include <string.h>
@@ -28,7 +28,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: ccp.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $"
+#define RCSID "Id: ccp.c,v 1.50 2005/06/26 19:34:41 carlsonj Exp "
#include <stdlib.h>
#include <string.h>
@@ -27,7 +27,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ccp.h,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $
+ * Id: ccp.h,v 1.12 2004/11/04 10:02:26 paulus Exp
*/
typedef struct ccp_options {
@@ -28,7 +28,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: chap-md5.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $"
+#define RCSID "Id: chap-md5.c,v 1.4 2004/11/09 22:39:25 paulus Exp "
#include <stdlib.h>
#include <string.h>
@@ -28,7 +28,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: chap-new.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $"
+#define RCSID "Id: chap-new.c,v 1.9 2007/06/19 02:08:35 carlsonj Exp "
#include <stdlib.h>
#include <string.h>
@@ -74,7 +74,7 @@
*
*/
-#define RCSID "$Id: chap_ms.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $"
+#define RCSID "Id: chap_ms.c,v 1.38 2007/12/01 20:10:51 carlsonj Exp "
#ifdef CHAPMS
@@ -27,7 +27,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: chap_ms.h,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $
+ * Id: chap_ms.h,v 1.13 2004/11/15 22:13:26 paulus Exp
*/
#ifndef __CHAPMS_INCLUDE__
@@ -28,7 +28,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: demand.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $"
+#define RCSID "Id: demand.c,v 1.20 2005/08/25 12:14:18 paulus Exp "
#include <stdio.h>
#include <stdlib.h>
@@ -43,7 +43,7 @@
* Based on draft-ietf-pppext-eap-srp-03.txt.
*/
-#define RCSID "$Id: eap.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $"
+#define RCSID "Id: eap.c,v 1.4 2004/11/09 22:39:25 paulus Exp "
/*
* TODO:
@@ -17,7 +17,7 @@
*
* Original version by James Carlson
*
- * $Id: eap.h,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $
+ * Id: eap.h,v 1.2 2003/06/11 23:56:26 paulus Exp
*/
#ifndef PPP_EAP_H
@@ -57,7 +57,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: ecp.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $"
+#define RCSID "Id: ecp.c,v 1.4 2004/11/04 10:02:26 paulus Exp "
static const char rcsid[] = RCSID;
@@ -28,7 +28,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ecp.h,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $
+ * Id: ecp.h,v 1.2 2003/01/10 07:12:36 fcusack Exp
*/
typedef struct ecp_options {
@@ -32,10 +32,10 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: eui64.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $
+ * Id: eui64.c,v 1.6 2002/12/04 23:03:32 paulus Exp
*/
-#define RCSID "$Id: eui64.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $"
+#define RCSID "Id: eui64.c,v 1.6 2002/12/04 23:03:32 paulus Exp "
#include "pppd.h"
@@ -32,7 +32,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: eui64.h,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $
+ * Id: eui64.h,v 1.6 2002/12/04 23:03:32 paulus Exp
*/
#ifndef __EUI64_H__
@@ -40,7 +40,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: fsm.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $"
+#define RCSID "Id: fsm.c,v 1.23 2004/11/13 02:28:15 paulus Exp "
/*
* TODO:
@@ -39,7 +39,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: fsm.h,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $
+ * Id: fsm.h,v 1.10 2004/11/13 02:28:15 paulus Exp
*/
/*
@@ -40,7 +40,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: ipcp.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $"
+#define RCSID "Id: ipcp.c,v 1.73 2008/05/26 08:33:22 paulus Exp "
/*
* TODO:
@@ -39,7 +39,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ipcp.h,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $
+ * Id: ipcp.h,v 1.14 2002/12/04 23:03:32 paulus Exp
*/
/*
@@ -135,10 +135,10 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ipv6cp.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $
+ * Id: ipv6cp.c,v 1.21 2005/08/25 23:59:34 paulus Exp
*/
-#define RCSID "$Id: ipv6cp.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $"
+#define RCSID "Id: ipv6cp.c,v 1.21 2005/08/25 23:59:34 paulus Exp "
/*
* TODO:
@@ -135,7 +135,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ipv6cp.h,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $
+ * Id: ipv6cp.h,v 1.7 2002/12/04 23:03:32 paulus Exp
*/
/*
@@ -42,7 +42,7 @@
#ifdef IPX_CHANGE
-#define RCSID "$Id: ipxcp.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $"
+#define RCSID "Id: ipxcp.c,v 1.24 2005/08/25 23:59:34 paulus Exp "
/*
* TODO:
@@ -39,7 +39,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ipxcp.h,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $
+ * Id: ipxcp.h,v 1.5 2002/12/04 23:03:32 paulus Exp
*/
/*
@@ -40,7 +40,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: lcp.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $"
+#define RCSID "Id: lcp.c,v 1.76 2006/05/22 00:04:07 paulus Exp "
/*
* TODO:
@@ -39,7 +39,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: lcp.h,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $
+ * Id: lcp.h,v 1.20 2004/11/14 22:53:42 carlsonj Exp
*/
/*
@@ -40,7 +40,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: magic.c,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $"
+#define RCSID "Id: magic.c,v 1.11 2003/06/11 23:56:26 paulus Exp "
#include <stdio.h>
#include <stdlib.h>
@@ -39,7 +39,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: magic.h,v 1.1.1.2 2014/10/25 18:43:28 christos Exp $
+ * Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp
*/
void magic_init __P((void)); /* Initialize the magic number generator */
@@ -66,7 +66,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: main.c,v 1.1.1.2 2014/10/25 18:43:29 christos Exp $"
+#define RCSID "Id: main.c,v 1.156 2008/06/23 11:47:18 paulus Exp "
#include <stdio.h>
#include <ctype.h>
@@ -40,7 +40,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: options.c,v 1.1.1.2 2014/10/25 18:43:29 christos Exp $"
+#define RCSID "Id: options.c,v 1.102 2008/06/15 06:53:06 paulus Exp "
#include <ctype.h>
#include <stdio.h>
@@ -1,7 +1,7 @@
/*
* define path names
*
- * $Id: pathnames.h,v 1.1.1.2 2014/10/25 18:43:29 christos Exp $
+ * Id: pathnames.h,v 1.18 2005/08/25 23:59:34 paulus Exp
*/
#ifdef HAVE_PATHS_H
@@ -1,5 +1,5 @@
.\" manual page [] for pppd 2.4
-.\" $Id: pppd.8,v 1.1.1.2 2014/10/25 18:43:29 christos Exp $
+.\" Id: pppd.8,v 1.90 2008/03/26 12:09:40 paulus Exp
.\" SH section heading
.\" SS subsection heading
.\" LP paragraph
@@ -39,7 +39,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: pppd.h,v 1.1.1.2 2014/10/25 18:43:29 christos Exp $
+ * Id: pppd.h,v 1.96 2008/06/23 11:47:18 paulus Exp
*/
/*
@@ -68,7 +68,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: tty.c,v 1.1.1.2 2014/10/25 18:43:29 christos Exp $"
+#define RCSID "Id: tty.c,v 1.27 2008/07/01 12:27:56 paulus Exp "
#include <stdio.h>
#include <ctype.h>
@@ -40,7 +40,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: upap.c,v 1.1.1.2 2014/10/25 18:43:29 christos Exp $"
+#define RCSID "Id: upap.c,v 1.30 2005/07/13 10:41:58 paulus Exp "
/*
* TODO:
@@ -39,7 +39,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: upap.h,v 1.1.1.2 2014/10/25 18:43:29 christos Exp $
+ * Id: upap.h,v 1.8 2002/12/04 23:03:33 paulus Exp
*/
/*
@@ -28,7 +28,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: utils.c,v 1.1.1.2 2014/10/25 18:43:29 christos Exp $"
+#define RCSID "Id: utils.c,v 1.25 2008/06/03 12:06:37 paulus Exp "
#include <stdio.h>
#include <ctype.h>
@@ -33,7 +33,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: deflate.c,v 1.1.1.2 2014/10/25 18:43:27 christos Exp $
+ * Id: deflate.c,v 1.5 2004/01/17 05:47:55 carlsonj Exp
*/
#include <sys/types.h>
@@ -1,4 +1,4 @@
-.\" @(#) $Id: pppdump.8,v 1.1.1.2 2014/10/25 18:43:27 christos Exp $
+.\" @(#) Id: pppdump.8,v 1.2 2004/11/13 12:22:49 paulus Exp
.TH PPPDUMP 8 "1 April 1999"
.SH NAME
pppdump \- convert PPP record file to readable format
@@ -1,4 +1,4 @@
-.\" @(#) $Id: pppstats.8,v 1.1.1.2 2014/10/25 18:43:30 christos Exp $
+.\" @(#) Id: pppstats.8,v 1.4 2004/11/13 12:22:49 paulus Exp
.TH PPPSTATS 8 "26 June 1995"
.SH NAME
pppstats \- print PPP statistics
@@ -36,7 +36,7 @@
#endif
#ifndef lint
-static const char rcsid[] = "$Id: pppstats.c,v 1.1.1.2 2014/10/25 18:43:30 christos Exp $";
+static const char rcsid[] = "Id: pppstats.c,v 1.29 2002/10/27 12:56:26 fcusack Exp ";
#endif
#include <stdio.h>

0 comments on commit 213ecf1

Please sign in to comment.