From owner-svn-src-user@freebsd.org Mon Feb 1 07:39:59 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 09C80A979F2
for <svn-src-user@mailman.ysv.freebsd.org>;
Mon, 1 Feb 2016 07:39:59 +0000 (UTC) (envelope-from pho@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 B5114A5C;
Mon, 1 Feb 2016 07:39:58 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u117dvbm084914;
Mon, 1 Feb 2016 07:39:57 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u117dvlr084911;
Mon, 1 Feb 2016 07:39:57 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201602010739.u117dvlr084911@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Mon, 1 Feb 2016 07:39:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295120 - in user/pho/stress2: . misc
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2016 07:39:59 -0000
Author: pho
Date: Mon Feb 1 07:39:57 2016
New Revision: 295120
URL: https://svnweb.freebsd.org/changeset/base/295120
Log:
Delete old and outdated syscall fuzzing tests. syscall4.sh is the current syscall
fuzzer.
Explain how to run syscall fuzzing as root, if you really must.
Fix a single style issue in syscall4.sh
Sponsored by: EMC / Isilon Storage Division
Deleted:
user/pho/stress2/misc/syscall.sh
user/pho/stress2/misc/syscall2.sh
user/pho/stress2/misc/syscall3.sh
Modified:
user/pho/stress2/README
user/pho/stress2/misc/syscall4.sh
Modified: user/pho/stress2/README
==============================================================================
--- user/pho/stress2/README Mon Feb 1 07:15:31 2016 (r295119)
+++ user/pho/stress2/README Mon Feb 1 07:39:57 2016 (r295120)
@@ -4,12 +4,10 @@ This is the FreeBSD kernel stress test s
computer, by stressing selected parts of the kernel, thus exposing inadequate
error handling.
-Do not run the syscall test as root.
-
To build and use:
make
-sh ./run.sh
+sh ./run.sh (see stress2/misc)
The "run.sh" script accepts an optional configuration file in order to test specific areas.
For example:
@@ -40,6 +38,14 @@ To run all of these tests once, type "./
The default mode is to compile tests, but pre-build binaries may be used.
See default.cfg for details.
+There may sometimes be a need for running single syscall fuzzing as root.
+This can be achieved by setting the environment variable "USE_ROOT",
+before running misc/syscall4.sh. For example:
+$ ./syscall4.sh 6
+$ USE_ROOT= ./syscall4.sh 6
+Running syscall4 as root for 6.
+$
+
The name stress2 indicates that this is the second generation of the Kernel Stress Test Suite.
The first version (stress) was based mostly on scripts.
Modified: user/pho/stress2/misc/syscall4.sh
==============================================================================
--- user/pho/stress2/misc/syscall4.sh Mon Feb 1 07:15:31 2016 (r295119)
+++ user/pho/stress2/misc/syscall4.sh Mon Feb 1 07:39:57 2016 (r295120)
@@ -236,7 +236,7 @@ test(void *arg __unused)
if ((fd[i] = open(p->fts_path, O_RDONLY)) == -1)
continue;
i++;
- i = i % 900;
+ i = i % nitems(fd);
}
if (fts_close(fts) == -1)
@@ -309,8 +309,9 @@ main(int argc, char **argv)
if ((pw = getpwnam("nobody")) == NULL)
err(1, "no such user: nobody");
- if (getenv("USE_ROOT"))
- fprintf(stderr, "Running syscall4 as root.\n");
+ if (getenv("USE_ROOT") && argc == 2)
+ fprintf(stderr, "Running syscall4 as root for %s.\n",
+ argv[1]);
else {
if (setgroups(1, &pw->pw_gid) ||
setegid(pw->pw_gid) || setgid(pw->pw_gid) ||
From owner-svn-src-user@freebsd.org Wed Feb 3 01:49:04 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 5EE90A99C02
for <svn-src-user@mailman.ysv.freebsd.org>;
Wed, 3 Feb 2016 01:49:04 +0000 (UTC)
(envelope-from ngie@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 17DD21F27;
Wed, 3 Feb 2016 01:49:04 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u131n3YF048812;
Wed, 3 Feb 2016 01:49:03 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u131n3FN048811;
Wed, 3 Feb 2016 01:49:03 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602030149.u131n3FN048811@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 3 Feb 2016 01:49:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295185 - user/ngie/bsnmp_cleanup
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 01:49:04 -0000
Author: ngie
Date: Wed Feb 3 01:49:02 2016
New Revision: 295185
URL: https://svnweb.freebsd.org/changeset/base/295185
Log:
Create a branch for cleaning up bsnmp warnings so I can disable NO_WERROR on this component on all archs
Added:
- copied from r295184, head/
Directory Properties:
user/ngie/bsnmp_cleanup/ (props changed)
From owner-svn-src-user@freebsd.org Wed Feb 3 01:58:39 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 48959A99FE1
for <svn-src-user@mailman.ysv.freebsd.org>;
Wed, 3 Feb 2016 01:58:39 +0000 (UTC)
(envelope-from ngie@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 1AB3A9F8;
Wed, 3 Feb 2016 01:58:39 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u131wcF0051805;
Wed, 3 Feb 2016 01:58:38 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u131wcru051804;
Wed, 3 Feb 2016 01:58:38 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602030158.u131wcru051804@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 3 Feb 2016 01:58:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295187 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 01:58:39 -0000
Author: ngie
Date: Wed Feb 3 01:58:37 2016
New Revision: 295187
URL: https://svnweb.freebsd.org/changeset/base/295187
Log:
Use nitems(string) instead of strlen(nexttok) + 1 to mute a valid
security concern with strlcpy related to the source/destination
buffer sizes (-Wstrlcpy-strlcat-size)
Reported by: Jenkins (clang job)
Sponsored by: EMC / Isilon Storage Division
Modified:
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c Wed Feb 3 01:50:27 2016 (r295186)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c Wed Feb 3 01:58:37 2016 (r295187)
@@ -775,7 +775,7 @@ snmp_import_object(struct snmp_toolinfo
}
memset(oid2str, 0, sizeof(struct snmp_oid2str));
- strlcpy(string, nexttok, strlen(nexttok) + 1);
+ strlcpy(string, nexttok, nitems(string));
oid2str->string = string;
oid2str->strlen = strlen(nexttok);
From owner-svn-src-user@freebsd.org Wed Feb 3 02:00:21 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 7D143A9A059
for <svn-src-user@mailman.ysv.freebsd.org>;
Wed, 3 Feb 2016 02:00:21 +0000 (UTC)
(envelope-from ngie@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 4F0C7B22;
Wed, 3 Feb 2016 02:00:21 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1320KRH051934;
Wed, 3 Feb 2016 02:00:20 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1320KMh051933;
Wed, 3 Feb 2016 02:00:20 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602030200.u1320KMh051933@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 3 Feb 2016 02:00:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295188 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 02:00:21 -0000
Author: ngie
Date: Wed Feb 3 02:00:20 2016
New Revision: 295188
URL: https://svnweb.freebsd.org/changeset/base/295188
Log:
Use destination buffer instead of source buffer size to mute valid
security concerns with strlcpy related to their respective buffer
sizes (-Wstrlcpy-strlcat-size)
Reported by: Jenkins (clang job)
Sponsored by: EMC / Isilon Storage Division
Modified:
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c Wed Feb 3 01:58:37 2016 (r295187)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c Wed Feb 3 02:00:20 2016 (r295188)
@@ -283,7 +283,7 @@ enum_pair_insert(struct enum_pairs *head
}
e_new->enum_val = enum_val;
- strlcpy(e_new->enum_str, enum_str, strlen(enum_str) + 1);
+ strlcpy(e_new->enum_str, enum_str, strlen(e_new->enum_str));
STAILQ_INSERT_TAIL(headp, e_new, link);
return (1);
@@ -569,7 +569,7 @@ snmp_enumtc_init(char *name)
free(enum_tc);
return (NULL);
}
- strlcpy(enum_tc->name, name, strlen(name) + 1);
+ strlcpy(enum_tc->name, name, sizeof(enum_tc->name));
return (enum_tc);
}
From owner-svn-src-user@freebsd.org Wed Feb 3 02:03:01 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 C4CC6A9A173
for <svn-src-user@mailman.ysv.freebsd.org>;
Wed, 3 Feb 2016 02:03:01 +0000 (UTC)
(envelope-from ngie@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 97397F12;
Wed, 3 Feb 2016 02:03:01 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u13230vx054692;
Wed, 3 Feb 2016 02:03:00 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u13230B6054691;
Wed, 3 Feb 2016 02:03:00 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602030203.u13230B6054691@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 3 Feb 2016 02:03:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295190 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 02:03:01 -0000
Author: ngie
Date: Wed Feb 3 02:03:00 2016
New Revision: 295190
URL: https://svnweb.freebsd.org/changeset/base/295190
Log:
Don't test for tc < 0 in snmp_oct2tc(..), snmp_tc2oid(..), and
snmp_tc2oct(..) to mute valid -Wtautological-compare warnings as
tc is an enum and (by the current definition of the enum) will
always be positive
Reported by: Jenkins (clang job)
Sponsored by: EMC / Isilon Storage Division
Modified:
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c Wed Feb 3 02:02:01 2016 (r295189)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c Wed Feb 3 02:03:00 2016 (r295190)
@@ -158,7 +158,7 @@ snmp_oct2tc(enum snmp_tc tc, uint32_t le
uint32_t tc_len;
char * buf;
- if (tc < 0 || tc > SNMP_UNKNOWN)
+ if (tc > SNMP_UNKNOWN)
tc = SNMP_UNKNOWN;
if (text_convs[tc].len > 0)
@@ -183,7 +183,7 @@ snmp_oct2tc(enum snmp_tc tc, uint32_t le
char *
snmp_tc2oid(enum snmp_tc tc, char *str, struct asn_oid *oid)
{
- if (tc < 0 || tc > SNMP_UNKNOWN)
+ if (tc > SNMP_UNKNOWN)
tc = SNMP_UNKNOWN;
return (text_convs[tc].tc2oid(str, oid));
@@ -192,7 +192,7 @@ snmp_tc2oid(enum snmp_tc tc, char *str,
int32_t
snmp_tc2oct(enum snmp_tc tc, struct snmp_value *value, char *string)
{
- if (tc < 0 || tc > SNMP_UNKNOWN)
+ if (tc > SNMP_UNKNOWN)
tc = SNMP_UNKNOWN;
return (text_convs[tc].tc2oct(value, string));
From owner-svn-src-user@freebsd.org Wed Feb 3 02:06:49 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 73572A9A236
for <svn-src-user@mailman.ysv.freebsd.org>;
Wed, 3 Feb 2016 02:06:49 +0000 (UTC)
(envelope-from ngie@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 4736C113B;
Wed, 3 Feb 2016 02:06:49 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1326mRU054985;
Wed, 3 Feb 2016 02:06:48 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1326mcP054984;
Wed, 3 Feb 2016 02:06:48 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602030206.u1326mcP054984@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 3 Feb 2016 02:06:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295191 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 02:06:49 -0000
Author: ngie
Date: Wed Feb 3 02:06:48 2016
New Revision: 295191
URL: https://svnweb.freebsd.org/changeset/base/295191
Log:
1. Use destination buffer instead of source buffer size to mute valid
security concerns with strlcpy related to their respective buffer
sizes (-Wstrlcpy-strlcat-size)
2. Don't try free'ing string in snmp_oid2asn_oid(..) -- it's allocated
on the stack in the function, not the heap.
Reported by: Jenkins (clang job) [1], Jenkins (gcc 4.9 job) [2]
Sponsored by: EMC / Isilon Storage Division
Modified:
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c Wed Feb 3 02:03:00 2016 (r295190)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c Wed Feb 3 02:06:48 2016 (r295191)
@@ -266,7 +266,7 @@ add_filename(struct snmp_toolinfo *snmpt
if (cut != NULL)
asn_append_oid(&(entry->cut), cut);
- strlcpy(fstring, filename, strlen(filename) + 1);
+ strlcpy(fstring, filename, sizeof(fstring));
entry->name = fstring;
entry->done = done;
SLIST_INSERT_HEAD(&snmptoolctx->filelist, entry, link);
@@ -1076,13 +1076,11 @@ snmp_oid2asn_oid(struct snmp_toolinfo *s
if (snmp_suboid_append(oid, (asn_subid_t) obj.val.var.len) < 0)
return (NULL);
} else {
- strlcpy(string, str, i + 1);
- string[i] = '\0';
+ strlcpy(string, str, MAX(i + 1, sizeof(string)));
if (snmp_lookup_enumoid(snmptoolctx, &obj, string) < 0) {
warnx("Unknown string - %s",string);
return (NULL);
}
- free(string);
}
asn_append_oid(oid, &(obj.val.var));
From owner-svn-src-user@freebsd.org Wed Feb 3 02:08:56 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 6405FA9A2B6
for <svn-src-user@mailman.ysv.freebsd.org>;
Wed, 3 Feb 2016 02:08:56 +0000 (UTC)
(envelope-from ngie@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 37D55126D;
Wed, 3 Feb 2016 02:08:56 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1328tSS055097;
Wed, 3 Feb 2016 02:08:55 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1328tHh055096;
Wed, 3 Feb 2016 02:08:55 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602030208.u1328tHh055096@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 3 Feb 2016 02:08:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295192 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 02:08:56 -0000
Author: ngie
Date: Wed Feb 3 02:08:55 2016
New Revision: 295192
URL: https://svnweb.freebsd.org/changeset/base/295192
Log:
Mute -Wsign-compare warnings
By definition parse_ascii(..) returns -1 to denote errors, but
snmp_client.clen and snmp_client.engine.engine_len are unsigned
quantities. Cast their values to signed quantities when doing
the compare, and check for -1 (the return code in the error case)
instead of <0
Reported by: Jenkins (clang job)
Sponsored by: EMC / Isilon Storage Division
Modified:
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c Wed Feb 3 02:06:48 2016 (r295191)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c Wed Feb 3 02:08:55 2016 (r295192)
@@ -617,8 +617,8 @@ parse_context(struct snmp_toolinfo *snmp
warnx("Suboption 'context-engine' - no argument");
return (-1);
}
- if ((snmp_client.clen = parse_ascii(val,
- snmp_client.cengine, SNMP_ENGINE_ID_SIZ)) < 0) {
+ if ((int32_t)(snmp_client.clen = parse_ascii(val,
+ snmp_client.cengine, SNMP_ENGINE_ID_SIZ)) == -1) {
warnx("Bad EngineID - %s", val);
return (-1);
}
@@ -656,7 +656,7 @@ parse_user_security(struct snmp_toolinfo
}
snmp_client.engine.engine_len = parse_ascii(val,
snmp_client.engine.engine_id, SNMP_ENGINE_ID_SIZ);
- if (snmp_client.engine.engine_len < 0) {
+ if ((int32_t)snmp_client.engine.engine_len == -1) {
warnx("Bad EngineID - %s", val);
return (-1);
}
From owner-svn-src-user@freebsd.org Wed Feb 3 02:14:32 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 E7591A9A45B
for <svn-src-user@mailman.ysv.freebsd.org>;
Wed, 3 Feb 2016 02:14:32 +0000 (UTC)
(envelope-from ngie@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 B53901733;
Wed, 3 Feb 2016 02:14:32 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u132EVfV057898;
Wed, 3 Feb 2016 02:14:31 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u132EVqY057897;
Wed, 3 Feb 2016 02:14:31 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602030214.u132EVqY057897@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 3 Feb 2016 02:14:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295193 - user/ngie/bsnmp_cleanup/contrib/bsnmp/snmp_mibII
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 02:14:33 -0000
Author: ngie
Date: Wed Feb 3 02:14:31 2016
New Revision: 295193
URL: https://svnweb.freebsd.org/changeset/base/295193
Log:
Return `ret` in op_ifentry(..) to mute a -Wunused-but-set-variable
warning
This should also now undetected error conditions with
value->var.subs[sub - 1] == LEAF_ifPhysAddress where `string_get(..)`
could fail if iifp->physaddr and/or iifp->physaddrlen were deemed
invalid.
Reported by: Jenkins (clang job) [1], Jenkins (gcc 4.9 job) [2]
Sponsored by: EMC / Isilon Storage Division
Modified:
user/ngie/bsnmp_cleanup/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
Modified: user/ngie/bsnmp_cleanup/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
==============================================================================
--- user/ngie/bsnmp_cleanup/contrib/bsnmp/snmp_mibII/mibII_interfaces.c Wed Feb 3 02:08:55 2016 (r295192)
+++ user/ngie/bsnmp_cleanup/contrib/bsnmp/snmp_mibII/mibII_interfaces.c Wed Feb 3 02:14:31 2016 (r295193)
@@ -356,7 +356,7 @@ op_ifentry(struct snmp_context *ctx, str
value->v.oid = ifp->spec_oid;
break;
}
- return (SNMP_ERR_NOERROR);
+ return (ret);
}
/*
From owner-svn-src-user@freebsd.org Wed Feb 3 07:21:04 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 BF776A98ADD
for <svn-src-user@mailman.ysv.freebsd.org>;
Wed, 3 Feb 2016 07:21:04 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from mail107.syd.optusnet.com.au (mail107.syd.optusnet.com.au
[211.29.132.53]) by mx1.freebsd.org (Postfix) with ESMTP id 897613DA;
Wed, 3 Feb 2016 07:21:04 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from c211-30-166-197.carlnfd1.nsw.optusnet.com.au
(c211-30-166-197.carlnfd1.nsw.optusnet.com.au [211.30.166.197])
by mail107.syd.optusnet.com.au (Postfix) with ESMTPS id C3BFED4478B;
Wed, 3 Feb 2016 18:20:55 +1100 (AEDT)
Date: Wed, 3 Feb 2016 18:20:54 +1100 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@besplex.bde.org
To: Garrett Cooper <ngie@freebsd.org>
cc: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: Re: svn commit: r295188 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools
In-Reply-To: <201602030200.u1320KMh051933@repo.freebsd.org>
Message-ID: <20160203172813.I898@besplex.bde.org>
References: <201602030200.u1320KMh051933@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.1 cv=cK4dyQqN c=1 sm=1 tr=0
a=KA6XNC2GZCFrdESI5ZmdjQ==:117 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10
a=s5jvgZ67dGcA:10 a=kj9zAlcOel0A:10 a=X0QvSdC6yIap9ZRWCgQA:9
a=CjuIK1q_8ugA:10
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 07:21:04 -0000
On Wed, 3 Feb 2016, Garrett Cooper wrote:
> Log:
> Use destination buffer instead of source buffer size to mute valid
> security concerns with strlcpy related to their respective buffer
> sizes (-Wstrlcpy-strlcat-size)
Why not fix the bug instead of not hear the warning about it? The
change might actually be a fix, but the log message makes it sound
like it isn't.
> ==============================================================================
> --- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c Wed Feb 3 01:58:37 2016 (r295187)
> +++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c Wed Feb 3 02:00:20 2016 (r295188)
> @@ -283,7 +283,7 @@ enum_pair_insert(struct enum_pairs *head
> }
>
> e_new->enum_val = enum_val;
> - strlcpy(e_new->enum_str, enum_str, strlen(enum_str) + 1);
> + strlcpy(e_new->enum_str, enum_str, strlen(e_new->enum_str));
> STAILQ_INSERT_TAIL(headp, e_new, link);
>
> return (1);
This actually completely breaks the code. It applies strlen() to garbage
memory that was just allocated to hold the string.
The old code was correct except being obfuscated using strlcpy().
> @@ -569,7 +569,7 @@ snmp_enumtc_init(char *name)
> free(enum_tc);
> return (NULL);
> }
> - strlcpy(enum_tc->name, name, strlen(name) + 1);
> + strlcpy(enum_tc->name, name, sizeof(enum_tc->name));
>
> return (enum_tc);
> }
This also completely breaks the code. It uses sizeof on the pointer
to the memory that will become the new string when it is initialized.
The old code was correct except being obfuscated using strlcpy().
These bugs show why strlen() shouldn't exist. Its use in the old code
was just an obfuscation. It only looks wrong because its return value
is not checked, so it looks like truncation is not detected. However,
since the buffers were just allocated with the correct size, truncation
is impossible and ordinary strcpy() works perfectly.
The unbroken version was essentially a home made version of strdup().
Using strdup() would be slightly easier. But I don't like it either.
Using strdup() saves having to write a couple of strlen() expressions
and on strcpy() statement and prevents obfuscating the strcpy() as an
unchecked strlcpy(). But this is easy and I like it to be explicit.
The hard part is the error handling, especially in libraries.
Bruce
From owner-svn-src-user@freebsd.org Wed Feb 3 07:46:50 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 87573A99567
for <svn-src-user@mailman.ysv.freebsd.org>;
Wed, 3 Feb 2016 07:46:50 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from mail106.syd.optusnet.com.au (mail106.syd.optusnet.com.au
[211.29.132.42]) by mx1.freebsd.org (Postfix) with ESMTP id 51E59F51;
Wed, 3 Feb 2016 07:46:49 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from c211-30-166-197.carlnfd1.nsw.optusnet.com.au
(c211-30-166-197.carlnfd1.nsw.optusnet.com.au [211.30.166.197])
by mail106.syd.optusnet.com.au (Postfix) with ESMTPS id E84363C2DFC;
Wed, 3 Feb 2016 18:46:41 +1100 (AEDT)
Date: Wed, 3 Feb 2016 18:46:41 +1100 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@besplex.bde.org
To: Garrett Cooper <ngie@freebsd.org>
cc: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: Re: svn commit: r295190 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools
In-Reply-To: <201602030203.u13230B6054691@repo.freebsd.org>
Message-ID: <20160203182332.Y898@besplex.bde.org>
References: <201602030203.u13230B6054691@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.1 cv=cK4dyQqN c=1 sm=1 tr=0
a=KA6XNC2GZCFrdESI5ZmdjQ==:117 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10
a=s5jvgZ67dGcA:10 a=kj9zAlcOel0A:10 a=J2PJrSxFAhxeAKzR7t0A:9
a=CjuIK1q_8ugA:10
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 07:46:50 -0000
On Wed, 3 Feb 2016, Garrett Cooper wrote:
> Log:
> Don't test for tc < 0 in snmp_oct2tc(..), snmp_tc2oid(..), and
> snmp_tc2oct(..) to mute valid -Wtautological-compare warnings as
> tc is an enum and (by the current definition of the enum) will
> always be positive
It is too easy to break warnings by unimproving the code.
> Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
> ==============================================================================
> --- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c Wed Feb 3 02:02:01 2016 (r295189)
> +++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c Wed Feb 3 02:03:00 2016 (r295190)
> @@ -158,7 +158,7 @@ snmp_oct2tc(enum snmp_tc tc, uint32_t le
> uint32_t tc_len;
> char * buf;
>
> - if (tc < 0 || tc > SNMP_UNKNOWN)
> + if (tc > SNMP_UNKNOWN)
> tc = SNMP_UNKNOWN;
>
> if (text_convs[tc].len > 0)
The type of an enum is implementation-dependent. Another compiler might
implement this enum as a signed integer. Then buggy callers might pass an
invalid negative value in tc. The old code checks for this.
Also, enum constants have type int. If the enum type is unsigned and the
warnings are too fussy then they would complain about comparison between
the unsigned tc and the signed SNMP_UNKNOWN.
The enum values are just 0-11, with SNMP_UNKNOWN = 11 last. The above
check depends on the range being contiguous. The type int is good for
representing this range, so the type of the enum is quite likely to be
an int. Probably it is actually unsigned char. unsigned int would
be a bad choice since it tends to give (uns)sign extension bugs and
doesn't save any space. The upper range of an unsigned int is unusable
for enums since enum values have type int. But signed char would work
here too.
Similary for typedefed types. They typedefed type might be unsigned
in one implementation and signed in another. You don't want code that
carefully checks for values < 0 to be broken to mute compiler warnings.
Similarly if the check is for <= UCHAR_MAX and this happens to be
tautological in one implementation where the type is unsigned char.
Warning for out-of-range enum values is clearly broken. In another
use, the top value might be the limit for the type (most likely if
the range is 0-255 and the enum type is unsigned char). You don't
want a warning about tc >= 256 being generated just because the top
value happens to be the limit of the type.
Bruce
From owner-svn-src-user@freebsd.org Wed Feb 3 17:07:29 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 B2BE2A996C5
for <svn-src-user@mailman.ysv.freebsd.org>;
Wed, 3 Feb 2016 17:07:29 +0000 (UTC)
(envelope-from bjkfbsd@gmail.com)
Received: from mail-wm0-x22b.google.com (mail-wm0-x22b.google.com
[IPv6:2a00:1450:400c:c09::22b])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 42742642;
Wed, 3 Feb 2016 17:07:29 +0000 (UTC)
(envelope-from bjkfbsd@gmail.com)
Received: by mail-wm0-x22b.google.com with SMTP id p63so80281759wmp.1;
Wed, 03 Feb 2016 09:07:29 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:in-reply-to:references:date:message-id:subject:from:to
:cc:content-type;
bh=sfUex42/Zlcm4/L/lNyWhPgmPCPRJIaYfoVTHiMzsYI=;
b=ywUcA10D5L2qxKwj0ru9w5yuW58kvtvktK03LxbEhrmi4+RhhWpk6ZwfNmgnWEU6lx
qrx1Scdj6iPruLL5yMX4c9WtOOErQRX4OxbFl1aOSuUK15SeqVXk+wNP2VhTlf/XBOPD
VA2emtBBk+l6MHlPo1iGkZ+ScsJOUGeCArRM+flCRDm6AYpbOBOmgenGQHVMyCG6tgGe
3VUxwB6BqpXH6cspbql/R90IHzoLIYj5khFLChJSKf3wFhRQICaoXjD1g4lGok7jbi4p
berz/2h/KETaLQLxFBfMvhXBfRiRe7LEjaUUfb+BFNn+MEo+p+6RobZ7DtzI1sA5qxM0
UKVw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20130820;
h=x-gm-message-state:mime-version:in-reply-to:references:date
:message-id:subject:from:to:cc:content-type;
bh=sfUex42/Zlcm4/L/lNyWhPgmPCPRJIaYfoVTHiMzsYI=;
b=fbzWK93hwMSD19Uwn0jRnf7+jpQddIrWnedxCXuvoBeWrGIVck0kopVEWbvTALGXvE
Tg8F2eMq4JM+YfRLg/0sH0O6Y90jygC/k6ULXxTjzQf0un0qsZ67YhoOOZW5C4YLQYp1
Xoift1J1hepcebDX6EyZ8aa0YV9qBOov1ulDPv3yzO8Nt+nHWSakEaIO53cr1g6GCeel
N5ZJ5Lj5qHLvfSbLMzrnTnpw3RC+qeHaZSOdzwyL97ysQXvm+LLUTJVwUXYrRHBijNAE
B9tL3j/u167Bnm7CDc3C9AOD9n/LaJnhtWo0kK5fFOP3337m8IGAjfF4iEMoTmGXWLri
34ew==
X-Gm-Message-State: AG10YOThQZchjCFmPFp8PLAsltosvyoPqKjZ7LVE6XUF+2N4+Wh/b+jTjZ85NZXa8H7BaUxphqfa6Lp79wE5+A==
MIME-Version: 1.0
X-Received: by 10.194.119.68 with SMTP id ks4mr2978472wjb.45.1454519247573;
Wed, 03 Feb 2016 09:07:27 -0800 (PST)
Received: by 10.27.170.11 with HTTP; Wed, 3 Feb 2016 09:07:27 -0800 (PST)
In-Reply-To: <20160203182332.Y898@besplex.bde.org>
References: <201602030203.u13230B6054691@repo.freebsd.org>
<20160203182332.Y898@besplex.bde.org>
Date: Wed, 3 Feb 2016 11:07:27 -0600
Message-ID: <CAJ5_RoBSChzCwR8NV2XT8GKzj2aYwv5CpGNavxBkYvRGH4bBew@mail.gmail.com>
Subject: Re: svn commit: r295190 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools
From: Benjamin Kaduk <bjkfbsd@gmail.com>
To: Bruce Evans <brde@optusnet.com.au>
Cc: Garrett Cooper <ngie@freebsd.org>,
"src-committers@freebsd.org" <src-committers@freebsd.org>,
svn-src-user@freebsd.org
Content-Type: text/plain; charset=UTF-8
X-Content-Filtered-By: Mailman/MimeDel 2.1.20
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 17:07:29 -0000
On Wed, Feb 3, 2016 at 1:46 AM, Bruce Evans <brde@optusnet.com.au> wrote:
> On Wed, 3 Feb 2016, Garrett Cooper wrote:
>
>
>> Modified:
>> user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
>>
>> ==============================================================================
>> ---
>> user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
>> Wed Feb 3 02:02:01 2016 (r295189)
>> +++
>> user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
>> Wed Feb 3 02:03:00 2016 (r295190)
>> @@ -158,7 +158,7 @@ snmp_oct2tc(enum snmp_tc tc, uint32_t le
>> uint32_t tc_len;
>> char * buf;
>>
>> - if (tc < 0 || tc > SNMP_UNKNOWN)
>> + if (tc > SNMP_UNKNOWN)
>> tc = SNMP_UNKNOWN;
>>
>> if (text_convs[tc].len > 0)
>>
>
> The type of an enum is implementation-dependent. Another compiler might
>
By C, yes. The platform ABI for at least x86 specifies that enumerated
types are represented as int (or maybe unsigned int if the values are too
big; I didn't check).
implement this enum as a signed integer. Then buggy callers might pass an
> invalid negative value in tc. The old code checks for this.
>
> Also, enum constants have type int. If the enum type is unsigned and the
> warnings are too fussy then they would complain about comparison between
> the unsigned tc and the signed SNMP_UNKNOWN.
>
> The enum values are just 0-11, with SNMP_UNKNOWN = 11 last. The above
> check depends on the range being contiguous. The type int is good for
>
C99 brings in more rules about how values are laid out, so the range being
contiguous is guaranteed unless someone did something "clever" in defining
the enumerated values. (Values start at zero if not specified; value is one
greater than the previous one if not specified, see 6.7.2.2 of n1256.pdf.)
> representing this range, so the type of the enum is quite likely to be
> an int. Probably it is actually unsigned char. unsigned int would
> be a bad choice since it tends to give (uns)sign extension bugs and
> doesn't save any space. The upper range of an unsigned int is unusable
> for enums since enum values have type int. But signed char would work
> here too.
>
>
I think the compiler is being more clever than you indicate here -- it
assumes as a given that the only values held by variables of the enumerated
type are the specific enumerated values. This has nothing to do with the
type used to hold the value, but rather that there are only 12 valid
values, none of which are negative. (Some days I can convince myself that
this is a too strict reading of the standard, but it seems to be what clang
is interpreting the standard to be.)
> Similary for typedefed types. They typedefed type might be unsigned
> in one implementation and signed in another. You don't want code that
> carefully checks for values < 0 to be broken to mute compiler warnings.
> Similarly if the check is for <= UCHAR_MAX and this happens to be
> tautological in one implementation where the type is unsigned char.
>
>
No argument here.
-Ben
> Warning for out-of-range enum values is clearly broken. In another
> use, the top value might be the limit for the type (most likely if
> the range is 0-255 and the enum type is unsigned char). You don't
> want a warning about tc >= 256 being generated just because the top
> value happens to be the limit of the type.
>
> Bruce
>
> _______________________________________________
> svn-src-user@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-user
> To unsubscribe, send any mail to "svn-src-user-unsubscribe@freebsd.org"
>
From owner-svn-src-user@freebsd.org Thu Feb 4 08:11:46 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 18798A9B566
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 4 Feb 2016 08:11:46 +0000 (UTC)
(envelope-from ngie@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 DA5681AA2;
Thu, 4 Feb 2016 08:11:45 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u148BiZI088688;
Thu, 4 Feb 2016 08:11:44 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u148Biio088687;
Thu, 4 Feb 2016 08:11:44 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602040811.u148Biio088687@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 4 Feb 2016 08:11:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295236 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 08:11:46 -0000
Author: ngie
Date: Thu Feb 4 08:11:44 2016
New Revision: 295236
URL: https://svnweb.freebsd.org/changeset/base/295236
Log:
Staticize several variables used locally in order to fix
-Wmissing-variable-declarations issues
Modified:
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c Thu Feb 4 06:39:20 2016 (r295235)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c Thu Feb 4 08:11:44 2016 (r295236)
@@ -140,9 +140,9 @@ struct input {
LIST_ENTRY(input) link;
};
-LIST_HEAD(, input) inputs = LIST_HEAD_INITIALIZER(inputs);
-struct input *input = NULL;
-int32_t pbchar = -1;
+static LIST_HEAD(, input) inputs = LIST_HEAD_INITIALIZER(inputs);
+static struct input *input = NULL;
+static int32_t pbchar = -1;
#define MAX_PATHS 100
@@ -301,18 +301,18 @@ static const struct {
{ NULL, 0, 0 }
};
-struct {
+static struct {
/* Current OID type, regarding table membership. */
enum snmp_tbl_entry tbl_type;
/* A pointer to a structure in table list to add to its members. */
struct snmp_index_entry *table_idx;
} table_data;
-struct asn_oid current_oid;
-char nexttok[MAXSTR];
-u_long val; /* integer values */
-int32_t all_cond; /* all conditions are true */
-int32_t saved_token = -1;
+static struct asn_oid current_oid;
+static char nexttok[MAXSTR];
+static u_long val; /* integer values */
+static int32_t all_cond; /* all conditions are true */
+static int32_t saved_token = -1;
/* Prepare the global data before parsing a new file. */
static void
From owner-svn-src-user@freebsd.org Thu Feb 4 08:15:19 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 1E79BA9B667
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 4 Feb 2016 08:15:19 +0000 (UTC)
(envelope-from ngie@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 EA8B91D7C;
Thu, 4 Feb 2016 08:15:18 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u148FHQ7090678;
Thu, 4 Feb 2016 08:15:17 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u148FHnp090677;
Thu, 4 Feb 2016 08:15:17 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602040815.u148FHnp090677@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 4 Feb 2016 08:15:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295237 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 08:15:19 -0000
Author: ngie
Date: Thu Feb 4 08:15:17 2016
New Revision: 295237
URL: https://svnweb.freebsd.org/changeset/base/295237
Log:
Convert `enum tok tok` to `int32_t tok` in many places to account
for the fact that sometimes characters not in enum tok ['(', ')', etc]
are tested for in switch statements, and that the function get_token
actually returns int32_t, not enum tok, thus limiting the return type
incorrectly
Reported by: clang 3.7.2, gcc 4.9.4
Modified:
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c Thu Feb 4 08:11:44 2016 (r295236)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c Thu Feb 4 08:15:17 2016 (r295237)
@@ -513,7 +513,7 @@ snmp_import_update_table(enum snmp_tbl_e
}
static int32_t
-parse_enum(struct snmp_toolinfo *snmptoolctx, enum tok *tok,
+parse_enum(struct snmp_toolinfo *snmptoolctx, int32_t *tok,
struct enum_pairs *enums)
{
while ((*tok = gettoken(snmptoolctx)) == TOK_STR) {
@@ -532,7 +532,7 @@ parse_enum(struct snmp_toolinfo *snmptoo
}
static int32_t
-parse_subtype(struct snmp_toolinfo *snmptoolctx, enum tok *tok,
+parse_subtype(struct snmp_toolinfo *snmptoolctx, int32_t *tok,
enum snmp_tc *tc)
{
if ((*tok = gettoken(snmptoolctx)) != TOK_STR) {
@@ -547,7 +547,7 @@ parse_subtype(struct snmp_toolinfo *snmp
}
static int32_t
-parse_type(struct snmp_toolinfo *snmptoolctx, enum tok *tok,
+parse_type(struct snmp_toolinfo *snmptoolctx, int32_t *tok,
enum snmp_tc *tc, struct enum_pairs **snmp_enum)
{
int32_t syntax, mem;
@@ -630,10 +630,9 @@ snmp_import_head(struct snmp_toolinfo *s
static int32_t
snmp_import_table(struct snmp_toolinfo *snmptoolctx, struct snmp_oid2str *obj)
{
- int32_t i;
- enum snmp_tc tc;
- enum tok tok;
struct snmp_index_entry *entry;
+ enum snmp_tc tc;
+ int32_t i, tok;
if ((entry = malloc(sizeof(struct snmp_index_entry))) == NULL) {
syslog(LOG_ERR, "malloc() failed: %s", strerror(errno));
@@ -704,7 +703,7 @@ snmp_import_table(struct snmp_toolinfo *
* Read everything after the syntax type that is certainly a leaf OID info.
*/
static int32_t
-snmp_import_leaf(struct snmp_toolinfo *snmptoolctx, enum tok *tok,
+snmp_import_leaf(struct snmp_toolinfo *snmptoolctx, int32_t *tok,
struct snmp_oid2str *oid2str)
{
int32_t i, syntax;
@@ -757,7 +756,7 @@ snmp_import_object(struct snmp_toolinfo
{
char *string;
int i;
- enum tok tok;
+ int32_t tok;
struct snmp_oid2str *oid2str;
if (snmp_import_head(snmptoolctx) < 0)
@@ -856,7 +855,7 @@ error:
}
static int32_t
-snmp_import_tree(struct snmp_toolinfo *snmptoolctx, enum tok *tok)
+snmp_import_tree(struct snmp_toolinfo *snmptoolctx, int32_t *tok)
{
while (*tok != TOK_EOF) {
switch (*tok) {
@@ -882,7 +881,7 @@ snmp_import_tree(struct snmp_toolinfo *s
}
static int32_t
-snmp_import_top(struct snmp_toolinfo *snmptoolctx, enum tok *tok)
+snmp_import_top(struct snmp_toolinfo *snmptoolctx, int32_t *tok)
{
enum snmp_tc tc;
struct enum_type *t;
@@ -939,7 +938,7 @@ static int32_t
snmp_import(struct snmp_toolinfo *snmptoolctx)
{
int i;
- enum tok tok;
+ int32_t tok;
tok = gettoken(snmptoolctx);
From owner-svn-src-user@freebsd.org Thu Feb 4 08:17:36 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 7A13AA9B6D6
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 4 Feb 2016 08:17:36 +0000 (UTC)
(envelope-from ngie@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 333FF1F05;
Thu, 4 Feb 2016 08:17:36 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u148HZfC090789;
Thu, 4 Feb 2016 08:17:35 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u148HZMW090788;
Thu, 4 Feb 2016 08:17:35 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602040817.u148HZMW090788@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 4 Feb 2016 08:17:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295238 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 08:17:36 -0000
Author: ngie
Date: Thu Feb 4 08:17:35 2016
New Revision: 295238
URL: https://svnweb.freebsd.org/changeset/base/295238
Log:
- Mark `snmptoolctx` __unused in
parse_{authentication,context,privacy,user_security}(..) to fix -Wunused
- Cast `count` to size_t to fix a -Wsign-compare warning as `count` is
signed by definition
Reported by: clang 3.7.2, gcc 4.9.4
Modified:
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c Thu Feb 4 08:15:17 2016 (r295237)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c Thu Feb 4 08:17:35 2016 (r295238)
@@ -468,7 +468,7 @@ parse_ascii(char *ascii, uint8_t *binstr
return (-1);
}
binstr[count] = (uint8_t) val;
- if (++count >= binlen) {
+ if ((size_t)++count >= binlen) {
warnx("Key %s too long - truncating to %zu octets",
ascii, binlen);
break;
@@ -483,7 +483,7 @@ parse_ascii(char *ascii, uint8_t *binstr
* snmp_client structure.
*/
int32_t
-parse_authentication(struct snmp_toolinfo *snmptoolctx, char *opt_arg)
+parse_authentication(struct snmp_toolinfo *snmptoolctx __unused, char *opt_arg)
{
int32_t count, subopt;
char *val, *option;
@@ -538,7 +538,7 @@ parse_authentication(struct snmp_toolinf
}
int32_t
-parse_privacy(struct snmp_toolinfo *snmptoolctx, char *opt_arg)
+parse_privacy(struct snmp_toolinfo *snmptoolctx __unused, char *opt_arg)
{
int32_t count, subopt;
char *val, *option;
@@ -591,7 +591,7 @@ parse_privacy(struct snmp_toolinfo *snmp
}
int32_t
-parse_context(struct snmp_toolinfo *snmptoolctx, char *opt_arg)
+parse_context(struct snmp_toolinfo *snmptoolctx __unused, char *opt_arg)
{
int32_t count, subopt;
char *val, *option;
@@ -633,7 +633,7 @@ parse_context(struct snmp_toolinfo *snmp
}
int32_t
-parse_user_security(struct snmp_toolinfo *snmptoolctx, char *opt_arg)
+parse_user_security(struct snmp_toolinfo *snmptoolctx __unused, char *opt_arg)
{
int32_t count, subopt, saved_errno;
char *val, *option;
From owner-svn-src-user@freebsd.org Thu Feb 4 08:27:38 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 BA6A3A9BB02
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 4 Feb 2016 08:27:38 +0000 (UTC)
(envelope-from ngie@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 8B9BA8B6;
Thu, 4 Feb 2016 08:27:38 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u148RbeL093972;
Thu, 4 Feb 2016 08:27:37 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u148Rb9c093970;
Thu, 4 Feb 2016 08:27:37 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602040827.u148Rb9c093970@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 4 Feb 2016 08:27:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295239 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 08:27:38 -0000
Author: ngie
Date: Thu Feb 4 08:27:37 2016
New Revision: 295239
URL: https://svnweb.freebsd.org/changeset/base/295239
Log:
Declare _bsnmptools_debug as extern in bsnmptools.h instead of bsnmpmap.c to
fix a -Wmissing-variable-declarations warning
Reported by: clang 3.7.2, gcc 4.9.4
Modified:
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c Thu Feb 4 08:17:35 2016 (r295238)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c Thu Feb 4 08:27:37 2016 (r295239)
@@ -47,7 +47,6 @@
#include "bsnmptc.h"
#include "bsnmptools.h"
-extern int _bsnmptools_debug;
#define DEBUG if (_bsnmptools_debug) fprintf
/* Allocate memory and initialize list. */
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h Thu Feb 4 08:17:35 2016 (r295238)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h Thu Feb 4 08:27:37 2016 (r295239)
@@ -231,7 +231,7 @@ extern struct snmp_toolinfo snmptool;
#define SET_NONREP(ctx, i) (((ctx)->flags |= (((i) & 0xff) << 24)))
#define GET_NONREP(ctx) (((ctx)->flags & NONREP_BITS) >> 24)
-
+extern int _bsnmptools_debug;
extern const struct asn_oid IsoOrgDod_OID;
int snmptool_init(struct snmp_toolinfo *);
From owner-svn-src-user@freebsd.org Thu Feb 4 08:32:06 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 B0974A9BDF9
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 4 Feb 2016 08:32:06 +0000 (UTC)
(envelope-from ngie@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 6FC2BCCE;
Thu, 4 Feb 2016 08:32:06 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u148W5lc096825;
Thu, 4 Feb 2016 08:32:05 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u148W51G096824;
Thu, 4 Feb 2016 08:32:05 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602040832.u148W51G096824@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 4 Feb 2016 08:32:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295240 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 08:32:06 -0000
Author: ngie
Date: Thu Feb 4 08:32:05 2016
New Revision: 295240
URL: https://svnweb.freebsd.org/changeset/base/295240
Log:
- Use calloc instead of malloc + memset
- Fix really busted logic proposed in r295191. Use asprintf instead of malloc,
then strlcpy to circumvent the warning correctly by automatically creating
the right sized buffer. The proposed change I committed was broken from the
get-go because it was running strlen on an improperly initialized buffer, so
it would have always segfaulted [*]
Reported by: bde [*]
Modified:
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c Thu Feb 4 08:27:37 2016 (r295239)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c Thu Feb 4 08:32:05 2016 (r295240)
@@ -55,12 +55,11 @@ snmp_mapping_init(void)
{
struct snmp_mappings *m;
- if ((m = malloc(sizeof(struct snmp_mappings))) == NULL) {
+ if ((m = calloc(1, sizeof(struct snmp_mappings))) == NULL) {
syslog(LOG_ERR, "malloc() failed: %s", strerror(errno));
return (NULL);
}
- memset(m, 0, sizeof(struct snmp_mappings));
return (m);
}
@@ -268,21 +267,18 @@ enum_pair_insert(struct enum_pairs *head
{
struct enum_pair *e_new;
- if ((e_new = malloc(sizeof(struct enum_pair))) == NULL) {
+ if ((e_new = calloc(1, sizeof(struct enum_pair))) == NULL) {
syslog(LOG_ERR, "malloc() failed: %s", strerror(errno));
return (-1);
}
- memset(e_new, 0, sizeof(struct enum_pair));
-
- if ((e_new->enum_str = malloc(strlen(enum_str) + 1)) == NULL) {
+ if (asprintf(&e_new->enum_str, "%s", enum_str) == -1) {
syslog(LOG_ERR, "malloc() failed: %s", strerror(errno));
free(e_new);
return (-1);
}
e_new->enum_val = enum_val;
- strlcpy(e_new->enum_str, enum_str, strlen(e_new->enum_str));
STAILQ_INSERT_TAIL(headp, e_new, link);
return (1);
@@ -481,13 +477,11 @@ snmp_syntax_insert(struct snmp_idxlist *
{
struct index *idx;
- if ((idx = malloc(sizeof(struct index))) == NULL) {
+ if ((idx = calloc(1, sizeof(struct index))) == NULL) {
syslog(LOG_ERR, "malloc() failed: %s", strerror(errno));
return (-1);
}
- memset(idx, 0, sizeof(struct index));
-
if (snmp_index_insert(headp, idx) < 0) {
free(idx);
return (-1);
@@ -557,18 +551,16 @@ snmp_enumtc_init(char *name)
{
struct enum_type *enum_tc;
- if ((enum_tc = malloc(sizeof(struct enum_type))) == NULL) {
+ if ((enum_tc = calloc(1, sizeof(struct enum_type))) == NULL) {
syslog(LOG_ERR, "malloc() failed: %s", strerror(errno));
return (NULL);
}
- memset(enum_tc, 0, sizeof(struct enum_type));
- if ((enum_tc->name = malloc(strlen(name) + 1)) == NULL) {
+ if (asprintf(&enum_tc->name, "%s", name) == -1) {
syslog(LOG_ERR, "malloc() failed: %s", strerror(errno));
free(enum_tc);
return (NULL);
}
- strlcpy(enum_tc->name, name, sizeof(enum_tc->name));
return (enum_tc);
}
From owner-svn-src-user@freebsd.org Thu Feb 4 08:38:14 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 B6756A9BFC0
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 4 Feb 2016 08:38:14 +0000 (UTC)
(envelope-from ngie@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 87EC7F96;
Thu, 4 Feb 2016 08:38:14 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u148cDNh097646;
Thu, 4 Feb 2016 08:38:13 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u148cDCc097645;
Thu, 4 Feb 2016 08:38:13 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602040838.u148cDCc097645@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 4 Feb 2016 08:38:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295241 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 08:38:14 -0000
Author: ngie
Date: Thu Feb 4 08:38:13 2016
New Revision: 295241
URL: https://svnweb.freebsd.org/changeset/base/295241
Log:
- Mark parameters to snmp_inetaddr2oct(..) and parse_inetaddr(..) unused to fix
a -Wunused warning as these are stub functions.
- Staticize snmp_text_conv to fix a -Wmissing-variable-declarations warning
Modified:
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c Thu Feb 4 08:32:05 2016 (r295240)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c Thu Feb 4 08:38:13 2016 (r295241)
@@ -93,7 +93,7 @@ static char *snmp_oct2bits(uint32_t len,
static char *snmp_bits2oct(char *str, struct asn_oid *oid);
static int32_t parse_bits(struct snmp_value *value, char *string);
-struct snmp_text_conv {
+static struct snmp_text_conv {
enum snmp_tc tc;
const char *tc_str;
int32_t len;
@@ -1174,13 +1174,13 @@ snmp_oct2inetaddr(uint32_t len, char *oc
}
static char *
-snmp_inetaddr2oct(char *str, struct asn_oid *oid)
+snmp_inetaddr2oct(char *str __unused, struct asn_oid *oid __unused)
{
return (NULL);
}
static int32_t
-parse_inetaddr(struct snmp_value *value, char *string)
+parse_inetaddr(struct snmp_value *value __unused, char *string __unused)
{
return (-1);
}
From owner-svn-src-user@freebsd.org Thu Feb 4 08:42:34 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 E25C4A9B16A
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 4 Feb 2016 08:42:34 +0000 (UTC)
(envelope-from ngie@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 B36CD12B2;
Thu, 4 Feb 2016 08:42:34 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u148gXsN000490;
Thu, 4 Feb 2016 08:42:33 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u148gXTV000489;
Thu, 4 Feb 2016 08:42:33 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602040842.u148gXTV000489@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 4 Feb 2016 08:42:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295242 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 08:42:35 -0000
Author: ngie
Date: Thu Feb 4 08:42:33 2016
New Revision: 295242
URL: https://svnweb.freebsd.org/changeset/base/295242
Log:
- Fix some broken logic committed in r295191. I should have used MIN, not MAX,
when capping the buffer length with strlcpy in snmp_oid2asn_oid(..) [*].
- Make `i` in to size_t to get the types of i and sizeof in sync and fix a
-Wsign-compare warning.
Reported by: bde [*]
Modified:
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c Thu Feb 4 08:38:13 2016 (r295241)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c Thu Feb 4 08:42:33 2016 (r295242)
@@ -1060,8 +1060,8 @@ static char *
snmp_oid2asn_oid(struct snmp_toolinfo *snmptoolctx, char *str,
struct asn_oid *oid)
{
- int32_t i;
char string[MAXSTR], *endptr;
+ size_t i;
struct snmp_object obj;
for (i = 0; i < MAXSTR; i++)
@@ -1076,7 +1076,7 @@ snmp_oid2asn_oid(struct snmp_toolinfo *s
if (snmp_suboid_append(oid, (asn_subid_t) obj.val.var.len) < 0)
return (NULL);
} else {
- strlcpy(string, str, MAX(i + 1, sizeof(string)));
+ strlcpy(string, str, MIN(i + 1, nitems(string)));
if (snmp_lookup_enumoid(snmptoolctx, &obj, string) < 0) {
warnx("Unknown string - %s",string);
return (NULL);
From owner-svn-src-user@freebsd.org Thu Feb 4 08:52:50 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 7CCBBA9B615
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 4 Feb 2016 08:52:50 +0000 (UTC)
(envelope-from ngie@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 521AD1C67;
Thu, 4 Feb 2016 08:52:50 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u148qnP9003643;
Thu, 4 Feb 2016 08:52:49 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u148qnkd003642;
Thu, 4 Feb 2016 08:52:49 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602040852.u148qnkd003642@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 4 Feb 2016 08:52:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295243 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 08:52:50 -0000
Author: ngie
Date: Thu Feb 4 08:52:49 2016
New Revision: 295243
URL: https://svnweb.freebsd.org/changeset/base/295243
Log:
- Delete `ptr` to fix -Wunused-but-set warnings
- Fix `parse_ntp_ts` to use saved_errno properly to also mute -Wunused-but-set
warnings.
- Delete a few errant errno = 0 calls after calling strlcpy to let the error
cases fail as designed if the strings passed in weren't base 10 numbers.
- Make style a bit consistent with all blocks where `errno` is saved to
`saved_errno`.
Reported by: gcc 4.9.4
Modified:
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c Thu Feb 4 08:42:33 2016 (r295242)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c Thu Feb 4 08:52:49 2016 (r295243)
@@ -777,11 +777,11 @@ parse_ntp_ts(struct snmp_value *sv, char
saved_errno = errno;
v = strtoul(val, &endptr, 10);
if (errno != 0 || (v / 1000) > 9) {
- saved_errno = errno;
warnx("Integer value %s not supported", val);
+ errno = saved_errno;
return (-1);
} else
- saved_errno = errno;
+ errno = saved_errno;
if (*endptr != '.') {
warnx("Failed reading octet - %s", val);
@@ -798,11 +798,11 @@ parse_ntp_ts(struct snmp_value *sv, char
saved_errno = errno;
v = strtoul(val, &endptr, 10);
if (errno != 0 || (v / 1000) > 9) {
- saved_errno = errno;
warnx("Integer value %s not supported", val);
+ errno = saved_errno;
return (-1);
} else
- saved_errno = errno;
+ errno = saved_errno;
for (i = 0, d = 1000; i < 4; i++) {
ntp_ts[i + 4] = v / d;
@@ -879,8 +879,6 @@ snmp_bridgeid2oct(char *str, struct asn_
/* Read the priority. */
saved_errno = errno;
v = strtoul(ptr, &endptr, 10);
- errno = 0;
-
if (v > SNMP_MAX_BRIDGE_PRIORITY || errno != 0 || *endptr != '.') {
errno = saved_errno;
warnx("Bad bridge priority value %d", v);
@@ -928,12 +926,11 @@ snmp_bridgeid2oct(char *str, struct asn_
static int32_t
parse_bridge_id(struct snmp_value *sv, char *string)
{
- char *ptr, *endptr;
+ char *endptr;
int32_t i, saved_errno;
uint32_t v;
uint8_t bridge_id[SNMP_BRIDGEID_OCTETS];
- ptr = string;
/* Read the priority. */
saved_errno = errno;
errno = 0;
@@ -1027,8 +1024,6 @@ snmp_bport_id2oct(char *str, struct asn_
/* Read the priority. */
saved_errno = errno;
v = strtoul(ptr, &endptr, 10);
- errno = 0;
-
if (v > SNMP_MAX_BPORT_PRIORITY || errno != 0 || *endptr != '.') {
errno = saved_errno;
warnx("Bad bridge port priority value %d", v);
@@ -1056,12 +1051,11 @@ snmp_bport_id2oct(char *str, struct asn_
static int32_t
parse_bport_id(struct snmp_value *value, char *string)
{
- char *ptr, *endptr;
+ char *endptr;
int saved_errno;
uint32_t v;
uint8_t bport_id[SNMP_BPORT_OCTETS];
- ptr = string;
/* Read the priority. */
saved_errno = errno;
errno = 0;
@@ -1215,7 +1209,6 @@ snmp_bits2oct(char *str, struct asn_oid
saved_errno = errno;
errno = 0;
-
v = strtoull(str, &endptr, 16);
if (errno != 0) {
warnx("Bad BITS value %s - %s", str, strerror(errno));
@@ -1254,9 +1247,7 @@ parse_bits(struct snmp_value *value, cha
saved_errno = errno;
errno = 0;
-
v = strtoull(string, &endptr, 16);
-
if (errno != 0) {
warnx("Bad BITS value %s - %s", string, strerror(errno));
errno = saved_errno;
From owner-svn-src-user@freebsd.org Thu Feb 4 08:55:00 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 C515AA9B736
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 4 Feb 2016 08:55:00 +0000 (UTC)
(envelope-from ngie@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 98CE81DE3;
Thu, 4 Feb 2016 08:55:00 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u148sxdV003756;
Thu, 4 Feb 2016 08:54:59 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u148sxHO003755;
Thu, 4 Feb 2016 08:54:59 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602040854.u148sxHO003755@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 4 Feb 2016 08:54:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295244 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/bsnmptools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 08:55:00 -0000
Author: ngie
Date: Thu Feb 4 08:54:59 2016
New Revision: 295244
URL: https://svnweb.freebsd.org/changeset/base/295244
Log:
Cast `rc` to uint32_t to mute a -Wsign-compare warning
Modified:
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c Thu Feb 4 08:52:49 2016 (r295243)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c Thu Feb 4 08:54:59 2016 (r295244)
@@ -500,7 +500,7 @@ snmptool_walk(struct snmp_toolinfo *snmp
outputs += rc;
snmp_pdu_free(&resp);
- if (rc < resp.nbindings)
+ if ((uint32_t)rc < resp.nbindings)
break;
snmpwalk_nextpdu_create(op,
From owner-svn-src-user@freebsd.org Thu Feb 4 09:00:02 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 111A5A9BA8C
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 4 Feb 2016 09:00:02 +0000 (UTC)
(envelope-from ngie@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 D65038C;
Thu, 4 Feb 2016 09:00:01 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u14900GX004046;
Thu, 4 Feb 2016 09:00:00 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1490090004045;
Thu, 4 Feb 2016 09:00:00 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602040900.u1490090004045@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 4 Feb 2016 09:00:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295245 - user/ngie/bsnmp_cleanup/contrib/bsnmp/snmpd
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 09:00:02 -0000
Author: ngie
Date: Thu Feb 4 09:00:00 2016
New Revision: 295245
URL: https://svnweb.freebsd.org/changeset/base/295245
Log:
Explicitly use %jx and %ju instead of QUADXFMT and QUADFMT obfuscation
This mutes a -Wformat error about using the wrong format qualifier
Modified:
user/ngie/bsnmp_cleanup/contrib/bsnmp/snmpd/config.c
Modified: user/ngie/bsnmp_cleanup/contrib/bsnmp/snmpd/config.c
==============================================================================
--- user/ngie/bsnmp_cleanup/contrib/bsnmp/snmpd/config.c Thu Feb 4 08:54:59 2016 (r295244)
+++ user/ngie/bsnmp_cleanup/contrib/bsnmp/snmpd/config.c Thu Feb 4 09:00:00 2016 (r295245)
@@ -823,7 +823,8 @@ parse_oid(const char *varname, struct as
while (token == '.') {
if (gettoken() == TOK_NUM) {
if (numval > ASN_MAXID)
- report("subid too large %#"QUADXFMT, numval);
+ report("subid too large %#jx",
+ (uintmax_t)numval);
if (oid->len == ASN_MAXOIDLEN)
report("index too long");
if (gettoken() != ':')
@@ -878,7 +879,7 @@ parse_syntax_integer(struct snmp_value *
if (token != TOK_NUM)
report("bad INTEGER syntax");
if (numval > 0x7fffffff)
- report("INTEGER too large %"QUADFMT, numval);
+ report("INTEGER too large %ju", (uintmax_t)numval);
value->v.integer = numval;
gettoken();
From owner-svn-src-user@freebsd.org Thu Feb 4 09:07:46 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 053BFA9BD9F
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 4 Feb 2016 09:07:46 +0000 (UTC)
(envelope-from ngie@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 CB639844;
Thu, 4 Feb 2016 09:07:45 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1497iuN006642;
Thu, 4 Feb 2016 09:07:44 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1497iaW006641;
Thu, 4 Feb 2016 09:07:44 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602040907.u1497iaW006641@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 4 Feb 2016 09:07:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295246 - user/ngie/bsnmp_cleanup/lib/libbsnmp
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 09:07:46 -0000
Author: ngie
Date: Thu Feb 4 09:07:44 2016
New Revision: 295246
URL: https://svnweb.freebsd.org/changeset/base/295246
Log:
Remove NO_WERROR
Modified:
user/ngie/bsnmp_cleanup/lib/libbsnmp/Makefile.inc
Modified: user/ngie/bsnmp_cleanup/lib/libbsnmp/Makefile.inc
==============================================================================
--- user/ngie/bsnmp_cleanup/lib/libbsnmp/Makefile.inc Thu Feb 4 09:00:00 2016 (r295245)
+++ user/ngie/bsnmp_cleanup/lib/libbsnmp/Makefile.inc Thu Feb 4 09:07:44 2016 (r295246)
@@ -1,6 +1,5 @@
# $FreeBSD$
-NO_WERROR=
INCSDIR= ${INCLUDEDIR}/bsnmp
.include "../Makefile.inc"
From owner-svn-src-user@freebsd.org Thu Feb 4 09:08:38 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 3835AA9BDD2
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 4 Feb 2016 09:08:38 +0000 (UTC)
(envelope-from ngie@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 0AEB994A;
Thu, 4 Feb 2016 09:08:37 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1498bxq006714;
Thu, 4 Feb 2016 09:08:37 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1498buB006713;
Thu, 4 Feb 2016 09:08:37 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602040908.u1498buB006713@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 4 Feb 2016 09:08:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295247 - user/ngie/bsnmp_cleanup/contrib/bsnmp/lib
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 09:08:38 -0000
Author: ngie
Date: Thu Feb 4 09:08:36 2016
New Revision: 295247
URL: https://svnweb.freebsd.org/changeset/base/295247
Log:
Use mkstemp(3) instead of mktemp(3) when creating temporary files to fix
the security pragma
Modified:
user/ngie/bsnmp_cleanup/contrib/bsnmp/lib/snmpclient.c
Modified: user/ngie/bsnmp_cleanup/contrib/bsnmp/lib/snmpclient.c
==============================================================================
--- user/ngie/bsnmp_cleanup/contrib/bsnmp/lib/snmpclient.c Thu Feb 4 09:07:44 2016 (r295246)
+++ user/ngie/bsnmp_cleanup/contrib/bsnmp/lib/snmpclient.c Thu Feb 4 09:08:36 2016 (r295247)
@@ -1000,7 +1000,7 @@ open_client_local(const char *path)
snprintf(snmp_client.local_path, sizeof(snmp_client.local_path),
"%s", SNMP_LOCAL_PATH);
- if (mktemp(snmp_client.local_path) == NULL) {
+ if (mkstemp(snmp_client.local_path) == -1) {
seterr(&snmp_client, "%s", strerror(errno));
(void)close(snmp_client.fd);
snmp_client.fd = -1;
From owner-svn-src-user@freebsd.org Thu Feb 4 09:39:13 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 E288EA9AA96
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 4 Feb 2016 09:39:13 +0000 (UTC)
(envelope-from ngie@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 774A41A3F;
Thu, 4 Feb 2016 09:39:13 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u149dC5U015633;
Thu, 4 Feb 2016 09:39:12 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u149d9ft015604;
Thu, 4 Feb 2016 09:39:09 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602040939.u149d9ft015604@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 4 Feb 2016 09:39:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295248 - in user/ngie/stable-10-libnv: . contrib/mdocml
crypto/openssh crypto/openssl crypto/openssl/apps crypto/openssl/crypto
crypto/openssl/crypto/aes crypto/openssl/crypto/bio cryp...
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 09:39:14 -0000
Author: ngie
Date: Thu Feb 4 09:39:08 2016
New Revision: 295248
URL: https://svnweb.freebsd.org/changeset/base/295248
Log:
MFstable/10 @ r295247
Added:
user/ngie/stable-10-libnv/crypto/openssh/freebsd-post-merge.sh
- copied unchanged from r295247, stable/10/crypto/openssh/freebsd-post-merge.sh
user/ngie/stable-10-libnv/crypto/openssh/freebsd-pre-merge.sh
- copied unchanged from r295247, stable/10/crypto/openssh/freebsd-pre-merge.sh
user/ngie/stable-10-libnv/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_status_cb.pod
- copied unchanged from r295247, stable/10/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_status_cb.pod
user/ngie/stable-10-libnv/crypto/openssl/util/pod2mantest
- copied unchanged from r295247, stable/10/crypto/openssl/util/pod2mantest
user/ngie/stable-10-libnv/lib/libdevctl/
- copied from r295247, stable/10/lib/libdevctl/
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3
- copied unchanged from r295247, stable/10/secure/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3
user/ngie/stable-10-libnv/share/dtrace/watch_execve
- copied unchanged from r295247, stable/10/share/dtrace/watch_execve
user/ngie/stable-10-libnv/share/dtrace/watch_kill
- copied unchanged from r295247, stable/10/share/dtrace/watch_kill
user/ngie/stable-10-libnv/share/dtrace/watch_vop_remove
- copied unchanged from r295247, stable/10/share/dtrace/watch_vop_remove
user/ngie/stable-10-libnv/share/man/man4/cfi.4
- copied unchanged from r295247, stable/10/share/man/man4/cfi.4
user/ngie/stable-10-libnv/sys/boot/efi/boot1/boot_module.h
- copied unchanged from r295247, stable/10/sys/boot/efi/boot1/boot_module.h
user/ngie/stable-10-libnv/sys/boot/efi/boot1/ufs_module.c
- copied unchanged from r295247, stable/10/sys/boot/efi/boot1/ufs_module.c
user/ngie/stable-10-libnv/sys/boot/efi/boot1/zfs_module.c
- copied unchanged from r295247, stable/10/sys/boot/efi/boot1/zfs_module.c
user/ngie/stable-10-libnv/sys/dev/syscons/plasma/
- copied from r295247, stable/10/sys/dev/syscons/plasma/
user/ngie/stable-10-libnv/sys/modules/syscons/plasma/
- copied from r295247, stable/10/sys/modules/syscons/plasma/
user/ngie/stable-10-libnv/tools/regression/geom_gate/conf.sh
- copied, changed from r293815, head/tools/regression/geom_gate/conf.sh
user/ngie/stable-10-libnv/usr.sbin/bhyve/bootrom.c
- copied unchanged from r295247, stable/10/usr.sbin/bhyve/bootrom.c
user/ngie/stable-10-libnv/usr.sbin/bhyve/bootrom.h
- copied unchanged from r295247, stable/10/usr.sbin/bhyve/bootrom.h
user/ngie/stable-10-libnv/usr.sbin/bhyve/fwctl.c
- copied unchanged from r295247, stable/10/usr.sbin/bhyve/fwctl.c
user/ngie/stable-10-libnv/usr.sbin/bhyve/fwctl.h
- copied unchanged from r295247, stable/10/usr.sbin/bhyve/fwctl.h
user/ngie/stable-10-libnv/usr.sbin/bhyvectl/bhyvectl.8
- copied unchanged from r295247, stable/10/usr.sbin/bhyvectl/bhyvectl.8
user/ngie/stable-10-libnv/usr.sbin/devctl/
- copied from r295247, stable/10/usr.sbin/devctl/
user/ngie/stable-10-libnv/usr.sbin/vigr/
- copied from r295247, stable/10/usr.sbin/vigr/
Deleted:
user/ngie/stable-10-libnv/crypto/openssh/FREEBSD-tricks
user/ngie/stable-10-libnv/crypto/openssh/README.hpn
user/ngie/stable-10-libnv/crypto/openssh/config.h.in
user/ngie/stable-10-libnv/crypto/openssh/configure
user/ngie/stable-10-libnv/crypto/openssh/schnorr.c
user/ngie/stable-10-libnv/tools/build/options/WITH_OPENSSH_NONE_CIPHER
user/ngie/stable-10-libnv/tools/regression/geom_gate/runtests.sh
user/ngie/stable-10-libnv/tools/regression/geom_gate/test-1.sh
user/ngie/stable-10-libnv/tools/regression/geom_gate/test-2.sh
user/ngie/stable-10-libnv/tools/regression/geom_gate/test-3.sh
Modified:
user/ngie/stable-10-libnv/UPDATING
user/ngie/stable-10-libnv/contrib/mdocml/lib.in
user/ngie/stable-10-libnv/crypto/openssh/FREEBSD-upgrade
user/ngie/stable-10-libnv/crypto/openssh/auth-krb5.c (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/buffer.c (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/buffer.h (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/channels.c (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/channels.h (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/cipher.c (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/clientloop.c (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/compat.c (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/compat.h (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/config.h
user/ngie/stable-10-libnv/crypto/openssh/configure.ac (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/freebsd-configure.sh
user/ngie/stable-10-libnv/crypto/openssh/kex.c (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/kex.h (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/misc.c (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/misc.h (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/moduli.5
user/ngie/stable-10-libnv/crypto/openssh/mux.c (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/myproposal.h
user/ngie/stable-10-libnv/crypto/openssh/packet.c
user/ngie/stable-10-libnv/crypto/openssh/packet.h (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/pathnames.h (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/readconf.c
user/ngie/stable-10-libnv/crypto/openssh/readconf.h
user/ngie/stable-10-libnv/crypto/openssh/scp.1
user/ngie/stable-10-libnv/crypto/openssh/servconf.c
user/ngie/stable-10-libnv/crypto/openssh/servconf.h (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/serverloop.c (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/session.c
user/ngie/stable-10-libnv/crypto/openssh/sftp-common.c (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/sftp-server.8 (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/sftp.1 (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/sftp.c (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/ssh-add.1
user/ngie/stable-10-libnv/crypto/openssh/ssh-agent.1
user/ngie/stable-10-libnv/crypto/openssh/ssh-gss.h (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/ssh-keygen.1 (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/ssh-keyscan.1 (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/ssh-keysign.8
user/ngie/stable-10-libnv/crypto/openssh/ssh-pkcs11-helper.8
user/ngie/stable-10-libnv/crypto/openssh/ssh.1
user/ngie/stable-10-libnv/crypto/openssh/ssh.c
user/ngie/stable-10-libnv/crypto/openssh/ssh_config
user/ngie/stable-10-libnv/crypto/openssh/ssh_config.5
user/ngie/stable-10-libnv/crypto/openssh/ssh_namespace.h
user/ngie/stable-10-libnv/crypto/openssh/sshconnect.c
user/ngie/stable-10-libnv/crypto/openssh/sshconnect2.c (contents, props changed)
user/ngie/stable-10-libnv/crypto/openssh/sshd.8
user/ngie/stable-10-libnv/crypto/openssh/sshd.c
user/ngie/stable-10-libnv/crypto/openssh/sshd_config
user/ngie/stable-10-libnv/crypto/openssh/sshd_config.5
user/ngie/stable-10-libnv/crypto/openssh/version.h
user/ngie/stable-10-libnv/crypto/openssl/ACKNOWLEDGMENTS
user/ngie/stable-10-libnv/crypto/openssl/CHANGES
user/ngie/stable-10-libnv/crypto/openssl/Configure
user/ngie/stable-10-libnv/crypto/openssl/INSTALL
user/ngie/stable-10-libnv/crypto/openssl/LICENSE
user/ngie/stable-10-libnv/crypto/openssl/Makefile
user/ngie/stable-10-libnv/crypto/openssl/Makefile.org
user/ngie/stable-10-libnv/crypto/openssl/NEWS
user/ngie/stable-10-libnv/crypto/openssl/README
user/ngie/stable-10-libnv/crypto/openssl/apps/engine.c
user/ngie/stable-10-libnv/crypto/openssl/apps/ocsp.c
user/ngie/stable-10-libnv/crypto/openssl/apps/pkcs12.c
user/ngie/stable-10-libnv/crypto/openssl/apps/speed.c
user/ngie/stable-10-libnv/crypto/openssl/apps/x509.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes.h
user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_cbc.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_cfb.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_core.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_ctr.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_ecb.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_ige.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_locl.h
user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_misc.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_ofb.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/aes/aes_x86core.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/bio/bio.h
user/ngie/stable-10-libnv/crypto/openssl/crypto/bio/bss_bio.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/bio/bss_conn.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/bio/bss_dgram.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/bn/bn_exp.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/bn/exptest.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/camellia.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/camellia.h
user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/cmll_cbc.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/cmll_cfb.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/cmll_ctr.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/cmll_ecb.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/cmll_locl.h
user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/cmll_misc.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/cmll_ofb.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/camellia/cmll_utl.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/des/des_old.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/des/des_old.h
user/ngie/stable-10-libnv/crypto/openssl/crypto/des/des_old2.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/dsa/dsa_ossl.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/dso/dso.h
user/ngie/stable-10-libnv/crypto/openssl/crypto/dso/dso_dl.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/dso/dso_dlfcn.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/dso/dso_lib.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/ec/ectest.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/engine/eng_all.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/evp/e_camellia.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/evp/e_old.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/evp/e_seed.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/mem_clr.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/o_dir.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/o_dir.h
user/ngie/stable-10-libnv/crypto/openssl/crypto/o_dir_test.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/o_str.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/o_str.h
user/ngie/stable-10-libnv/crypto/openssl/crypto/o_time.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/o_time.h
user/ngie/stable-10-libnv/crypto/openssl/crypto/opensslv.h
user/ngie/stable-10-libnv/crypto/openssl/crypto/rc4/rc4_utl.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/rsa/rsa_chk.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/rsa/rsa_sign.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/seed/seed_cbc.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/seed/seed_cfb.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/seed/seed_ecb.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/seed/seed_ofb.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/sha/sha1test.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/store/store.h
user/ngie/stable-10-libnv/crypto/openssl/crypto/store/str_lib.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/store/str_locl.h
user/ngie/stable-10-libnv/crypto/openssl/crypto/store/str_mem.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/store/str_meth.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/ts/ts_rsp_verify.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/ui/ui.h
user/ngie/stable-10-libnv/crypto/openssl/crypto/ui/ui_compat.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/ui/ui_compat.h
user/ngie/stable-10-libnv/crypto/openssl/crypto/ui/ui_lib.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/ui/ui_locl.h
user/ngie/stable-10-libnv/crypto/openssl/crypto/ui/ui_openssl.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/ui/ui_util.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/x509/x509_vfy.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/x509/x509_vfy.h
user/ngie/stable-10-libnv/crypto/openssl/crypto/x509v3/v3_pci.c
user/ngie/stable-10-libnv/crypto/openssl/crypto/x509v3/v3_pcia.c
user/ngie/stable-10-libnv/crypto/openssl/doc/apps/s_time.pod
user/ngie/stable-10-libnv/crypto/openssl/doc/crypto/BIO_s_connect.pod
user/ngie/stable-10-libnv/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
user/ngie/stable-10-libnv/crypto/openssl/engines/e_chil.c
user/ngie/stable-10-libnv/crypto/openssl/ssl/d1_both.c
user/ngie/stable-10-libnv/crypto/openssl/ssl/kssl.c
user/ngie/stable-10-libnv/crypto/openssl/ssl/kssl.h
user/ngie/stable-10-libnv/crypto/openssl/ssl/kssl_lcl.h
user/ngie/stable-10-libnv/crypto/openssl/ssl/s2_srvr.c
user/ngie/stable-10-libnv/crypto/openssl/ssl/s3_clnt.c
user/ngie/stable-10-libnv/crypto/openssl/ssl/s3_lib.c
user/ngie/stable-10-libnv/crypto/openssl/ssl/s3_srvr.c
user/ngie/stable-10-libnv/crypto/openssl/ssl/ssl.h
user/ngie/stable-10-libnv/crypto/openssl/ssl/ssl_sess.c
user/ngie/stable-10-libnv/crypto/openssl/ssl/t1_enc.c
user/ngie/stable-10-libnv/crypto/openssl/ssl/t1_lib.c
user/ngie/stable-10-libnv/crypto/openssl/util/pl/VC-32.pl
user/ngie/stable-10-libnv/etc/defaults/rc.conf
user/ngie/stable-10-libnv/etc/netstart
user/ngie/stable-10-libnv/etc/periodic/daily/400.status-disks
user/ngie/stable-10-libnv/etc/periodic/security/security.functions
user/ngie/stable-10-libnv/etc/rc.d/NETWORKING
user/ngie/stable-10-libnv/etc/rc.d/jail
user/ngie/stable-10-libnv/etc/rc.d/local_unbound
user/ngie/stable-10-libnv/etc/rc.d/netwait
user/ngie/stable-10-libnv/etc/rc.d/othermta
user/ngie/stable-10-libnv/etc/rc.shutdown
user/ngie/stable-10-libnv/lib/Makefile
user/ngie/stable-10-libnv/lib/libc/gen/readpassphrase.c
user/ngie/stable-10-libnv/lib/libc/gen/sem_new.c
user/ngie/stable-10-libnv/lib/libc/mips/SYS.h
user/ngie/stable-10-libnv/lib/libc/net/sctp_sys_calls.c
user/ngie/stable-10-libnv/lib/libc/stdio/fopen.3
user/ngie/stable-10-libnv/lib/libc/stdlib/tdelete.c
user/ngie/stable-10-libnv/lib/libdpv/dialog_util.c
user/ngie/stable-10-libnv/lib/libdpv/dialog_util.h
user/ngie/stable-10-libnv/lib/libdpv/dpv.3
user/ngie/stable-10-libnv/lib/libdpv/dpv.c
user/ngie/stable-10-libnv/lib/libdpv/dpv.h
user/ngie/stable-10-libnv/lib/libdpv/dpv_private.h
user/ngie/stable-10-libnv/lib/libvmmapi/vmmapi.c
user/ngie/stable-10-libnv/lib/libvmmapi/vmmapi.h
user/ngie/stable-10-libnv/release/amd64/mkisoimages-uefi.sh
user/ngie/stable-10-libnv/release/doc/share/xml/security.xml
user/ngie/stable-10-libnv/secure/lib/libcrypto/Makefile.inc
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ASN1_OBJECT_new.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ASN1_STRING_length.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ASN1_STRING_new.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ASN1_generate_nconf.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_ctrl.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_f_base64.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_f_buffer.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_f_cipher.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_f_md.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_f_null.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_f_ssl.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_find_type.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_new.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_new_CMS.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_push.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_read.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_s_accept.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_s_bio.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_s_connect.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_s_fd.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_s_file.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_s_mem.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_s_null.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_s_socket.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_set_callback.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BIO_should_retry.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_BLINDING_new.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_CTX_new.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_CTX_start.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_add.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_add_word.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_bn2bin.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_cmp.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_copy.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_generate_prime.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_mod_inverse.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_new.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_num_bytes.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_rand.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_set_bit.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_swap.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/BN_zero.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_add0_cert.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_add1_signer.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_compress.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_decrypt.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_encrypt.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_final.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_get0_type.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_sign.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_sign_receipt.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_uncompress.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_verify.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CMS_verify_receipt.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CONF_modules_free.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CONF_modules_load_file.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DH_generate_key.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DH_generate_parameters.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DH_get_ex_new_index.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DH_new.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DH_set_method.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DH_size.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_SIG_new.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_do_sign.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_dup_DH.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_generate_key.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_generate_parameters.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_get_ex_new_index.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_new.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_set_method.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_sign.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/DSA_size.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_GET_LIB.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_clear_error.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_error_string.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_get_error.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_load_crypto_strings.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_load_strings.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_print_errors.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_put_error.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_remove_state.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ERR_set_mark.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_BytesToKey.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_DigestInit.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_DigestSignInit.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_EncryptInit.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_OpenInit.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_cmp.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_derive.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_keygen.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_new.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_print_private.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_sign.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_verify.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_SealInit.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_SignInit.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/EVP_VerifyInit.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/OBJ_nid2obj.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/OPENSSL_Applink.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/OPENSSL_config.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/OPENSSL_ia32cap.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PKCS12_create.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PKCS12_parse.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PKCS7_decrypt.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PKCS7_encrypt.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PKCS7_sign.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/PKCS7_verify.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RAND_add.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RAND_bytes.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RAND_cleanup.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RAND_egd.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RAND_load_file.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RAND_set_rand_method.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_blinding_on.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_check_key.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_generate_key.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_get_ex_new_index.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_new.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_print.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_private_encrypt.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_public_encrypt.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_set_method.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_sign.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/RSA_size.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/SMIME_read_CMS.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/SMIME_read_PKCS7.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/SMIME_write_CMS.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/SMIME_write_PKCS7.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_NAME_print_ex.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_STORE_CTX_new.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_new.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/X509_verify_cert.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/bio.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/blowfish.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/bn.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/bn_internal.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/buffer.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/crypto.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_CMS_ContentInfo.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_DHparams.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_DSAPublicKey.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_ECPrivateKey.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_RSAPublicKey.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_X509.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_X509_ALGOR.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_X509_CRL.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_X509_NAME.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_X509_REQ.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/d2i_X509_SIG.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/des.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/dh.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/dsa.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ecdsa.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/engine.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/err.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/evp.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/hmac.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/lh_stats.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/lhash.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/md5.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/mdc2.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/pem.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/rand.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/rc4.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ripemd.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/rsa.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/sha.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/threads.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ui.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/ui_compat.3
user/ngie/stable-10-libnv/secure/lib/libcrypto/man/x509.3
user/ngie/stable-10-libnv/secure/lib/libssh/Makefile
user/ngie/stable-10-libnv/secure/lib/libssl/Makefile.man
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CIPHER_get_name.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_COMP_add_compression_method.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_add_session.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_ctrl.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_flush_sessions.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_free.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_new.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_sess_number.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_sessions.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_cert_store.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_info_callback.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_mode.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_options.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_read_ahead.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_timeout.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_set_verify.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_use_certificate.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_SESSION_free.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_SESSION_get_time.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_accept.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_alert_type_string.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_clear.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_connect.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_do_handshake.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_free.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_SSL_CTX.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_ciphers.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_client_CA_list.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_current_cipher.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_default_timeout.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_error.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_ex_new_index.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_fd.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_peer_cert_chain.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_peer_certificate.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_psk_identity.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_rbio.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_session.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_verify_result.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_get_version.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_library_init.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_load_client_CA_file.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_new.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_pending.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_read.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_rstate_string.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_session_reused.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_set_bio.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_set_connect_state.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_set_fd.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_set_session.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_set_shutdown.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_set_verify_result.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_shutdown.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_state_string.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_want.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/SSL_write.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/d2i_SSL_SESSION.3
user/ngie/stable-10-libnv/secure/lib/libssl/man/ssl.3
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/CA.pl.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/asn1parse.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/c_rehash.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/ca.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/ciphers.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/cms.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/crl.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/crl2pkcs7.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/dgst.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/dhparam.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/dsa.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/dsaparam.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/ec.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/ecparam.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/enc.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/errstr.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/gendsa.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/genpkey.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/genrsa.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/nseq.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/ocsp.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/openssl.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/passwd.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/pkcs12.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/pkcs7.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/pkcs8.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/pkey.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/pkeyparam.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/pkeyutl.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/rand.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/req.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/rsa.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/rsautl.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/s_client.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/s_server.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/s_time.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/sess_id.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/smime.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/speed.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/spkac.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/ts.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/tsget.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/verify.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/version.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/x509.1
user/ngie/stable-10-libnv/secure/usr.bin/openssl/man/x509v3_config.1
user/ngie/stable-10-libnv/secure/usr.bin/ssh/Makefile
user/ngie/stable-10-libnv/secure/usr.sbin/sshd/Makefile
user/ngie/stable-10-libnv/share/dtrace/Makefile
user/ngie/stable-10-libnv/share/examples/bhyve/vmrun.sh
user/ngie/stable-10-libnv/share/man/man4/Makefile
user/ngie/stable-10-libnv/share/man/man4/em.4
user/ngie/stable-10-libnv/share/man/man4/ismt.4
user/ngie/stable-10-libnv/share/man/man4/splash.4
user/ngie/stable-10-libnv/share/man/man9/Makefile
user/ngie/stable-10-libnv/share/man/man9/make_dev.9
user/ngie/stable-10-libnv/share/mk/bsd.dep.mk
user/ngie/stable-10-libnv/share/mk/bsd.libnames.mk
user/ngie/stable-10-libnv/share/mk/bsd.own.mk
user/ngie/stable-10-libnv/share/mk/bsd.sys.mk
user/ngie/stable-10-libnv/sys/amd64/amd64/fpu.c
user/ngie/stable-10-libnv/sys/amd64/amd64/machdep.c
user/ngie/stable-10-libnv/sys/amd64/include/vmm.h
user/ngie/stable-10-libnv/sys/amd64/include/vmm_dev.h
user/ngie/stable-10-libnv/sys/amd64/linux/linux.h
user/ngie/stable-10-libnv/sys/amd64/linux/linux_machdep.c
user/ngie/stable-10-libnv/sys/amd64/linux/linux_sysvec.c
user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_sysvec.c
user/ngie/stable-10-libnv/sys/amd64/vmm/amd/svm.c
user/ngie/stable-10-libnv/sys/amd64/vmm/intel/vmx.c
user/ngie/stable-10-libnv/sys/amd64/vmm/io/ppt.c
user/ngie/stable-10-libnv/sys/amd64/vmm/vmm.c
user/ngie/stable-10-libnv/sys/amd64/vmm/vmm_dev.c
user/ngie/stable-10-libnv/sys/amd64/vmm/vmm_instruction_emul.c
user/ngie/stable-10-libnv/sys/amd64/vmm/vmm_mem.c
user/ngie/stable-10-libnv/sys/amd64/vmm/vmm_mem.h
user/ngie/stable-10-libnv/sys/arm/arm/bcopyinout.S
user/ngie/stable-10-libnv/sys/arm/arm/bcopyinout_xscale.S
user/ngie/stable-10-libnv/sys/arm/arm/busdma_machdep.c
user/ngie/stable-10-libnv/sys/arm/arm/copystr.S
user/ngie/stable-10-libnv/sys/arm/arm/fusu.S
user/ngie/stable-10-libnv/sys/arm/arm/locore-v4.S
user/ngie/stable-10-libnv/sys/arm/arm/locore-v6.S
user/ngie/stable-10-libnv/sys/arm/arm/machdep.c
user/ngie/stable-10-libnv/sys/arm/arm/physmem.c
user/ngie/stable-10-libnv/sys/arm/arm/trap.c
user/ngie/stable-10-libnv/sys/arm/at91/at91_mci.c
user/ngie/stable-10-libnv/sys/arm/freescale/imx/imx6_anatop.c
user/ngie/stable-10-libnv/sys/arm/freescale/imx/imx6_machdep.c
user/ngie/stable-10-libnv/sys/arm/freescale/imx/imx_machdep.c
user/ngie/stable-10-libnv/sys/arm/freescale/imx/imx_machdep.h
user/ngie/stable-10-libnv/sys/arm/freescale/imx/imx_sdhci.c
user/ngie/stable-10-libnv/sys/arm/freescale/imx/imx_wdogreg.h
user/ngie/stable-10-libnv/sys/arm/mv/std-pj4b.mv
user/ngie/stable-10-libnv/sys/arm/xscale/ixp425/avila_machdep.c
user/ngie/stable-10-libnv/sys/boot/common/bootstrap.h
user/ngie/stable-10-libnv/sys/boot/common/console.c
user/ngie/stable-10-libnv/sys/boot/common/interp_forth.c
user/ngie/stable-10-libnv/sys/boot/common/load_elf.c
user/ngie/stable-10-libnv/sys/boot/common/load_elf_obj.c
user/ngie/stable-10-libnv/sys/boot/common/misc.c
user/ngie/stable-10-libnv/sys/boot/common/module.c
user/ngie/stable-10-libnv/sys/boot/common/part.c
user/ngie/stable-10-libnv/sys/boot/common/self_reloc.c
user/ngie/stable-10-libnv/sys/boot/common/ufsread.c
user/ngie/stable-10-libnv/sys/boot/efi/Makefile
user/ngie/stable-10-libnv/sys/boot/efi/boot1/Makefile
user/ngie/stable-10-libnv/sys/boot/efi/boot1/boot1.c
user/ngie/stable-10-libnv/sys/boot/efi/boot1/fat-amd64.tmpl.bz2.uu
user/ngie/stable-10-libnv/sys/boot/efi/include/amd64/efibind.h
user/ngie/stable-10-libnv/sys/boot/efi/include/efi_nii.h
user/ngie/stable-10-libnv/sys/boot/efi/include/efiapi.h
user/ngie/stable-10-libnv/sys/boot/efi/include/eficon.h
user/ngie/stable-10-libnv/sys/boot/efi/include/eficonsctl.h
user/ngie/stable-10-libnv/sys/boot/efi/include/efidevp.h
user/ngie/stable-10-libnv/sys/boot/efi/include/efierr.h
user/ngie/stable-10-libnv/sys/boot/efi/include/efifpswa.h
user/ngie/stable-10-libnv/sys/boot/efi/include/efigop.h
user/ngie/stable-10-libnv/sys/boot/efi/include/efilib.h
user/ngie/stable-10-libnv/sys/boot/efi/include/efinet.h
user/ngie/stable-10-libnv/sys/boot/efi/include/efiprot.h
user/ngie/stable-10-libnv/sys/boot/efi/include/efipxebc.h
user/ngie/stable-10-libnv/sys/boot/efi/include/efiser.h
user/ngie/stable-10-libnv/sys/boot/efi/include/i386/efibind.h
user/ngie/stable-10-libnv/sys/boot/efi/include/ia64/efibind.h
user/ngie/stable-10-libnv/sys/boot/efi/libefi/Makefile
user/ngie/stable-10-libnv/sys/boot/efi/libefi/efi_console.c
user/ngie/stable-10-libnv/sys/boot/efi/libefi/efipart.c
user/ngie/stable-10-libnv/sys/boot/efi/libefi/handles.c
user/ngie/stable-10-libnv/sys/boot/efi/libefi/libefi.c
user/ngie/stable-10-libnv/sys/boot/efi/loader/Makefile
user/ngie/stable-10-libnv/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c
user/ngie/stable-10-libnv/sys/boot/efi/loader/arch/amd64/framebuffer.c
user/ngie/stable-10-libnv/sys/boot/efi/loader/arch/amd64/reloc.c
user/ngie/stable-10-libnv/sys/boot/efi/loader/autoload.c
user/ngie/stable-10-libnv/sys/boot/efi/loader/bootinfo.c
user/ngie/stable-10-libnv/sys/boot/efi/loader/conf.c
user/ngie/stable-10-libnv/sys/boot/efi/loader/copy.c
user/ngie/stable-10-libnv/sys/boot/efi/loader/devicename.c
user/ngie/stable-10-libnv/sys/boot/efi/loader/loader_efi.h
user/ngie/stable-10-libnv/sys/boot/efi/loader/main.c
user/ngie/stable-10-libnv/sys/boot/fdt/dts/arm/beaglebone-black.dts
user/ngie/stable-10-libnv/sys/boot/fdt/dts/arm/beaglebone.dts
user/ngie/stable-10-libnv/sys/boot/fdt/fdt_loader_cmd.c
user/ngie/stable-10-libnv/sys/boot/ficl/i386/sysdep.c
user/ngie/stable-10-libnv/sys/boot/forth/support.4th
user/ngie/stable-10-libnv/sys/boot/i386/libi386/Makefile
user/ngie/stable-10-libnv/sys/boot/i386/libi386/smbios.c
user/ngie/stable-10-libnv/sys/boot/powerpc/boot1.chrp/boot1.c
user/ngie/stable-10-libnv/sys/boot/uboot/lib/copy.c
user/ngie/stable-10-libnv/sys/boot/zfs/zfs.c
user/ngie/stable-10-libnv/sys/boot/zfs/zfsimpl.c
user/ngie/stable-10-libnv/sys/cam/ctl/ctl.c
user/ngie/stable-10-libnv/sys/cam/scsi/scsi_ch.c
user/ngie/stable-10-libnv/sys/cam/scsi/scsi_enc.c
user/ngie/stable-10-libnv/sys/cam/scsi/scsi_pass.c
user/ngie/stable-10-libnv/sys/cam/scsi/scsi_pt.c
user/ngie/stable-10-libnv/sys/cam/scsi/scsi_sa.c
user/ngie/stable-10-libnv/sys/cam/scsi/scsi_sg.c
user/ngie/stable-10-libnv/sys/cddl/boot/zfs/lz4.c
user/ngie/stable-10-libnv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
user/ngie/stable-10-libnv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
user/ngie/stable-10-libnv/sys/conf/files
user/ngie/stable-10-libnv/sys/conf/kmod.mk
user/ngie/stable-10-libnv/sys/dev/acpica/acpi.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_80003es2lan.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_80003es2lan.h
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82540.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82541.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82541.h
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82542.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82543.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82543.h
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82571.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82571.h
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82575.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_82575.h
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_api.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_api.h
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_defines.h
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_hw.h
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_i210.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_i210.h
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_ich8lan.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_ich8lan.h
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_mac.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_mac.h
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_manage.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_manage.h
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_mbx.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_mbx.h
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_nvm.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_nvm.h
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_osdep.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_osdep.h
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_phy.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_phy.h
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_regs.h
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_vf.c
user/ngie/stable-10-libnv/sys/dev/e1000/e1000_vf.h
user/ngie/stable-10-libnv/sys/dev/e1000/if_em.c
user/ngie/stable-10-libnv/sys/dev/e1000/if_em.h
user/ngie/stable-10-libnv/sys/dev/e1000/if_igb.c
user/ngie/stable-10-libnv/sys/dev/e1000/if_igb.h
user/ngie/stable-10-libnv/sys/dev/e1000/if_lem.c
user/ngie/stable-10-libnv/sys/dev/e1000/if_lem.h
user/ngie/stable-10-libnv/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
user/ngie/stable-10-libnv/sys/dev/iicbus/icee.c
user/ngie/stable-10-libnv/sys/dev/iicbus/iiconf.c
user/ngie/stable-10-libnv/sys/dev/iicbus/iiconf.h
user/ngie/stable-10-libnv/sys/dev/iscsi/iscsi.c
user/ngie/stable-10-libnv/sys/dev/iscsi/iscsi.h
user/ngie/stable-10-libnv/sys/dev/ixgb/if_ixgb.c
user/ngie/stable-10-libnv/sys/dev/ixgbe/if_ix.c
user/ngie/stable-10-libnv/sys/dev/ixgbe/if_ixv.c
user/ngie/stable-10-libnv/sys/dev/ixgbe/ix_txrx.c
user/ngie/stable-10-libnv/sys/dev/ixgbe/ixgbe.h
user/ngie/stable-10-libnv/sys/dev/ixgbe/ixgbe_mbx.h
user/ngie/stable-10-libnv/sys/dev/ixgbe/ixgbe_vf.c
user/ngie/stable-10-libnv/sys/dev/ixl/if_ixl.c
user/ngie/stable-10-libnv/sys/dev/mlx5/mlx5_en/en.h
user/ngie/stable-10-libnv/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
user/ngie/stable-10-libnv/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
user/ngie/stable-10-libnv/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
user/ngie/stable-10-libnv/sys/dev/netmap/if_em_netmap.h
user/ngie/stable-10-libnv/sys/dev/netmap/ixgbe_netmap.h
user/ngie/stable-10-libnv/sys/dev/nvd/nvd.c
user/ngie/stable-10-libnv/sys/dev/nvme/nvme.h
user/ngie/stable-10-libnv/sys/dev/nvme/nvme_ns.c
user/ngie/stable-10-libnv/sys/dev/nvme/nvme_sysctl.c
user/ngie/stable-10-libnv/sys/dev/ofw/ofw_iicbus.c
user/ngie/stable-10-libnv/sys/dev/pci/pci.c
user/ngie/stable-10-libnv/sys/dev/pty/pty.c
user/ngie/stable-10-libnv/sys/dev/puc/pucdata.c
user/ngie/stable-10-libnv/sys/dev/rt/if_rt.c
user/ngie/stable-10-libnv/sys/dev/uart/uart_tty.c
user/ngie/stable-10-libnv/sys/fs/ext2fs/ext2_inode_cnv.c
user/ngie/stable-10-libnv/sys/fs/nandfs/nandfs_segment.c
user/ngie/stable-10-libnv/sys/geom/multipath/g_multipath.c
user/ngie/stable-10-libnv/sys/i386/i386/machdep.c
user/ngie/stable-10-libnv/sys/i386/isa/npx.c
user/ngie/stable-10-libnv/sys/i386/linux/linux_sysvec.c
user/ngie/stable-10-libnv/sys/kern/kern_condvar.c
user/ngie/stable-10-libnv/sys/kern/kern_conf.c
user/ngie/stable-10-libnv/sys/kern/kern_environment.c
user/ngie/stable-10-libnv/sys/kern/subr_bus.c
user/ngie/stable-10-libnv/sys/kern/subr_busdma_bufalloc.c
user/ngie/stable-10-libnv/sys/kern/subr_hints.c
user/ngie/stable-10-libnv/sys/kern/tty.c
user/ngie/stable-10-libnv/sys/mips/include/asm.h
user/ngie/stable-10-libnv/sys/modules/syscons/Makefile
user/ngie/stable-10-libnv/sys/netinet/sctp_input.c
user/ngie/stable-10-libnv/sys/netinet/sctp_output.c
user/ngie/stable-10-libnv/sys/netinet/sctp_output.h
user/ngie/stable-10-libnv/sys/netinet/sctp_pcb.c
user/ngie/stable-10-libnv/sys/netinet/sctp_var.h
user/ngie/stable-10-libnv/sys/netinet/tcp_output.c
user/ngie/stable-10-libnv/sys/netinet/tcp_subr.c
user/ngie/stable-10-libnv/sys/netinet/tcp_timer.c
user/ngie/stable-10-libnv/sys/netinet/tcp_timer.h
user/ngie/stable-10-libnv/sys/powerpc/powerpc/busdma_machdep.c
user/ngie/stable-10-libnv/sys/sparc64/sparc64/bus_machdep.c
user/ngie/stable-10-libnv/sys/sparc64/sparc64/machdep.c
user/ngie/stable-10-libnv/sys/sys/ata.h
user/ngie/stable-10-libnv/sys/sys/bus.h
user/ngie/stable-10-libnv/sys/sys/conf.h
user/ngie/stable-10-libnv/sys/sys/elf_common.h
user/ngie/stable-10-libnv/sys/sys/param.h
user/ngie/stable-10-libnv/sys/sys/ttydevsw.h
user/ngie/stable-10-libnv/sys/x86/x86/busdma_bounce.c
user/ngie/stable-10-libnv/tools/build/mk/OptionalObsoleteFiles.inc
user/ngie/stable-10-libnv/tools/regression/geom_gate/test-1.t
user/ngie/stable-10-libnv/tools/regression/geom_gate/test-2.t
user/ngie/stable-10-libnv/tools/regression/geom_gate/test-3.t
user/ngie/stable-10-libnv/tools/regression/posixsem2/semtest.c
user/ngie/stable-10-libnv/usr.bin/dpv/dpv.1
user/ngie/stable-10-libnv/usr.bin/dpv/dpv.c
user/ngie/stable-10-libnv/usr.bin/locate/locate/locate.rc
user/ngie/stable-10-libnv/usr.bin/locate/locate/updatedb.sh
user/ngie/stable-10-libnv/usr.bin/truncate/tests/truncate_test.sh
user/ngie/stable-10-libnv/usr.sbin/Makefile
user/ngie/stable-10-libnv/usr.sbin/bhyve/Makefile
user/ngie/stable-10-libnv/usr.sbin/bhyve/bhyve.8
user/ngie/stable-10-libnv/usr.sbin/bhyve/bhyverun.c
user/ngie/stable-10-libnv/usr.sbin/bhyve/dbgport.c
user/ngie/stable-10-libnv/usr.sbin/bhyve/pci_ahci.c
user/ngie/stable-10-libnv/usr.sbin/bhyve/pci_lpc.c
user/ngie/stable-10-libnv/usr.sbin/bhyve/pci_lpc.h
user/ngie/stable-10-libnv/usr.sbin/bhyve/pci_passthru.c
user/ngie/stable-10-libnv/usr.sbin/bhyve/pci_virtio_net.c
user/ngie/stable-10-libnv/usr.sbin/bhyve/uart_emul.c
user/ngie/stable-10-libnv/usr.sbin/bhyvectl/Makefile
user/ngie/stable-10-libnv/usr.sbin/bhyvectl/bhyvectl.c
user/ngie/stable-10-libnv/usr.sbin/bhyveload/bhyveload.8
user/ngie/stable-10-libnv/usr.sbin/bhyveload/bhyveload.c
user/ngie/stable-10-libnv/usr.sbin/bsdconfig/share/dialog.subr
user/ngie/stable-10-libnv/usr.sbin/bsdconfig/share/strings.subr
Directory Properties:
user/ngie/stable-10-libnv/ (props changed)
user/ngie/stable-10-libnv/crypto/openssh/sandbox-capsicum.c (props changed)
Modified: user/ngie/stable-10-libnv/UPDATING
==============================================================================
--- user/ngie/stable-10-libnv/UPDATING Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/UPDATING Thu Feb 4 09:39:08 2016 (r295248)
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH
stable/10, and then rebuild without this option. The bootstrap process from
older version of current is a bit fragile.
+20160124:
+ The NONE and HPN patches has been removed from OpenSSH. They are
+ still available in the security/openssh-portable port.
+
20151214:
r292223 changed the internal interface between the nfsd.ko and
nfscommon.ko modules. As such, they must both be upgraded to-gether.
Modified: user/ngie/stable-10-libnv/contrib/mdocml/lib.in
==============================================================================
--- user/ngie/stable-10-libnv/contrib/mdocml/lib.in Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/contrib/mdocml/lib.in Thu Feb 4 09:39:08 2016 (r295248)
@@ -37,6 +37,7 @@ LINE("libcipher", "FreeSec Crypt Library
LINE("libcompat", "Compatibility Library (libcompat, \\-lcompat)")
LINE("libcrypt", "Crypt Library (libcrypt, \\-lcrypt)")
LINE("libcurses", "Curses Library (libcurses, \\-lcurses)")
+LINE("libdevctl", "Device Control Library (libdevctl, \\-ldevctl)")
LINE("libdevinfo", "Device and Resource Information Utility Library (libdevinfo, \\-ldevinfo)")
LINE("libdevstat", "Device Statistics Library (libdevstat, \\-ldevstat)")
LINE("libdisk", "Interface to Slice and Partition Labels Library (libdisk, \\-ldisk)")
Modified: user/ngie/stable-10-libnv/crypto/openssh/FREEBSD-upgrade
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/FREEBSD-upgrade Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/FREEBSD-upgrade Thu Feb 4 09:39:08 2016 (r295248)
@@ -3,81 +3,97 @@
FreeBSD maintainer's guide to OpenSSH-portable
==============================================
-XXX
-XXX this needs a complete rewrite
-XXX svn merge from vendor branch, resolve conflicts manually
-XXX (see FREEBSD-tricks for tips on how to reduce conflicts)
-XXX run freebsd-configure.sh to generate config.h and krb5_config.h
-XXX svn diff Makefile.in to see if the Makefiles need adjusting
-XXX
+00) Make sure your mail spool has plenty of free space. It'll fill up
+ pretty fast once you're done with this checklist.
-0) Make sure your mail spool has plenty of free space. It'll fill up
- pretty fast once you're done with this checklist.
+01) Download the latest OpenSSH-portable tarball and signature from
+ OpenBSD (ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/).
-1) Grab the latest OpenSSH-portable tarball from the OpenBSD FTP
- site (ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/)
+02) Verify the signature:
-2) Unpack the tarball in a suitable directory.
+ $ gpg --verify openssh-X.YpZ.tar.gz.asc
- $ tar xf openssh-X.YpZ.tar.gz \
- -X /usr/src/crypto/openssh/FREEBSD-Xlist
+03) Unpack the tarball in a suitable directory:
-3) Remove trash:
+ $ tar xf openssh-X.YpZ.tar.gz
- Make sure -X took care of everything, and if it didn't, make sure
- to update FREEBSD-Xlist so you won't miss it the next time. A good
- way to do this is to run a test import and see if any new files
- show up:
+04) Copy to the vendor directory:
- $ cvs -n import src/crypto/openssh OPENSSH x | grep \^N
+ $ svn co svn+ssh://svn.freebsd.org/base/vendor-crypto/openssh/dist
+ $ rsync --archive --delete openssh-X.YpZ/ dist/
-4) Import the sources:
+05) Take care of added / deleted files:
- $ cvs import src/crypto/openssh OPENSSH OpenSSH_X_YpZ
+ $ svn rm $(svn stat dist | awk '$1 == "!" { print $2 }')
+ $ svn add --no-auto-props $(svn stat dist | awk '$1 == "?" { print $2 }')
-5) Resolve conflicts. Remember to bump the version number and
- addendum in version.h, and update the default value in
- ssh{,d}_config and ssh{,d}_config.5.
+06) Commit:
-6) Generate configure and config.h.in:
+ $ svn commit -m "Vendor import of OpenSSH X.YpZ." dist
- $ autoconf
- $ autoheader
+07) Tag:
- Note: this requires a recent version of autoconf, not autoconf213.
+ $ svn copy -m "Tag OpenSSH X.YpZ." \
+ svn+ssh://svn.freebsd.org/base/vendor-crypto/openssh/dist \
+ svn+ssh://svn.freebsd.org/base/vendor-crypto/openssh/X.YpZ
-7) Run configure with the appropriate arguments:
+08) Check out head and run the pre-merge script:
- $ ./configure --prefix=/usr --sysconfdir=/etc/ssh \
- --with-pam --with-tcp-wrappers --with-libedit \
- --with-ssl-engine
+ $ svn co svn+ssh://svn.freebsd.org/base/head
+ $ cd head/crypto/openssh
+ $ sh freebsd-pre-merge.sh
- This will regenerate config.h, which must be committed along with
- the rest.
+09) Merge from the vendor branch:
- Note that we don't want to configure OpenSSH for Kerberos using
- configure since we have to be able to turn it on or off depending
- on the value of MK_KERBEROS. Our Makefiles take care of this.
+ $ svn merge -cNNNNNN \^/vendor-crypto/openssh/dist .
-8) If source files have been added or removed, update the appropriate
- makefiles to reflect changes in the vendor's Makefile.in.
+0A) Resolve conflicts. Remember to bump the version addendum in
+ version.h, and update the default value in ssh{,d}_config and
+ ssh{,d}_config.5.
-9) Build libssh. Follow the instructions in ssh_namespace.h to get a
- list of new symbols. Update ssh_namespace.h, build everything,
- install and test.
+0B) Diff against the vendor branch:
-A) Build and test the pam_ssh PAM module. It gropes around libssh's
- internals and will break if something significant changes or if
- ssh_namespace.h is out of whack.
+ $ svn diff \^/vendor-crypto/openssh/dist .
-B) Re-commit everything on repoman (you *did* use a test repo for
- this, didn't you?)
+ Files that have modifications relative to the vendor code, and
+ only those files, must have the svn:keywords property set to
+ FreeBSD=%H and be listed in the 'keywords' file created by the
+ pre-merge script.
+
+0C) Run the post-merge script:
+
+ $ sh freebsd-post-merge.sh
+
+0D) Run the configure script:
+
+ $ sh freebsd-configure.sh
+
+0E) Check config.h very carefully.
+
+0F) If source files have been added or removed, update the appropriate
+ makefiles to reflect changes in the vendor's Makefile.in.
+
+10) Build libssh:
+
+ $ cd ../../secure/lib/libssh && make obj && make depend && make
+
+11) Follow the instructions in ssh_namespace.h to get a list of new
+ symbols, and them to ssh_namespace.h. Keep it sorted!
+
+12) Build and install world, reboot, test. Pay particular attention
+ to pam_ssh(8), which gropes inside libssh and will break if
+ something significant changes or if ssh_namespace.h is out of
+ whack.
+
+13) Commit, and hunker down for the inevitable storm of complaints.
An overview of FreeBSD changes to OpenSSH-portable
==================================================
+XXX This section is out of date
+
0) VersionAddendum
The SSH protocol allows for a human-readable version string of up
Modified: user/ngie/stable-10-libnv/crypto/openssh/auth-krb5.c
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/auth-krb5.c Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/auth-krb5.c Thu Feb 4 09:39:08 2016 (r295248)
@@ -2,7 +2,7 @@
/*
* Kerberos v5 authentication and ticket-passing routines.
*
- * $FreeBSD: src/crypto/openssh/auth-krb5.c,v 1.6 2001/02/13 16:58:04 assar Exp $
+ * $FreeBSD$
*/
/*
* Copyright (c) 2002 Daniel Kouril. All rights reserved.
Modified: user/ngie/stable-10-libnv/crypto/openssh/buffer.c
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/buffer.c Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/buffer.c Thu Feb 4 09:39:08 2016 (r295248)
@@ -1,5 +1,4 @@
/* $OpenBSD: buffer.c,v 1.35 2014/02/02 03:44:31 djm Exp $ */
-/* $FreeBSD$ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -27,7 +26,7 @@
#include "log.h"
#define BUFFER_MAX_CHUNK 0x100000
-#define BUFFER_MAX_LEN 0x4000000 /* 64MB */
+#define BUFFER_MAX_LEN 0xa00000
#define BUFFER_ALLOCSZ 0x008000
/* Initializes the buffer structure. */
@@ -167,13 +166,6 @@ buffer_len(const Buffer *buffer)
return buffer->end - buffer->offset;
}
-/* Returns the maximum number of bytes of data that may be in the buffer. */
-u_int
-buffer_get_max_len(void)
-{
- return (BUFFER_MAX_LEN);
-}
-
/* Gets data from the beginning of the buffer. */
int
Modified: user/ngie/stable-10-libnv/crypto/openssh/buffer.h
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/buffer.h Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/buffer.h Thu Feb 4 09:39:08 2016 (r295248)
@@ -1,5 +1,4 @@
/* $OpenBSD: buffer.h,v 1.23 2014/01/12 08:13:13 djm Exp $ */
-/* $FreeBSD$ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -47,8 +46,6 @@ int buffer_get_ret(Buffer *, void *, u_
int buffer_consume_ret(Buffer *, u_int);
int buffer_consume_end_ret(Buffer *, u_int);
-u_int buffer_get_max_len(void);
-
#include <openssl/bn.h>
void buffer_put_bignum(Buffer *, const BIGNUM *);
Modified: user/ngie/stable-10-libnv/crypto/openssh/channels.c
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/channels.c Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/channels.c Thu Feb 4 09:39:08 2016 (r295248)
@@ -1,5 +1,4 @@
/* $OpenBSD: channels.c,v 1.331 2014/02/26 20:29:29 djm Exp $ */
-/* $FreeBSD$ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -174,11 +173,6 @@ static void port_open_helper(Channel *c,
static int connect_next(struct channel_connect *);
static void channel_connect_ctx_free(struct channel_connect *);
-/* -- HPN */
-
-static int hpn_disabled = 0;
-static u_int buffer_size = CHAN_HPN_MIN_WINDOW_DEFAULT;
-
/* -- channel core */
Channel *
@@ -325,7 +319,6 @@ channel_new(char *ctype, int type, int r
c->self = found;
c->type = type;
c->ctype = ctype;
- c->dynamic_window = 0;
c->local_window = window;
c->local_window_max = window;
c->local_consumed = 0;
@@ -826,45 +819,10 @@ channel_pre_open_13(Channel *c, fd_set *
FD_SET(c->sock, writeset);
}
-static u_int
-channel_tcpwinsz(void)
-{
- u_int32_t tcpwinsz;
- socklen_t optsz;
- int ret, sd;
- u_int maxlen;
-
- /* If we are not on a socket return 128KB. */
- if (!packet_connection_is_on_socket())
- return (128 * 1024);
-
- tcpwinsz = 0;
- optsz = sizeof(tcpwinsz);
- sd = packet_get_connection_in();
- ret = getsockopt(sd, SOL_SOCKET, SO_RCVBUF, &tcpwinsz, &optsz);
-
- /* Return no more than the maximum buffer size. */
- maxlen = buffer_get_max_len();
- if ((ret == 0) && tcpwinsz > maxlen)
- tcpwinsz = maxlen;
- /* In case getsockopt() failed return a minimum. */
- if (tcpwinsz == 0)
- tcpwinsz = CHAN_TCP_WINDOW_DEFAULT;
- debug2("tcpwinsz: %d for connection: %d", tcpwinsz, sd);
- return (tcpwinsz);
-}
-
static void
channel_pre_open(Channel *c, fd_set *readset, fd_set *writeset)
{
- u_int limit;
-
- /* Check buffer limits. */
- if (!c->tcpwinsz || c->dynamic_window > 0)
- c->tcpwinsz = channel_tcpwinsz();
-
- limit = MIN(compat20 ? c->remote_window : packet_get_maxsize(),
- 2 * c->tcpwinsz);
+ u_int limit = compat20 ? c->remote_window : packet_get_maxsize();
if (c->istate == CHAN_INPUT_OPEN &&
limit > 0 &&
@@ -1857,25 +1815,14 @@ channel_check_window(Channel *c)
c->local_maxpacket*3) ||
c->local_window < c->local_window_max/2) &&
c->local_consumed > 0) {
- u_int addition = 0;
-
- /* Adjust max window size if we are in a dynamic environment. */
- if (c->dynamic_window && c->tcpwinsz > c->local_window_max) {
- /*
- * Grow the window somewhat aggressively to maintain
- * pressure.
- */
- addition = 1.5 * (c->tcpwinsz - c->local_window_max);
- c->local_window_max += addition;
- }
packet_start(SSH2_MSG_CHANNEL_WINDOW_ADJUST);
packet_put_int(c->remote_id);
- packet_put_int(c->local_consumed + addition);
+ packet_put_int(c->local_consumed);
packet_send();
debug2("channel %d: window %d sent adjust %d",
c->self, c->local_window,
c->local_consumed);
- c->local_window += c->local_consumed + addition;
+ c->local_window += c->local_consumed;
c->local_consumed = 0;
}
return 1;
@@ -2739,14 +2686,6 @@ channel_set_af(int af)
IPv4or6 = af;
}
-void
-channel_set_hpn(int disabled, u_int buf_size)
-{
- hpn_disabled = disabled;
- buffer_size = buf_size;
- debug("HPN Disabled: %d, HPN Buffer Size: %d",
- hpn_disabled, buffer_size);
-}
/*
* Determine whether or not a port forward listens to loopback, the
@@ -2924,18 +2863,10 @@ channel_setup_fwd_listener(int type, con
*allocated_listen_port);
}
- /*
- * Allocate a channel number for the socket. Explicitly test
- * for hpn disabled option. If true use smaller window size.
- */
- if (hpn_disabled)
- c = channel_new("port listener", type, sock, sock, -1,
- CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT,
- 0, "port listener", 1);
- else
- c = channel_new("port listener", type, sock, sock, -1,
- buffer_size, CHAN_TCP_PACKET_DEFAULT,
- 0, "port listener", 1);
+ /* Allocate a channel number for the socket. */
+ c = channel_new("port listener", type, sock, sock, -1,
+ CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT,
+ 0, "port listener", 1);
c->path = xstrdup(host);
c->host_port = port_to_connect;
c->listening_addr = addr == NULL ? NULL : xstrdup(addr);
@@ -3583,16 +3514,10 @@ x11_create_display_inet(int x11_display_
*chanids = xcalloc(num_socks + 1, sizeof(**chanids));
for (n = 0; n < num_socks; n++) {
sock = socks[n];
- if (hpn_disabled)
- nc = channel_new("x11 listener",
- SSH_CHANNEL_X11_LISTENER, sock, sock, -1,
- CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT,
- 0, "X11 inet listener", 1);
- else
- nc = channel_new("x11 listener",
- SSH_CHANNEL_X11_LISTENER, sock, sock, -1,
- buffer_size, CHAN_X11_PACKET_DEFAULT,
- 0, "X11 inet listener", 1);
+ nc = channel_new("x11 listener",
+ SSH_CHANNEL_X11_LISTENER, sock, sock, -1,
+ CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT,
+ 0, "X11 inet listener", 1);
nc->single_connection = single_connection;
(*chanids)[n] = nc->self;
}
Modified: user/ngie/stable-10-libnv/crypto/openssh/channels.h
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/channels.h Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/channels.h Thu Feb 4 09:39:08 2016 (r295248)
@@ -1,5 +1,4 @@
/* $OpenBSD: channels.h,v 1.113 2013/06/07 15:37:52 dtucker Exp $ */
-/* $FreeBSD$ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -133,8 +132,6 @@ struct Channel {
u_int local_window_max;
u_int local_consumed;
u_int local_maxpacket;
- u_int tcpwinsz;
- int dynamic_window;
int extended_usage;
int single_connection;
@@ -176,7 +173,6 @@ struct Channel {
#define CHAN_TCP_WINDOW_DEFAULT (64*CHAN_TCP_PACKET_DEFAULT)
#define CHAN_X11_PACKET_DEFAULT (16*1024)
#define CHAN_X11_WINDOW_DEFAULT (4*CHAN_X11_PACKET_DEFAULT)
-#define CHAN_HPN_MIN_WINDOW_DEFAULT (2*1024*1024)
/* possible input states */
#define CHAN_INPUT_OPEN 0
@@ -310,8 +306,4 @@ void chan_rcvd_ieof(Channel *);
void chan_write_failed(Channel *);
void chan_obuf_empty(Channel *);
-/* hpn handler */
-
-void channel_set_hpn(int, u_int);
-
#endif
Modified: user/ngie/stable-10-libnv/crypto/openssh/cipher.c
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/cipher.c Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/cipher.c Thu Feb 4 09:39:08 2016 (r295248)
@@ -1,5 +1,4 @@
/* $OpenBSD: cipher.c,v 1.97 2014/02/07 06:55:54 djm Exp $ */
-/* $FreeBSD$ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -225,12 +224,7 @@ ciphers_valid(const char *names)
for ((p = strsep(&cp, CIPHER_SEP)); p && *p != '\0';
(p = strsep(&cp, CIPHER_SEP))) {
c = cipher_by_name(p);
-#ifdef NONE_CIPHER_ENABLED
- if (c == NULL || (c->number != SSH_CIPHER_SSH2 &&
- c->number != SSH_CIPHER_NONE)) {
-#else
- if (c == NULL || (c->number != SSH_CIPHER_SSH2)) {
-#endif
+ if (c == NULL || c->number != SSH_CIPHER_SSH2) {
debug("bad cipher %s [%s]", p, names);
free(cipher_list);
return 0;
@@ -485,9 +479,6 @@ cipher_get_keyiv(CipherContext *cc, u_ch
}
switch (c->number) {
-#ifdef NONE_CIPHER_ENABLED
- case SSH_CIPHER_NONE:
-#endif
case SSH_CIPHER_SSH2:
case SSH_CIPHER_DES:
case SSH_CIPHER_BLOWFISH:
@@ -527,9 +518,6 @@ cipher_set_keyiv(CipherContext *cc, u_ch
return;
switch (c->number) {
-#ifdef NONE_CIPHER_ENABLED
- case SSH_CIPHER_NONE:
-#endif
case SSH_CIPHER_SSH2:
case SSH_CIPHER_DES:
case SSH_CIPHER_BLOWFISH:
Modified: user/ngie/stable-10-libnv/crypto/openssh/clientloop.c
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/clientloop.c Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/clientloop.c Thu Feb 4 09:39:08 2016 (r295248)
@@ -1,5 +1,4 @@
/* $OpenBSD: clientloop.c,v 1.258 2014/02/02 03:44:31 djm Exp $ */
-/* $FreeBSD$ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1892,14 +1891,9 @@ client_request_x11(const char *request_t
sock = x11_connect_display();
if (sock < 0)
return NULL;
- if (options.hpn_disabled)
- c = channel_new("x11", SSH_CHANNEL_X11_OPEN, sock, sock, -1,
- CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT,
- 0, "x11", 1);
- else
- c = channel_new("x11", SSH_CHANNEL_X11_OPEN, sock, sock, -1,
- options.hpn_buffer_size, CHAN_X11_PACKET_DEFAULT,
- 0, "x11", 1);
+ c = channel_new("x11",
+ SSH_CHANNEL_X11_OPEN, sock, sock, -1,
+ CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11", 1);
c->force_drain = 1;
return c;
}
@@ -1919,16 +1913,10 @@ client_request_agent(const char *request
sock = ssh_get_authentication_socket();
if (sock < 0)
return NULL;
- if (options.hpn_disabled)
- c = channel_new("authentication agent connection",
- SSH_CHANNEL_OPEN, sock, sock, -1,
- CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0,
- "authentication agent connection", 1);
- else
- c = channel_new("authentication agent connection",
- SSH_CHANNEL_OPEN, sock, sock, -1,
- options.hpn_buffer_size, options.hpn_buffer_size, 0,
- "authentication agent connection", 1);
+ c = channel_new("authentication agent connection",
+ SSH_CHANNEL_OPEN, sock, sock, -1,
+ CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0,
+ "authentication agent connection", 1);
c->force_drain = 1;
return c;
}
@@ -1955,14 +1943,8 @@ client_request_tun_fwd(int tun_mode, int
return -1;
}
- if (options.hpn_disabled)
- c = channel_new("tun", SSH_CHANNEL_OPENING, fd, fd, -1,
- CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT,
- 0, "tun", 1);
- else
- c = channel_new("tun", SSH_CHANNEL_OPENING, fd, fd, -1,
- options.hpn_buffer_size, CHAN_TCP_PACKET_DEFAULT,
- 0, "tun", 1);
+ c = channel_new("tun", SSH_CHANNEL_OPENING, fd, fd, -1,
+ CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1);
c->datagram = 1;
#if defined(SSH_TUN_FILTER)
Modified: user/ngie/stable-10-libnv/crypto/openssh/compat.c
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/compat.c Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/compat.c Thu Feb 4 09:39:08 2016 (r295248)
@@ -1,5 +1,4 @@
/* $OpenBSD: compat.c,v 1.82 2013/12/30 23:52:27 djm Exp $ */
-/* $FreeBSD$ */
/*
* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
*
@@ -178,16 +177,6 @@ compat_datafellows(const char *version)
datafellows = check[i].bugs;
debug("match: %s pat %s compat 0x%08x",
version, check[i].pat, datafellows);
- /*
- * Check to see if the remote side is OpenSSH and not
- * HPN. It is utterly strange to check it from the
- * version string and expose the option that way.
- */
- if (strstr(version,"OpenSSH") != NULL &&
- strstr(version,"hpn") == NULL) {
- datafellows |= SSH_BUG_LARGEWINDOW;
- debug("Remote is not HPN-aware");
- }
return;
}
}
Modified: user/ngie/stable-10-libnv/crypto/openssh/compat.h
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/compat.h Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/compat.h Thu Feb 4 09:39:08 2016 (r295248)
@@ -1,5 +1,4 @@
/* $OpenBSD: compat.h,v 1.44 2013/12/30 23:52:27 djm Exp $ */
-/* $FreeBSD$ */
/*
* Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved.
@@ -62,8 +61,6 @@
#define SSH_BUG_DYNAMIC_RPORT 0x08000000
#define SSH_BUG_CURVE25519PAD 0x10000000
-#define SSH_BUG_LARGEWINDOW 0x80000000
-
void enable_compat13(void);
void enable_compat20(void);
void compat_datafellows(const char *);
Modified: user/ngie/stable-10-libnv/crypto/openssh/config.h
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/config.h Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/config.h Thu Feb 4 09:39:08 2016 (r295248)
@@ -1681,6 +1681,11 @@
/* Define if xauth is found in your path */
/* #undef XAUTH_PATH */
+/* Enable large inode numbers on Mac OS X 10.5. */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
Modified: user/ngie/stable-10-libnv/crypto/openssh/configure.ac
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/configure.ac Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/configure.ac Thu Feb 4 09:39:08 2016 (r295248)
@@ -1,4 +1,5 @@
# $Id: configure.ac,v 1.571 2014/02/21 17:09:34 tim Exp $
+# $FreeBSD$
#
# Copyright (c) 1999-2004 Damien Miller
#
Modified: user/ngie/stable-10-libnv/crypto/openssh/freebsd-configure.sh
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/freebsd-configure.sh Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/freebsd-configure.sh Thu Feb 4 09:39:08 2016 (r295248)
@@ -7,6 +7,7 @@ configure_args="
--prefix=/usr
--sysconfdir=/etc/ssh
--with-pam
+ --with-ssl-dir=/usr
--with-tcp-wrappers
--with-libedit
--with-ssl-engine
@@ -15,6 +16,19 @@ configure_args="
set -e
+# make sure configure uses the correct compiler
+export CC=$(echo ".include <bsd.lib.mk>" | make -f /dev/stdin -VCC)
+export CPP=$(echo ".include <bsd.lib.mk>" | make -f /dev/stdin -VCPP)
+unset CFLAGS CPPFLAGS LDFLAGS LIBS
+
+# regenerate configure and config.h.in
+autoheader
+autoconf
+
+# reset PATH to avoid picking up the wrong libraries
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+unset LD_LIBRARY_PATH
+
# generate config.h with krb5 and stash it
sh configure $configure_args --with-kerberos5
mv config.log config.log.orig
Copied: user/ngie/stable-10-libnv/crypto/openssh/freebsd-post-merge.sh (from r295247, stable/10/crypto/openssh/freebsd-post-merge.sh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/stable-10-libnv/crypto/openssh/freebsd-post-merge.sh Thu Feb 4 09:39:08 2016 (r295248, copy of r295247, stable/10/crypto/openssh/freebsd-post-merge.sh)
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+xargs perl -n -i -e '
+ print;
+ s/\$(Id|OpenBSD): [^\$]*/\$FreeBSD/ && print;
+' <keywords
+
+xargs perl -n -i -e '
+ print;
+ m/^\#include "includes.h"/ && print "__RCSID(\"\$FreeBSD\$\");\n";
+' <rcsid
Copied: user/ngie/stable-10-libnv/crypto/openssh/freebsd-pre-merge.sh (from r295247, stable/10/crypto/openssh/freebsd-pre-merge.sh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/stable-10-libnv/crypto/openssh/freebsd-pre-merge.sh Thu Feb 4 09:39:08 2016 (r295248, copy of r295247, stable/10/crypto/openssh/freebsd-pre-merge.sh)
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+:>keywords
+:>rcsid
+svn list -R | grep -v '/$' | \
+while read f ; do
+ svn proplist -v $f | grep -q 'FreeBSD=%H' || continue
+ egrep -l '^(#|\.\\"|/\*)[[:space:]]+\$FreeBSD[:\$]' $f >>keywords
+ egrep -l '__RCSID\("\$FreeBSD[:\$]' $f >>rcsid
+done
+sort -u keywords rcsid | xargs perl -n -i -e '
+ $strip = $ARGV if /\$(Id|OpenBSD):.*\$/;
+ print unless (($strip eq $ARGV || /__RCSID/) && /\$FreeBSD[:\$]/);
+'
Modified: user/ngie/stable-10-libnv/crypto/openssh/kex.c
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/kex.c Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/kex.c Thu Feb 4 09:39:08 2016 (r295248)
@@ -1,5 +1,4 @@
/* $OpenBSD: kex.c,v 1.98 2014/02/02 03:44:31 djm Exp $ */
-/* $FreeBSD$ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
*
@@ -146,13 +145,8 @@ kex_names_valid(const char *names)
return 1;
}
-/* put algorithm proposal into buffer. */
-#ifndef NONE_CIPHER_ENABLED
+/* put algorithm proposal into buffer */
static void
-#else
-/* Also used in sshconnect2.c. */
-void
-#endif
kex_prop2buf(Buffer *b, char *proposal[PROPOSAL_MAX])
{
u_int i;
@@ -466,9 +460,6 @@ kex_choose_conf(Kex *kex)
int nenc, nmac, ncomp;
u_int mode, ctos, need, dh_need, authlen;
int first_kex_follows, type;
-#ifdef NONE_CIPHER_ENABLED
- int auth_flag;
-#endif
my = kex_buf2prop(&kex->my, NULL);
peer = kex_buf2prop(&kex->peer, &first_kex_follows);
@@ -492,10 +483,6 @@ kex_choose_conf(Kex *kex)
}
/* Algorithm Negotiation */
-#ifdef NONE_CIPHER_ENABLED
- auth_flag = packet_get_authentication_state();
- debug ("AUTH STATE is %d", auth_flag);
-#endif
for (mode = 0; mode < MODE_MAX; mode++) {
newkeys = xcalloc(1, sizeof(*newkeys));
kex->newkeys[mode] = newkeys;
@@ -510,17 +497,6 @@ kex_choose_conf(Kex *kex)
if (authlen == 0)
choose_mac(&newkeys->mac, cprop[nmac], sprop[nmac]);
choose_comp(&newkeys->comp, cprop[ncomp], sprop[ncomp]);
-#ifdef NONE_CIPHER_ENABLED
- debug("REQUESTED ENC.NAME is '%s'", newkeys->enc.name);
- if (strcmp(newkeys->enc.name, "none") == 0) {
- debug("Requesting NONE. Authflag is %d", auth_flag);
- if (auth_flag == 1)
- debug("None requested post authentication.");
- else
- fatal("Pre-authentication none cipher requests "
- "are not allowed.");
- }
-#endif
debug("kex: %s %s %s %s",
ctos ? "client->server" : "server->client",
newkeys->enc.name,
Modified: user/ngie/stable-10-libnv/crypto/openssh/kex.h
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/kex.h Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/kex.h Thu Feb 4 09:39:08 2016 (r295248)
@@ -1,5 +1,4 @@
/* $OpenBSD: kex.h,v 1.62 2014/01/27 18:58:14 markus Exp $ */
-/* $FreeBSD$ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -149,10 +148,6 @@ struct Kex {
int kex_names_valid(const char *);
char *kex_alg_list(char);
-#ifdef NONE_CIPHER_ENABLED
-void kex_prop2buf(Buffer *, char *[PROPOSAL_MAX]);
-#endif
-
Kex *kex_setup(char *[PROPOSAL_MAX]);
void kex_finish(Kex *);
Modified: user/ngie/stable-10-libnv/crypto/openssh/misc.c
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/misc.c Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/misc.c Thu Feb 4 09:39:08 2016 (r295248)
@@ -1,5 +1,4 @@
/* $OpenBSD: misc.c,v 1.92 2013/10/14 23:28:23 djm Exp $ */
-/* $FreeBSD$ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@@ -1037,34 +1036,3 @@ sock_set_v6only(int s)
error("setsockopt IPV6_V6ONLY: %s", strerror(errno));
#endif
}
-
-void
-sock_get_rcvbuf(int *size, int rcvbuf)
-{
- int sock, socksize;
- socklen_t socksizelen = sizeof(socksize);
-
- /*
- * Create a socket but do not connect it. We use it
- * only to get the rcv socket size.
- */
- sock = socket(AF_INET6, SOCK_STREAM, 0);
- if (sock < 0)
- sock = socket(AF_INET, SOCK_STREAM, 0);
- if (sock < 0)
- return;
-
- /*
- * If the tcp_rcv_buf option is set and passed in, attempt to set the
- * buffer size to its value.
- */
- if (rcvbuf)
- setsockopt(sock, SOL_SOCKET, SO_RCVBUF, (void *)&rcvbuf,
- sizeof(rcvbuf));
-
- if (getsockopt(sock, SOL_SOCKET, SO_RCVBUF,
- &socksize, &socksizelen) == 0)
- if (size != NULL)
- *size = socksize;
- close(sock);
-}
Modified: user/ngie/stable-10-libnv/crypto/openssh/misc.h
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/misc.h Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/misc.h Thu Feb 4 09:39:08 2016 (r295248)
@@ -1,5 +1,4 @@
/* $OpenBSD: misc.h,v 1.50 2013/10/14 23:28:23 djm Exp $ */
-/* $FreeBSD$ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -40,7 +39,6 @@ time_t monotime(void);
void lowercase(char *s);
void sock_set_v6only(int);
-void sock_get_rcvbuf(int *, int);
struct passwd *pwcopy(struct passwd *);
const char *ssh_gai_strerror(int);
Modified: user/ngie/stable-10-libnv/crypto/openssh/moduli.5
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/moduli.5 Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/moduli.5 Thu Feb 4 09:39:08 2016 (r295248)
@@ -13,7 +13,7 @@
.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.Dd September 26, 2012
+.Dd $Mdocdate: September 26 2012 $
.Dt MODULI 5
.Os
.Sh NAME
Modified: user/ngie/stable-10-libnv/crypto/openssh/mux.c
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/mux.c Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/mux.c Thu Feb 4 09:39:08 2016 (r295248)
@@ -31,6 +31,7 @@
*/
#include "includes.h"
+__RCSID("$FreeBSD$");
#include <sys/types.h>
#include <sys/param.h>
Modified: user/ngie/stable-10-libnv/crypto/openssh/myproposal.h
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/myproposal.h Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/myproposal.h Thu Feb 4 09:39:08 2016 (r295248)
@@ -110,10 +110,6 @@
"chacha20-poly1305@openssh.com," \
"aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \
"aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se"
-#ifdef NONE_CIPHER_ENABLED
-#define KEX_ENCRYPT_INCLUDE_NONE KEX_DEFAULT_ENCRYPT \
- ",none"
-#endif
#define KEX_DEFAULT_MAC \
"hmac-md5-etm@openssh.com," \
Modified: user/ngie/stable-10-libnv/crypto/openssh/packet.c
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/packet.c Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/packet.c Thu Feb 4 09:39:08 2016 (r295248)
@@ -38,6 +38,7 @@
*/
#include "includes.h"
+__RCSID("$FreeBSD$");
#include <sys/types.h>
#include "openbsd-compat/sys-queue.h"
@@ -201,9 +202,6 @@ struct session_state {
};
static struct session_state *active_state, *backup_state;
-#ifdef NONE_CIPHER_ENABLED
-static int rekey_requested = 0;
-#endif
static struct session_state *
alloc_session_state(void)
@@ -1315,7 +1313,6 @@ packet_read_poll2(u_int32_t *seqnr_p)
buffer_ptr(&active_state->input), block_size, 0, 0) != 0)
fatal("Decryption integrity check failed");
cp = buffer_ptr(&active_state->incoming_packet);
-
active_state->packlen = get_u32(cp);
if (active_state->packlen < 1 + 4 ||
active_state->packlen > PACKET_MAX_SIZE) {
@@ -1942,26 +1939,12 @@ packet_send_ignore(int nbytes)
}
}
-#ifdef NONE_CIPHER_ENABLED
-void
-packet_request_rekeying(void)
-{
- rekey_requested = 1;
-}
-#endif
-
#define MAX_PACKETS (1U<<31)
int
packet_need_rekeying(void)
{
if (datafellows & SSH_BUG_NOREKEY)
return 0;
-#ifdef NONE_CIPHER_ENABLED
- if (rekey_requested == 1) {
- rekey_requested = 0;
- return 1;
- }
-#endif
return
(active_state->p_send.packets > MAX_PACKETS) ||
(active_state->p_read.packets > MAX_PACKETS) ||
@@ -2073,11 +2056,3 @@ packet_restore_state(void)
add_recv_bytes(len);
}
}
-
-#ifdef NONE_CIPHER_ENABLED
-int
-packet_get_authentication_state(void)
-{
- return (active_state->after_authentication);
-}
-#endif
Modified: user/ngie/stable-10-libnv/crypto/openssh/packet.h
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/packet.h Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/packet.h Thu Feb 4 09:39:08 2016 (r295248)
@@ -1,5 +1,4 @@
/* $OpenBSD: packet.h,v 1.59 2013/07/12 00:19:59 djm Exp $ */
-/* $FreeBSD$ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -39,9 +38,6 @@ void packet_set_interactive(int, int
int packet_is_interactive(void);
void packet_set_server(void);
void packet_set_authenticated(void);
-#ifdef NONE_CIPHER_ENABLED
-int packet_get_authentication_state(void);
-#endif
void packet_start(u_char);
void packet_put_char(int ch);
@@ -119,9 +115,6 @@ do { \
} while (0)
int packet_need_rekeying(void);
-#ifdef NONE_CIPHER_ENABLED
-void packet_request_rekeying(void);
-#endif
void packet_set_rekey_limits(u_int32_t, time_t);
time_t packet_get_rekey_timeout(void);
Modified: user/ngie/stable-10-libnv/crypto/openssh/pathnames.h
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/pathnames.h Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/pathnames.h Thu Feb 4 09:39:08 2016 (r295248)
@@ -1,4 +1,5 @@
/* $OpenBSD: pathnames.h,v 1.24 2013/12/06 13:39:49 markus Exp $ */
+/* $FreeBSD$ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
Modified: user/ngie/stable-10-libnv/crypto/openssh/readconf.c
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/readconf.c Thu Feb 4 09:08:36 2016 (r295247)
+++ user/ngie/stable-10-libnv/crypto/openssh/readconf.c Thu Feb 4 09:39:08 2016 (r295248)
@@ -1,5 +1,4 @@
/* $OpenBSD: readconf.c,v 1.218 2014/02/23 20:11:36 djm Exp $ */
-/* $FreeBSD$ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -153,12 +152,8 @@ typedef enum {
oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,
oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,
- oIgnoredUnknownOption,
- oHPNDisabled, oHPNBufferSize, oTcpRcvBufPoll, oTcpRcvBuf,
-#ifdef NONE_CIPHER_ENABLED
- oNoneEnabled, oNoneSwitch,
-#endif
- oVersionAddendum, oDeprecated, oUnsupported
+ oVersionAddendum,
+ oIgnoredUnknownOption, oDeprecated, oUnsupported
} OpCodes;
/* Textual representations of the tokens. */
@@ -271,14 +266,10 @@ static struct {
{ "canonicalizemaxdots", oCanonicalizeMaxDots },
{ "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs },
{ "ignoreunknown", oIgnoreUnknown },
- { "hpndisabled", oHPNDisabled },
- { "hpnbuffersize", oHPNBufferSize },
- { "tcprcvbufpoll", oTcpRcvBufPoll },
- { "tcprcvbuf", oTcpRcvBuf },
-#ifdef NONE_CIPHER_ENABLED
- { "noneenabled", oNoneEnabled },
- { "noneswitch", oNoneSwitch },
-#endif
+ { "hpndisabled", oDeprecated },
+ { "hpnbuffersize", oDeprecated },
+ { "tcprcvbufpoll", oDeprecated },
+ { "tcprcvbuf", oDeprecated },
{ "versionaddendum", oVersionAddendum },
{ NULL, oBadOption }
@@ -1360,47 +1351,6 @@ parse_int:
multistate_ptr = multistate_requesttty;
goto parse_multistate;
- case oHPNDisabled:
- intptr = &options->hpn_disabled;
- goto parse_flag;
-
- case oHPNBufferSize:
- intptr = &options->hpn_buffer_size;
- goto parse_int;
-
- case oTcpRcvBufPoll:
- intptr = &options->tcp_rcv_buf_poll;
- goto parse_flag;
-
- case oTcpRcvBuf:
- intptr = &options->tcp_rcv_buf;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-user@freebsd.org Thu Feb 4 18:12:43 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 64743A9CD9E
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 4 Feb 2016 18:12:43 +0000 (UTC)
(envelope-from ngie@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 3603F11AA;
Thu, 4 Feb 2016 18:12:43 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u14ICgSD071559;
Thu, 4 Feb 2016 18:12:42 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u14ICgdR071558;
Thu, 4 Feb 2016 18:12:42 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602041812.u14ICgdR071558@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 4 Feb 2016 18:12:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295274 -
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 18:12:43 -0000
Author: ngie
Date: Thu Feb 4 18:12:42 2016
New Revision: 295274
URL: https://svnweb.freebsd.org/changeset/base/295274
Log:
Use strdup instead of asprintf; asprintf is pretty heavyweight for
copying just a buffer
Reminded by: bde's email
Modified:
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c Thu Feb 4 18:08:50 2016 (r295273)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c Thu Feb 4 18:12:42 2016 (r295274)
@@ -272,7 +272,7 @@ enum_pair_insert(struct enum_pairs *head
return (-1);
}
- if (asprintf(&e_new->enum_str, "%s", enum_str) == -1) {
+ if ((e_new->enum_str = strdup(enum_str)) == NULL) {
syslog(LOG_ERR, "malloc() failed: %s", strerror(errno));
free(e_new);
return (-1);
@@ -556,7 +556,7 @@ snmp_enumtc_init(char *name)
return (NULL);
}
- if (asprintf(&enum_tc->name, "%s", name) == -1) {
+ if ((enum_tc->name = strdup(name)) == NULL) {
syslog(LOG_ERR, "malloc() failed: %s", strerror(errno));
free(enum_tc);
return (NULL);
From owner-svn-src-user@freebsd.org Thu Feb 4 19:30:25 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 7DF63A9CBAF
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 4 Feb 2016 19:30:25 +0000 (UTC) (envelope-from pho@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 594EA3A7;
Thu, 4 Feb 2016 19:30:25 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u14JUOWR093072;
Thu, 4 Feb 2016 19:30:24 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u14JUO9K093071;
Thu, 4 Feb 2016 19:30:24 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201602041930.u14JUO9K093071@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Thu, 4 Feb 2016 19:30:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295275 - user/pho/stress2/misc
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 19:30:25 -0000
Author: pho
Date: Thu Feb 4 19:30:24 2016
New Revision: 295275
URL: https://svnweb.freebsd.org/changeset/base/295275
Log:
Updated the exclude list.
Move the check for the non-root test user up before using it.
Noticed by bob prohaska <fbsd@www.zefox.net>
Fix access check to $RUNDIR.
Sponsored by: EMC / Isilon Storage Division
Modified:
user/pho/stress2/misc/all.sh
Modified: user/pho/stress2/misc/all.sh
==============================================================================
--- user/pho/stress2/misc/all.sh Thu Feb 4 18:12:42 2016 (r295274)
+++ user/pho/stress2/misc/all.sh Thu Feb 4 19:30:24 2016 (r295275)
@@ -43,8 +43,7 @@
# crossmp4.sh Known nullfs issue 20150523
# crossmp6.sh Known lockd issue 20150625
# dfull.sh umount stuck in "mount drain" 20111227
-# ext2fs.sh Deadlock 20120510
-# ext2fs2.sh panic 20140716
+# full.sh OOM 20160116
# fuse.sh Memory corruption seen in log file kostik734.txt 20141114
# fuse2.sh Deadlock seen 20121129
# fuse3.sh Deadlock seen 20141120
@@ -62,11 +61,17 @@
# mkfifo.sh Page fault in softdep_count_dependencies+0x27 seen 20150524
# mmap18.sh panic: vm_fault_copy_entry: main object missing page 20141015
# mmap21.sh rangelock issue? 20150326
+# msdos4.sh OOM 20160115
# msdos5.sh Panic: Freeing unused sector ... 20141118
# newfs4.sh Deadlock seen 20150906
# nfs10.sh Double fault 20151013
+# oovm.sh WiP 20151206
+# oovm2.sh WiP 20151206
# pfl3.sh panic: handle_written_inodeblock: live inodedep 20140812
# pmc.sh NMI ... going to debugger 20111217
+# posix_openpt2.sh
+# WiP 20160109
+# pty.sh WiP 20160111
# snap5-1.sh mksnap_ffs deadlock 20111218
# quota2.sh panic: dqflush: stray dquot 20120221
# quota3.sh panic: softdep_deallocate_dependencies: unrecovered ... 20111222
@@ -84,6 +89,7 @@
# suj11.sh panic: ufsdirhash_newblk: bad offset 20120118
# suj13.sh general protection fault in bufdaemon 20141130
# suj18.sh panic: Bad tailq NEXT(0xc1e2a6088->tqh_last_s) != NULL 20120213
+# suj29.sh OOM 20160116
# suj30.sh panic: flush_pagedep_deps: MKDIR_PARENT 20121020
# suj34.sh Various hangs and panics (SUJ + NULLFS iisue) 20131210
# swap3.sh WiP 20151120
@@ -97,10 +103,9 @@
# Test not to run for other reasons:
# fuzz.sh A know issue
+# marcus3.sh OK, but runs for a long time
+# marcus4.sh OK, but runs for a long time
# statfs.sh Not very interesting
-# syscall.sh OK, but runs for a very long time
-# syscall2.sh OK, but runs for a very long time
-# syscall3.sh OK, but syscall4.sh is better
# vunref.sh No problems ever seen
# vunref2.sh No problems ever seen
@@ -180,14 +185,14 @@ minspace=$((1024 * 1024)) # in k
[ `df -k $(dirname $RUNDIR) | tail -1 | awk '{print $4'}` -lt \
$minspace ] &&
echo "Warn: Not enough disk space on `dirname $RUNDIR` for \$RUNDIR"
+grep -wq "$testuser" /etc/passwd ||
+ { echo "\$testuser \"$testuser\" not found."; exit 1; }
probe=`dirname $RUNDIR`/probe
su $testuser -c "touch $probe" > /dev/null 2>&1
-[ -f `dirname $RUNDIR`/probe ] && rm $probe ||
+[ -f $probe ] && rm $probe ||
{ echo "No write access to `dirname $RUNDIR`."; exit 1; }
[ `swapinfo | wc -l` -eq 1 ] &&
echo "Consider adding a swap disk. Many tests rely on this."
-grep -wq "$testuser" /etc/passwd ||
- { echo "\$testuser not found."; exit 1; }
[ -x ../testcases/run/run ] ||
{ echo "Please run \"cd stress2; make\" first." && exit 1; }
ping -c 2 -t 2 $BLASTHOST > /dev/null 2>&1 ||
From owner-svn-src-user@freebsd.org Fri Feb 5 08:25:22 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 1647CA47045
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 5 Feb 2016 08:25:22 +0000 (UTC)
(envelope-from ngie@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 C3B2DEC9;
Fri, 5 Feb 2016 08:25:21 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u158PKtL025414;
Fri, 5 Feb 2016 08:25:20 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u158PKFf025413;
Fri, 5 Feb 2016 08:25:20 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602050825.u158PKFf025413@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 5 Feb 2016 08:25:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295310 - user/ngie/stable-10-libnv/sys/boot/ia64/efi
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 08:25:22 -0000
Author: ngie
Date: Fri Feb 5 08:25:20 2016
New Revision: 295310
URL: https://svnweb.freebsd.org/changeset/base/295310
Log:
First attempt at unbreaking the ia64 EFI bootloader by
MFstable/10 @ r294999 and slightly tweak the support to add
ZFS support to the EFI bootloader by smh
Requested by: gjb, peter
Modified:
user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c
Modified: user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c Fri Feb 5 07:29:11 2016 (r295309)
+++ user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c Fri Feb 5 08:25:20 2016 (r295310)
@@ -144,6 +144,7 @@ main(int argc, CHAR16 *argv[])
EFI_LOADED_IMAGE *img;
char *dev;
int i;
+ uint64_t pool_guid;
/*
* XXX Chicken-and-egg problem; we want to have console output
@@ -179,15 +180,44 @@ main(int argc, CHAR16 *argv[])
BS->HandleProtocol(IH, &imgid, (VOID**)&img);
bzero(&currdev, sizeof(currdev));
- efi_handle_lookup(img->DeviceHandle, &currdev.d_dev, &currdev.d_unit);
- currdev.d_type = currdev.d_dev->dv_type;
-
- env_setenv("loaddev", EV_VOLATILE, ia64_fmtdev(&currdev), env_noset,
- env_nounset);
-
- dev = get_dev_option(argc, argv);
- if (dev == NULL)
- dev = ia64_fmtdev(&currdev);
+ if (efi_handle_lookup(img->DeviceHandle, &dev, &unit, &pool_guid) != 0)
+ return (EFI_NOT_FOUND);
+ switch (dev->dv_type) {
+#ifdef EFI_ZFS_BOOT
+ case DEVT_ZFS: {
+ struct zfs_devdesc currdev;
+
+ currdev.d_dev = dev;
+ currdev.d_unit = unit;
+ currdev.d_type = currdev.d_dev->dv_type;
+ currdev.d_opendata = NULL;
+ currdev.pool_guid = pool_guid;
+ currdev.root_guid = 0;
+ env_setenv("currdev", EV_VOLATILE, efi_fmtdev(&currdev),
+ efi_setcurrdev, env_nounset);
+ env_setenv("loaddev", EV_VOLATILE, efi_fmtdev(&currdev), env_noset,
+ env_nounset);
+ break;
+ }
+#endif
+ default: {
+ struct devdesc currdev;
+
+ dev = get_dev_option(argc, argv);
+ if (dev == NULL)
+ dev = ia64_fmtdev(&currdev);
+
+ currdev.d_dev = dev;
+ currdev.d_unit = unit;
+ currdev.d_opendata = NULL;
+ currdev.d_type = currdev.d_dev->dv_type;
+ env_setenv("currdev", EV_VOLATILE, efi_fmtdev(&currdev),
+ efi_setcurrdev, env_nounset);
+ env_setenv("loaddev", EV_VOLATILE, efi_fmtdev(&currdev), env_noset,
+ env_nounset);
+ break;
+ }
+ }
env_setenv("currdev", EV_VOLATILE, dev, ia64_setcurrdev, env_nounset);
From owner-svn-src-user@freebsd.org Fri Feb 5 08:32:19 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 48EB0A471C7
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 5 Feb 2016 08:32:19 +0000 (UTC)
(envelope-from ngie@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 194D51488;
Fri, 5 Feb 2016 08:32:19 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u158WIWe028222;
Fri, 5 Feb 2016 08:32:18 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u158WIKH028221;
Fri, 5 Feb 2016 08:32:18 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602050832.u158WIKH028221@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 5 Feb 2016 08:32:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295311 - user/ngie/stable-10-libnv/sys/boot/ia64/efi
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 08:32:19 -0000
Author: ngie
Date: Fri Feb 5 08:32:17 2016
New Revision: 295311
URL: https://svnweb.freebsd.org/changeset/base/295311
Log:
Add more MK_ZFS bits from r294999
Modified:
user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile
Modified: user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile Fri Feb 5 08:25:20 2016 (r295310)
+++ user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile Fri Feb 5 08:32:17 2016 (r295311)
@@ -7,7 +7,22 @@ MK_SSP= no
PROG= loader.sym
INTERNALPROG=
+
+.if ${MK_ZFS} != "no"
+# Disable warnings that are currently incompatible with the zfs boot code
+CWARNFLAGS.zfs_module.c += -Wno-array-bounds
+CWARNFLAGS.zfs_module.c += -Wno-cast-align
+CWARNFLAGS.zfs_module.c += -Wno-cast-qual
+CWARNFLAGS.zfs_module.c += -Wno-missing-prototypes
+CWARNFLAGS.zfs_module.c += -Wno-sign-compare
+CWARNFLAGS.zfs_module.c += -Wno-unused-parameter
+CWARNFLAGS.zfs_module.c += -Wno-unused-function
+.endif
+
SRCS= conf.c efimd.c main.c pal.S start.S vers.c
+.if ${MK_ZFS} != "no"
+SRCS+= zfs_module.c
+.endif
.PATH: ${.CURDIR}/../../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH}
@@ -18,6 +33,12 @@ CFLAGS+= -I${.CURDIR}/../../efi/include/
CFLAGS+= -I${.CURDIR}/../../..
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
+.if ${MK_ZFS} != "no"
+CFLAGS+= -I${.CURDIR}/../../zfs/
+CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs/
+CFLAGS+= -DEFI_ZFS_BOOT
+.endif
+
LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_CPUARCH}
LDFLAGS= -Wl,-T${LDSCRIPT} -shared -symbolic
From owner-svn-src-user@freebsd.org Fri Feb 5 08:34:29 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 521AFA47325
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 5 Feb 2016 08:34:29 +0000 (UTC)
(envelope-from ngie@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 23D141639;
Fri, 5 Feb 2016 08:34:29 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u158YSCG028351;
Fri, 5 Feb 2016 08:34:28 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u158YSsl028349;
Fri, 5 Feb 2016 08:34:28 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602050834.u158YSsl028349@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 5 Feb 2016 08:34:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295312 - user/ngie/stable-10-libnv/sys/boot/ia64/efi
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 08:34:29 -0000
Author: ngie
Date: Fri Feb 5 08:34:27 2016
New Revision: 295312
URL: https://svnweb.freebsd.org/changeset/base/295312
Log:
Add ../../efs/boot1 to .PATH in order to find zfs_module.c
Modified:
user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile
Modified: user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile Fri Feb 5 08:32:17 2016 (r295311)
+++ user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile Fri Feb 5 08:34:27 2016 (r295312)
@@ -24,7 +24,7 @@ SRCS= conf.c efimd.c main.c pal.S start
SRCS+= zfs_module.c
.endif
-.PATH: ${.CURDIR}/../../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH}
+.PATH: ${.CURDIR}/../../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH} ${.CURDIR}/../../efi/boot1
CFLAGS+= -I${.CURDIR}/../common
CFLAGS+= -I${.CURDIR}/../../common
From owner-svn-src-user@freebsd.org Fri Feb 5 08:41:28 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 D5E11A47540
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 5 Feb 2016 08:41:28 +0000 (UTC)
(envelope-from ngie@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 B1C711A57;
Fri, 5 Feb 2016 08:41:28 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u158fRDL030564;
Fri, 5 Feb 2016 08:41:27 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u158fRH2030562;
Fri, 5 Feb 2016 08:41:27 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602050841.u158fRH2030562@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 5 Feb 2016 08:41:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295313 - user/ngie/stable-10-libnv/sys/boot/ia64/efi
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 08:41:29 -0000
Author: ngie
Date: Fri Feb 5 08:41:27 2016
New Revision: 295313
URL: https://svnweb.freebsd.org/changeset/base/295313
Log:
On second thought, don't bother half-implementing ZFS EFI support
since ia64 is a dead-end platform. Just do the bare minimum to fix
the efi_handle_lookup(..) call
Modified:
user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile
user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c
Modified: user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile Fri Feb 5 08:34:27 2016 (r295312)
+++ user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile Fri Feb 5 08:41:27 2016 (r295313)
@@ -8,21 +8,7 @@ MK_SSP= no
PROG= loader.sym
INTERNALPROG=
-.if ${MK_ZFS} != "no"
-# Disable warnings that are currently incompatible with the zfs boot code
-CWARNFLAGS.zfs_module.c += -Wno-array-bounds
-CWARNFLAGS.zfs_module.c += -Wno-cast-align
-CWARNFLAGS.zfs_module.c += -Wno-cast-qual
-CWARNFLAGS.zfs_module.c += -Wno-missing-prototypes
-CWARNFLAGS.zfs_module.c += -Wno-sign-compare
-CWARNFLAGS.zfs_module.c += -Wno-unused-parameter
-CWARNFLAGS.zfs_module.c += -Wno-unused-function
-.endif
-
SRCS= conf.c efimd.c main.c pal.S start.S vers.c
-.if ${MK_ZFS} != "no"
-SRCS+= zfs_module.c
-.endif
.PATH: ${.CURDIR}/../../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH} ${.CURDIR}/../../efi/boot1
@@ -33,12 +19,6 @@ CFLAGS+= -I${.CURDIR}/../../efi/include/
CFLAGS+= -I${.CURDIR}/../../..
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
-.if ${MK_ZFS} != "no"
-CFLAGS+= -I${.CURDIR}/../../zfs/
-CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs/
-CFLAGS+= -DEFI_ZFS_BOOT
-.endif
-
LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_CPUARCH}
LDFLAGS= -Wl,-T${LDSCRIPT} -shared -symbolic
Modified: user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c Fri Feb 5 08:34:27 2016 (r295312)
+++ user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c Fri Feb 5 08:41:27 2016 (r295313)
@@ -144,7 +144,6 @@ main(int argc, CHAR16 *argv[])
EFI_LOADED_IMAGE *img;
char *dev;
int i;
- uint64_t pool_guid;
/*
* XXX Chicken-and-egg problem; we want to have console output
@@ -180,27 +179,9 @@ main(int argc, CHAR16 *argv[])
BS->HandleProtocol(IH, &imgid, (VOID**)&img);
bzero(&currdev, sizeof(currdev));
- if (efi_handle_lookup(img->DeviceHandle, &dev, &unit, &pool_guid) != 0)
+ if (efi_handle_lookup(img->DeviceHandle, &dev, &unit, NULL) != 0)
return (EFI_NOT_FOUND);
- switch (dev->dv_type) {
-#ifdef EFI_ZFS_BOOT
- case DEVT_ZFS: {
- struct zfs_devdesc currdev;
-
- currdev.d_dev = dev;
- currdev.d_unit = unit;
- currdev.d_type = currdev.d_dev->dv_type;
- currdev.d_opendata = NULL;
- currdev.pool_guid = pool_guid;
- currdev.root_guid = 0;
- env_setenv("currdev", EV_VOLATILE, efi_fmtdev(&currdev),
- efi_setcurrdev, env_nounset);
- env_setenv("loaddev", EV_VOLATILE, efi_fmtdev(&currdev), env_noset,
- env_nounset);
- break;
- }
-#endif
- default: {
+ {
struct devdesc currdev;
dev = get_dev_option(argc, argv);
@@ -217,7 +198,6 @@ main(int argc, CHAR16 *argv[])
env_nounset);
break;
}
- }
env_setenv("currdev", EV_VOLATILE, dev, ia64_setcurrdev, env_nounset);
From owner-svn-src-user@freebsd.org Fri Feb 5 09:28:05 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 2A1B9A76AF4
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 5 Feb 2016 09:28:05 +0000 (UTC)
(envelope-from ngie@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 EF4D81861;
Fri, 5 Feb 2016 09:28:04 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u159S3wL043186;
Fri, 5 Feb 2016 09:28:03 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u159S3vY043185;
Fri, 5 Feb 2016 09:28:03 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602050928.u159S3vY043185@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 5 Feb 2016 09:28:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295314 - user/ngie/stable-10-libnv/sys/boot/ia64/efi
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 09:28:05 -0000
Author: ngie
Date: Fri Feb 5 09:28:03 2016
New Revision: 295314
URL: https://svnweb.freebsd.org/changeset/base/295314
Log:
Fix the compile; the #if 0 code needs some work because
the old code dealt with `dev` as char*, not struct devsw*
Modified:
user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c
Modified: user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c Fri Feb 5 08:41:27 2016 (r295313)
+++ user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c Fri Feb 5 09:28:03 2016 (r295314)
@@ -142,7 +142,7 @@ main(int argc, CHAR16 *argv[])
{
struct devdesc currdev;
EFI_LOADED_IMAGE *img;
- char *dev;
+ struct devsw *dev;
int i;
/*
@@ -179,28 +179,26 @@ main(int argc, CHAR16 *argv[])
BS->HandleProtocol(IH, &imgid, (VOID**)&img);
bzero(&currdev, sizeof(currdev));
- if (efi_handle_lookup(img->DeviceHandle, &dev, &unit, NULL) != 0)
+ if (efi_handle_lookup(img->DeviceHandle, &dev, &currdev.d_unit, NULL) != 0)
return (EFI_NOT_FOUND);
{
struct devdesc currdev;
+#if 0
dev = get_dev_option(argc, argv);
if (dev == NULL)
dev = ia64_fmtdev(&currdev);
+#endif
currdev.d_dev = dev;
- currdev.d_unit = unit;
currdev.d_opendata = NULL;
currdev.d_type = currdev.d_dev->dv_type;
- env_setenv("currdev", EV_VOLATILE, efi_fmtdev(&currdev),
- efi_setcurrdev, env_nounset);
- env_setenv("loaddev", EV_VOLATILE, efi_fmtdev(&currdev), env_noset,
+ env_setenv("currdev", EV_VOLATILE, ia64_fmtdev(&currdev),
+ ia64_setcurrdev, env_nounset);
+ env_setenv("loaddev", EV_VOLATILE, ia64_fmtdev(&currdev), env_noset,
env_nounset);
- break;
}
- env_setenv("currdev", EV_VOLATILE, dev, ia64_setcurrdev, env_nounset);
-
setenv("LINES", "24", 1); /* optional */
archsw.arch_autoload = ia64_autoload;
From owner-svn-src-user@freebsd.org Fri Feb 5 16:48:04 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 B0064A77600
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 5 Feb 2016 16:48:04 +0000 (UTC)
(envelope-from glebius@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 8AC381DD6;
Fri, 5 Feb 2016 16:48:04 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u15Gm372079449;
Fri, 5 Feb 2016 16:48:03 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u15Gm3Vv079446;
Fri, 5 Feb 2016 16:48:03 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201602051648.u15Gm3Vv079446@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 5 Feb 2016 16:48:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295322 - in user/cperciva/freebsd-update-build/patches:
10.1-RELEASE 10.2-RELEASE 9.3-RELEASE
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 16:48:04 -0000
Author: glebius
Date: Fri Feb 5 16:48:03 2016
New Revision: 295322
URL: https://svnweb.freebsd.org/changeset/base/295322
Log:
Save patches for SA-16:11.
Added:
user/cperciva/freebsd-update-build/patches/10.1-RELEASE/29-SA-16:11.openssl
user/cperciva/freebsd-update-build/patches/10.2-RELEASE/12-SA-16:11.openssl
user/cperciva/freebsd-update-build/patches/9.3-RELEASE/36-SA-16:11.openssl
Added: user/cperciva/freebsd-update-build/patches/10.1-RELEASE/29-SA-16:11.openssl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/10.1-RELEASE/29-SA-16:11.openssl Fri Feb 5 16:48:03 2016 (r295322)
@@ -0,0 +1,43 @@
+Index: crypto/openssl/ssl/s2_srvr.c
+===================================================================
+--- crypto/openssl/ssl/s2_srvr.c (revision 294905)
++++ crypto/openssl/ssl/s2_srvr.c (working copy)
+@@ -392,7 +392,7 @@ static int get_client_master_key(SSL *s)
+ }
+
+ cp=ssl2_get_cipher_by_char(p);
+- if (cp == NULL)
++ if (cp == NULL || sk_SSL_CIPHER_find(s->session->ciphers, cp) < 0)
+ {
+ ssl2_return_error(s,SSL2_PE_NO_CIPHER);
+ SSLerr(SSL_F_GET_CLIENT_MASTER_KEY, SSL_R_NO_CIPHER_MATCH);
+@@ -690,9 +690,12 @@ static int get_client_hello(SSL *s)
+ prio = cs;
+ allow = cl;
+ }
+- for (z=0; z<sk_SSL_CIPHER_num(prio); z++)
++ /* Generate list of SSLv2 ciphers shared between client and server */
++ for (z = 0; z < sk_SSL_CIPHER_num(prio); z++)
+ {
+- if (sk_SSL_CIPHER_find(allow,sk_SSL_CIPHER_value(prio,z)) < 0)
++ const SSL_CIPHER *cp = sk_SSL_CIPHER_value(prio, z);
++ if ((cp->algorithm_ssl & SSL_SSLV2) == 0 ||
++ sk_SSL_CIPHER_find(allow, cp) < 0)
+ {
+ (void)sk_SSL_CIPHER_delete(prio,z);
+ z--;
+@@ -703,6 +706,14 @@ static int get_client_hello(SSL *s)
+ sk_SSL_CIPHER_free(s->session->ciphers);
+ s->session->ciphers = prio;
+ }
++
++ /* Make sure we have at least one cipher in common */
++ if (sk_SSL_CIPHER_num(s->session->ciphers) == 0)
++ {
++ ssl2_return_error(s, SSL2_PE_NO_CIPHER);
++ SSLerr(SSL_F_GET_CLIENT_HELLO, SSL_R_NO_CIPHER_MATCH);
++ return -1;
++ }
+ /* s->session->ciphers should now have a list of
+ * ciphers that are on both the client and server.
+ * This list is ordered by the order the client sent
Added: user/cperciva/freebsd-update-build/patches/10.2-RELEASE/12-SA-16:11.openssl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/10.2-RELEASE/12-SA-16:11.openssl Fri Feb 5 16:48:03 2016 (r295322)
@@ -0,0 +1,41 @@
+Index: crypto/openssl/ssl/s2_srvr.c
+===================================================================
+--- crypto/openssl/ssl/s2_srvr.c (revision 294905)
++++ crypto/openssl/ssl/s2_srvr.c (working copy)
+@@ -402,7 +402,7 @@ static int get_client_master_key(SSL *s)
+ }
+
+ cp = ssl2_get_cipher_by_char(p);
+- if (cp == NULL) {
++ if (cp == NULL || sk_SSL_CIPHER_find(s->session->ciphers, cp) < 0) {
+ ssl2_return_error(s, SSL2_PE_NO_CIPHER);
+ SSLerr(SSL_F_GET_CLIENT_MASTER_KEY, SSL_R_NO_CIPHER_MATCH);
+ return (-1);
+@@ -687,8 +687,12 @@ static int get_client_hello(SSL *s)
+ prio = cs;
+ allow = cl;
+ }
++
++ /* Generate list of SSLv2 ciphers shared between client and server */
+ for (z = 0; z < sk_SSL_CIPHER_num(prio); z++) {
+- if (sk_SSL_CIPHER_find(allow, sk_SSL_CIPHER_value(prio, z)) < 0) {
++ const SSL_CIPHER *cp = sk_SSL_CIPHER_value(prio, z);
++ if ((cp->algorithm_ssl & SSL_SSLV2) == 0 ||
++ sk_SSL_CIPHER_find(allow, cp) < 0) {
+ (void)sk_SSL_CIPHER_delete(prio, z);
+ z--;
+ }
+@@ -697,6 +701,13 @@ static int get_client_hello(SSL *s)
+ sk_SSL_CIPHER_free(s->session->ciphers);
+ s->session->ciphers = prio;
+ }
++
++ /* Make sure we have at least one cipher in common */
++ if (sk_SSL_CIPHER_num(s->session->ciphers) == 0) {
++ ssl2_return_error(s, SSL2_PE_NO_CIPHER);
++ SSLerr(SSL_F_GET_CLIENT_HELLO, SSL_R_NO_CIPHER_MATCH);
++ return -1;
++ }
+ /*
+ * s->session->ciphers should now have a list of ciphers that are on
+ * both the client and server. This list is ordered by the order the
Added: user/cperciva/freebsd-update-build/patches/9.3-RELEASE/36-SA-16:11.openssl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/9.3-RELEASE/36-SA-16:11.openssl Fri Feb 5 16:48:03 2016 (r295322)
@@ -0,0 +1,43 @@
+Index: crypto/openssl/ssl/s2_srvr.c
+===================================================================
+--- crypto/openssl/ssl/s2_srvr.c (revision 294905)
++++ crypto/openssl/ssl/s2_srvr.c (working copy)
+@@ -392,7 +392,7 @@ static int get_client_master_key(SSL *s)
+ }
+
+ cp=ssl2_get_cipher_by_char(p);
+- if (cp == NULL)
++ if (cp == NULL || sk_SSL_CIPHER_find(s->session->ciphers, cp) < 0)
+ {
+ ssl2_return_error(s,SSL2_PE_NO_CIPHER);
+ SSLerr(SSL_F_GET_CLIENT_MASTER_KEY, SSL_R_NO_CIPHER_MATCH);
+@@ -690,9 +690,12 @@ static int get_client_hello(SSL *s)
+ prio = cs;
+ allow = cl;
+ }
+- for (z=0; z<sk_SSL_CIPHER_num(prio); z++)
++ /* Generate list of SSLv2 ciphers shared between client and server */
++ for (z = 0; z < sk_SSL_CIPHER_num(prio); z++)
+ {
+- if (sk_SSL_CIPHER_find(allow,sk_SSL_CIPHER_value(prio,z)) < 0)
++ const SSL_CIPHER *cp = sk_SSL_CIPHER_value(prio, z);
++ if ((cp->algorithms & SSL_SSLV2) == 0 ||
++ sk_SSL_CIPHER_find(allow, cp) < 0)
+ {
+ (void)sk_SSL_CIPHER_delete(prio,z);
+ z--;
+@@ -703,6 +706,14 @@ static int get_client_hello(SSL *s)
+ sk_SSL_CIPHER_free(s->session->ciphers);
+ s->session->ciphers = prio;
+ }
++
++ /* Make sure we have at least one cipher in common */
++ if (sk_SSL_CIPHER_num(s->session->ciphers) == 0)
++ {
++ ssl2_return_error(s, SSL2_PE_NO_CIPHER);
++ SSLerr(SSL_F_GET_CLIENT_HELLO, SSL_R_NO_CIPHER_MATCH);
++ return -1;
++ }
+ /* s->session->ciphers should now have a list of
+ * ciphers that are on both the client and server.
+ * This list is ordered by the order the client sent
From owner-svn-src-user@freebsd.org Fri Feb 5 18:06:54 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 6ACABA9D1F5
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 5 Feb 2016 18:06:54 +0000 (UTC)
(envelope-from glebius@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 3E0DC8BD;
Fri, 5 Feb 2016 18:06:54 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u15I6rEN004672;
Fri, 5 Feb 2016 18:06:53 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u15I6r4G004671;
Fri, 5 Feb 2016 18:06:53 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201602051806.u15I6r4G004671@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 5 Feb 2016 18:06:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295325 - in
user/cperciva/freebsd-update-build/scripts/10.3-BETA1: . amd64
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 18:06:54 -0000
Author: glebius
Date: Fri Feb 5 18:06:53 2016
New Revision: 295325
URL: https://svnweb.freebsd.org/changeset/base/295325
Log:
Start 10.3-BETA1.
Added:
user/cperciva/freebsd-update-build/scripts/10.3-BETA1/
user/cperciva/freebsd-update-build/scripts/10.3-BETA1/amd64/
user/cperciva/freebsd-update-build/scripts/10.3-BETA1/build.conf (contents, props changed)
Added: user/cperciva/freebsd-update-build/scripts/10.3-BETA1/build.conf
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/scripts/10.3-BETA1/build.conf Fri Feb 5 18:06:53 2016 (r295325)
@@ -0,0 +1,10 @@
+export RELH=2424179c754d5514754fe75ab470c03c6a0efafd24425cc5b17d98b2e779b5588fa7e746f820e6ad01c86f1d3b4c4244333fa0f46196163c83feb48fe878fd2e
+export FTP=https://people.freebsd.org/~marius/10.3-BETA1/
+
+# Components of the world, source, and kernels
+export WORLDPARTS="base doc games lib32"
+export SOURCEPARTS="src"
+export KERNELPARTS="kernel"
+
+# EOL date
+export EOL=1456531200
From owner-svn-src-user@freebsd.org Fri Feb 5 18:08:57 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 07ADAA9D250
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 5 Feb 2016 18:08:57 +0000 (UTC)
(envelope-from glebius@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 BDE659FC;
Fri, 5 Feb 2016 18:08:56 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u15I8t1d004777;
Fri, 5 Feb 2016 18:08:55 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u15I8tmT004774;
Fri, 5 Feb 2016 18:08:55 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201602051808.u15I8tmT004774@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 5 Feb 2016 18:08:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295326 - user/cperciva/freebsd-update-build/scripts
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 18:08:57 -0000
Author: glebius
Date: Fri Feb 5 18:08:55 2016
New Revision: 295326
URL: https://svnweb.freebsd.org/changeset/base/295326
Log:
Historically since 8.0-RELEASE many function of build.subr were overridden
by custom build.subr in release dir. For last two major releases this ended
in copying build.subr from previous release.
Try to stop this practice, adjusting global build.subr to modern state and
do not use custom build.subr's.
Switch to sha512.
Modified:
user/cperciva/freebsd-update-build/scripts/build.subr
user/cperciva/freebsd-update-build/scripts/diff.sh
user/cperciva/freebsd-update-build/scripts/init.sh
Modified: user/cperciva/freebsd-update-build/scripts/build.subr
==============================================================================
--- user/cperciva/freebsd-update-build/scripts/build.subr Fri Feb 5 18:06:53 2016 (r295325)
+++ user/cperciva/freebsd-update-build/scripts/build.subr Fri Feb 5 18:08:55 2016 (r295326)
@@ -304,7 +304,6 @@ fetchiso () {
# Figure out where the disc1 ISO image is
RELNUM=${REL%-*}
- ISO=${FTP}/${TARGET}/ISO-IMAGES/${RELNUM}/${REL}-${TARGET}-disc1.iso
ISO=${FTP}/FreeBSD-${REL}-${TARGET}-disc1.iso
# Fetch the ISO image. We consider the ISO image to be
@@ -317,7 +316,7 @@ fetchiso () {
log "Verifying disc1 hash"
# Check that the downloaded ISO has the correct hash.
- if ! [ "`sha256 -q ${WORKDIR}/iso.img`" = "${RELH}" ]; then
+ if ! [ "`sha512 -q ${WORKDIR}/iso.img`" = "${RELH}" ]; then
echo "FreeBSD ${REL}-${TARGET}-disc1.iso has incorrect hash."
rm ${WORKDIR}/iso.img
return 1
@@ -475,13 +474,6 @@ buildworld () {
BRANCH_OVERRIDE=$2 \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
/bin/sh -e <<-"EOF" 2>&1 >${WORKDIR}/$1-build.log
- # Releases build and distribute catpages
- export MANBUILDCAT=YES
-
- # Compat flags, for pre-6.0
- export COMPATFLAGS="COMPAT1X=yes COMPAT20=yes \
- COMPAT21=yes COMPAT22=yes COMPAT3X=yes COMPAT4X=yes"
-
# Function for logging what we're doing
log () {
echo "`date` $1 for FreeBSD/${TARGET} ${RELP}" 1>&2
@@ -490,37 +482,25 @@ buildworld () {
# Build the world
log "Building world"
cd /usr/src &&
- make ${COMPATFLAGS} ${JFLAG} buildworld 2>&1
+ make ${JFLAG} buildworld 2>&1
- # Distribute the world
- log "Distributing world"
- cd /usr/src/release &&
- make obj &&
- make ${COMPATFLAGS} release.1 release.2 2>&1
-
- # Build and distribute kernels
- log "Building and distributing kernels"
- cd /usr/src/release &&
- make ${JFLAG} release.3 2>&1
-
- # Build "synthetic" world distributions
- log "Constructing world components"
- cd /usr/src/release &&
- make release.5 2>&1
+ # Build and kernel
+ log "Building kernel"
+ cd /usr/src &&
+ make ${JFLAG} buildkernel 2>&1
- # Distribute source
- log "Distributing source"
+ # Build and install release images
+ log "Building release"
cd /usr/src/release &&
- make release.7 2>&1
+ make release NODVD=y 2>&1 &&
+ make install NODVD=y DESTDIR=/R 2>&1
EOF
- # Put all the components into the right places. This could be
- # merged with the previous block of jailed script, except that
- # sh(1) seems to get confused and stop reading the here-document
- # halfway through if I do that...
+ # Put all the components into the right places.
log "Moving components into staging area"
jail ${WORKDIR}/$1 ${BUILDHOSTNAME} 127.1.2.3 \
/usr/bin/env -i PATH=${PATH} \
+ WORLDPARTS="${WORLDPARTS}" \
KERNELPARTS="${KERNELPARTS}" \
SOURCEPARTS="${SOURCEPARTS}" \
/bin/sh -e <<-"EOF" 2>&1 >>${WORKDIR}/$1-build.log
@@ -528,21 +508,23 @@ buildworld () {
mkdir -p /R/trees
# Move world components into place
- mv /R/stage/trees /R/trees/world
+ for C in ${WORLDPARTS}; do
+ mkdir -p /R/trees/world/${C}
+ cat /R/ftp/${C}.txz |
+ tar -xpzf - -C /R/trees/world/${C}
+ done
# Move kernel components into place
- mkdir -p /R/trees/kernel
for C in ${KERNELPARTS}; do
- CTMP=`echo ${C} | tr 'a-z' 'A-Z'`
mkdir -p /R/trees/kernel/${C}
- mv /R/stage/kernels/${CTMP} /R/trees/kernel/${C}
+ cat /R/ftp/${C}.txz |
+ tar -xpzf - -C /R/trees/kernel/${C}
done
# Extract src components into place
- mkdir -p /R/trees/src/
for C in ${SOURCEPARTS}; do
mkdir -p /R/trees/src/${C}
- cat /R/stage/dists/src/s${C}.?? |
+ cat /R/ftp/${C}.txz |
tar -xpzf - -C /R/trees/src/${C}
done
EOF
@@ -576,47 +558,6 @@ futurebuildworld () {
fi
}
-# Compare ${WORKDIR}/release and ${WORKDIR}/$1, identify which parts
-# of the world|doc subcomponent are missing from the latter, and
-# build a tarball out of them.
-findextradocs () {
- log "Identifying extra documentation"
-
- ( cd ${WORKDIR}/release && find R ) |
- sort > ${WORKDIR}/release-files
- ( cd ${WORKDIR}/$1 && find R ) |
- sort > ${WORKDIR}/$1-files
- comm -23 ${WORKDIR}/release-files ${WORKDIR}/$1-files |
- awk '
- BEGIN { p = "/" }
- { if ( match($0, p) != 1) {
- print $0
- p = sprintf("%s/", $0)
- } }' |
- grep -E '^R/trees/world/doc' |
- cut -f 4- -d / > ${WORKDIR}/extradocs
- rm ${WORKDIR}/release-files ${WORKDIR}/$1-files
-
- echo
- echo "Documentation not built from src:"
- cut -f 2- -d / ${WORKDIR}/extradocs
- echo
-
- tar -czf ${WORKDIR}/extradocs.tgz \
- -C ${WORKDIR}/release/R/trees/world \
- -T ${WORKDIR}/extradocs
- rm ${WORKDIR}/extradocs
-}
-
-# Add extra docs to ${WORKDIR}/$1
-addextradocs () {
- log "Extracting extra docs"
-
- cat ${WORKDIR}/extradocs.tgz |
- chroot ${WORKDIR}/$1/ \
- tar -xpzf - -C /R/trees/world doc/
-}
-
# Index ${WORKDIR}/$1/R/trees/ and write to ${WORKDIR}/$1-index. The
# index format is described below and the lines are in lexicographical
# order.
@@ -788,15 +729,9 @@ findnonstamps () {
lam - - - - > ${WORKDIR}/release-filemap
}
-# Fixup paths: kernels are installed under /boot/, while src is
-# installed under /usr/src/.
+# Fixup: the "kernel" kernel is really the "generic" kernel.
indexpublish () {
- sed -E '
- s,src\|([^|]+)\|/,src|\1|/usr/src/,
- s,src\|(.*)\|/([^|]*)$,src|\1|/usr/src/\2,
- s,kernel\|([^|]+)\|/,kernel|\1|/boot/,
- s,kernel\|(.*)\|/([^|]*)$,kernel|\1|/boot/\2,
- '
+ sed -E 's,kernel\|kernel,kernel|generic,'
}
# If a parameter is specified, move $1 to "newworld" and $1-index to
Modified: user/cperciva/freebsd-update-build/scripts/diff.sh
==============================================================================
--- user/cperciva/freebsd-update-build/scripts/diff.sh Fri Feb 5 18:06:53 2016 (r295325)
+++ user/cperciva/freebsd-update-build/scripts/diff.sh Fri Feb 5 18:08:55 2016 (r295326)
@@ -45,14 +45,12 @@ patchnumber $3
extractworld world0
patchworld world0
buildworld world0
-addextradocs world0
indexfiles world0
# Perform the second build
extractworld world1
patchworld world1
futurebuildworld world1
-addextradocs world1
indexfiles world1
# Compare world0 and world1 to find stamps
Modified: user/cperciva/freebsd-update-build/scripts/init.sh
==============================================================================
--- user/cperciva/freebsd-update-build/scripts/init.sh Fri Feb 5 18:06:53 2016 (r295325)
+++ user/cperciva/freebsd-update-build/scripts/init.sh Fri Feb 5 18:08:55 2016 (r295326)
@@ -53,12 +53,6 @@ extractworld world0
rpatchworld world0
buildworld world0
-# Compare the built and released worlds to identify
-# which docs are built from the doc tree; add them
-# to the built files.
-findextradocs world0
-addextradocs world0
-
# Fully index the released and built files.
indexfiles release
indexfiles world0
@@ -70,7 +64,6 @@ diffwarn world0
extractworld world1
rpatchworld world1
futurebuildworld world1
-addextradocs world1
# Index the future world
indexfiles world1
From owner-svn-src-user@freebsd.org Fri Feb 5 18:10:17 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 B886FA9D2AE
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 5 Feb 2016 18:10:17 +0000 (UTC)
(envelope-from glebius@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 89119B6E;
Fri, 5 Feb 2016 18:10:17 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u15IAGp8004879;
Fri, 5 Feb 2016 18:10:16 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u15IAGAB004878;
Fri, 5 Feb 2016 18:10:16 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201602051810.u15IAGAB004878@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 5 Feb 2016 18:10:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295327 - in
user/cperciva/freebsd-update-build/scripts/10.3-BETA1: . amd64
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 18:10:17 -0000
Author: glebius
Date: Fri Feb 5 18:10:16 2016
New Revision: 295327
URL: https://svnweb.freebsd.org/changeset/base/295327
Log:
Move the file to proper place.
Added:
user/cperciva/freebsd-update-build/scripts/10.3-BETA1/amd64/build.conf
- copied unchanged from r295325, user/cperciva/freebsd-update-build/scripts/10.3-BETA1/build.conf
Deleted:
user/cperciva/freebsd-update-build/scripts/10.3-BETA1/build.conf
Copied: user/cperciva/freebsd-update-build/scripts/10.3-BETA1/amd64/build.conf (from r295325, user/cperciva/freebsd-update-build/scripts/10.3-BETA1/build.conf)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/scripts/10.3-BETA1/amd64/build.conf Fri Feb 5 18:10:16 2016 (r295327, copy of r295325, user/cperciva/freebsd-update-build/scripts/10.3-BETA1/build.conf)
@@ -0,0 +1,10 @@
+export RELH=2424179c754d5514754fe75ab470c03c6a0efafd24425cc5b17d98b2e779b5588fa7e746f820e6ad01c86f1d3b4c4244333fa0f46196163c83feb48fe878fd2e
+export FTP=https://people.freebsd.org/~marius/10.3-BETA1/
+
+# Components of the world, source, and kernels
+export WORLDPARTS="base doc games lib32"
+export SOURCEPARTS="src"
+export KERNELPARTS="kernel"
+
+# EOL date
+export EOL=1456531200
From owner-svn-src-user@freebsd.org Fri Feb 5 18:13:56 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 EA471A9D488
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 5 Feb 2016 18:13:56 +0000 (UTC)
(envelope-from glebius@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 A1119FDB;
Fri, 5 Feb 2016 18:13:56 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u15IDtfh007707;
Fri, 5 Feb 2016 18:13:55 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u15IDth7007706;
Fri, 5 Feb 2016 18:13:55 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201602051813.u15IDth7007706@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 5 Feb 2016 18:13:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295328 - user/cperciva/freebsd-update-build/scripts
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 18:13:57 -0000
Author: glebius
Date: Fri Feb 5 18:13:55 2016
New Revision: 295328
URL: https://svnweb.freebsd.org/changeset/base/295328
Log:
More merges from custom build.subr.
Modified:
user/cperciva/freebsd-update-build/scripts/build.subr
Modified: user/cperciva/freebsd-update-build/scripts/build.subr
==============================================================================
--- user/cperciva/freebsd-update-build/scripts/build.subr Fri Feb 5 18:10:16 2016 (r295327)
+++ user/cperciva/freebsd-update-build/scripts/build.subr Fri Feb 5 18:13:55 2016 (r295328)
@@ -335,23 +335,23 @@ extractiso () {
log "Extracting components"
for C in ${WORLDPARTS}; do
mkdir -p ${WORKDIR}/release/R/trees/world/${C}
- cat ${WORKDIR}/iso/${REL}/${C}/${C}.?? |
+ cat ${WORKDIR}/iso/usr/freebsd-dist/${C}.txz |
tar -xpzf - -C ${WORKDIR}/release/R/trees/world/${C}
done
for C in ${KERNELPARTS}; do
mkdir -p ${WORKDIR}/release/R/trees/kernel/${C}
- cat ${WORKDIR}/iso/${REL}/kernels/${C}.?? |
+ cat ${WORKDIR}/iso/usr/freebsd-dist/${C}.txz |
tar -xpzf - -C ${WORKDIR}/release/R/trees/kernel/${C}
done
for C in ${SOURCEPARTS}; do
mkdir -p ${WORKDIR}/release/R/trees/src/${C}
- cat ${WORKDIR}/iso/${REL}/src/s${C}.?? |
+ cat ${WORKDIR}/iso/usr/freebsd-dist/${C}.txz |
tar -xpzf - -C ${WORKDIR}/release/R/trees/src/${C}
done
# If the release ISO we're handling belongs to the platform
# we're running right now, create a world image for future use.
- if [ ${TARGET} = ${HOSTPLATFORM} ] || [ "${HOSTPLATFORM}" = "amd64" -a "${TARGET}" = "i386" ]; then
+ if [ ${TARGET} = ${HOSTPLATFORM} ]; then
log "Constructing world+src image"
# Create directory for world
@@ -359,12 +359,12 @@ extractiso () {
# Extract world and source distributions
for C in ${WORLDPARTS}; do
- cat ${WORKDIR}/iso/${REL}/${C}/${C}.?? |
+ cat ${WORKDIR}/iso/usr/freebsd-dist/${C}.txz |
tar -xpzf - -C ${WORKDIR}/world/
done
for C in ${SOURCEPARTS}; do
- cat ${WORKDIR}/iso/${REL}/src/s${C}.?? |
- tar -xpzf - -C ${WORKDIR}/world/usr/src/
+ cat ${WORKDIR}/iso/usr/freebsd-dist/${C}.txz |
+ tar -xpzf - -C ${WORKDIR}/world/
done
# build a single tarball of them.
From owner-svn-src-user@freebsd.org Fri Feb 5 20:39:13 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 6D7F6A9C1DB
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 5 Feb 2016 20:39:13 +0000 (UTC)
(envelope-from glebius@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 253BC1A83;
Fri, 5 Feb 2016 20:39:13 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u15KdCMf050107;
Fri, 5 Feb 2016 20:39:12 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u15KdCLI050106;
Fri, 5 Feb 2016 20:39:12 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201602052039.u15KdCLI050106@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 5 Feb 2016 20:39:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295332 - user/cperciva/freebsd-update-build/scripts
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 20:39:13 -0000
Author: glebius
Date: Fri Feb 5 20:39:11 2016
New Revision: 295332
URL: https://svnweb.freebsd.org/changeset/base/295332
Log:
We need the world.tgz regardless on what arch the build host runs.
Modified:
user/cperciva/freebsd-update-build/scripts/build.subr
Modified: user/cperciva/freebsd-update-build/scripts/build.subr
==============================================================================
--- user/cperciva/freebsd-update-build/scripts/build.subr Fri Feb 5 20:38:09 2016 (r295331)
+++ user/cperciva/freebsd-update-build/scripts/build.subr Fri Feb 5 20:39:11 2016 (r295332)
@@ -349,30 +349,26 @@ extractiso () {
tar -xpzf - -C ${WORKDIR}/release/R/trees/src/${C}
done
- # If the release ISO we're handling belongs to the platform
- # we're running right now, create a world image for future use.
- if [ ${TARGET} = ${HOSTPLATFORM} ]; then
- log "Constructing world+src image"
+ log "Constructing world+src image"
- # Create directory for world
- mkdir ${WORKDIR}/world/
+ # Create directory for world
+ mkdir ${WORKDIR}/world/
- # Extract world and source distributions
- for C in ${WORLDPARTS}; do
- cat ${WORKDIR}/iso/usr/freebsd-dist/${C}.txz |
- tar -xpzf - -C ${WORKDIR}/world/
- done
- for C in ${SOURCEPARTS}; do
- cat ${WORKDIR}/iso/usr/freebsd-dist/${C}.txz |
- tar -xpzf - -C ${WORKDIR}/world/
- done
+ # Extract world and source distributions
+ for C in ${WORLDPARTS}; do
+ cat ${WORKDIR}/iso/usr/freebsd-dist/${C}.txz |
+ tar -xpzf - -C ${WORKDIR}/world/
+ done
+ for C in ${SOURCEPARTS}; do
+ cat ${WORKDIR}/iso/usr/freebsd-dist/${C}.txz |
+ tar -xpzf - -C ${WORKDIR}/world/
+ done
- # build a single tarball of them.
- tar -czf ${WORKDIR}/../world.tgz -C ${WORKDIR}/world .
+ # build a single tarball of them.
+ tar -czf ${WORKDIR}/../world.tgz -C ${WORKDIR}/world .
- # clean up
- nuke world
- fi
+ # clean up
+ nuke world
# Unmount and detach the ISO image md(4).
umount ${WORKDIR}/iso
From owner-svn-src-user@freebsd.org Fri Feb 5 20:39:35 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 39752A9C234
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 5 Feb 2016 20:39:35 +0000 (UTC)
(envelope-from glebius@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 ECAA91C10;
Fri, 5 Feb 2016 20:39:34 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u15KdXgk050306;
Fri, 5 Feb 2016 20:39:33 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u15KdXtk050305;
Fri, 5 Feb 2016 20:39:33 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201602052039.u15KdXtk050305@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 5 Feb 2016 20:39:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295333 -
user/cperciva/freebsd-update-build/scripts/10.3-BETA1/i386
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 20:39:35 -0000
Author: glebius
Date: Fri Feb 5 20:39:33 2016
New Revision: 295333
URL: https://svnweb.freebsd.org/changeset/base/295333
Log:
i386 conf for 10.3-BETA1.
Added:
user/cperciva/freebsd-update-build/scripts/10.3-BETA1/i386/
user/cperciva/freebsd-update-build/scripts/10.3-BETA1/i386/build.conf (contents, props changed)
Added: user/cperciva/freebsd-update-build/scripts/10.3-BETA1/i386/build.conf
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/scripts/10.3-BETA1/i386/build.conf Fri Feb 5 20:39:33 2016 (r295333)
@@ -0,0 +1,10 @@
+export RELH=e4ad76294a572460414010eadfd2508725621e2c77552b40467f652bd40d8a911a17a9e3a3e70ccb5d89d51fcea39867542d09e1baa4196e949ea36705f9662a
+export FTP=https://people.freebsd.org/~marius/10.3-BETA1/
+
+# Components of the world, source, and kernels
+export WORLDPARTS="base doc games"
+export SOURCEPARTS="src"
+export KERNELPARTS="kernel"
+
+# EOL date
+export EOL=1456531200
From owner-svn-src-user@freebsd.org Fri Feb 5 23:39:25 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 BD825A77DC4
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 5 Feb 2016 23:39:25 +0000 (UTC)
(envelope-from ngie@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 786831FE6;
Fri, 5 Feb 2016 23:39:25 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u15NdOU6004042;
Fri, 5 Feb 2016 23:39:24 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u15NdONc004041;
Fri, 5 Feb 2016 23:39:24 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602052339.u15NdONc004041@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 5 Feb 2016 23:39:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295339 - user/ngie/bsnmp_cleanup/contrib/bsnmp/snmpd
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 23:39:25 -0000
Author: ngie
Date: Fri Feb 5 23:39:24 2016
New Revision: 295339
URL: https://svnweb.freebsd.org/changeset/base/295339
Log:
Checkpoint work to make bsnmpd/main.c compile with WARNS?=6
WIP. Needs to be tested
Modified:
user/ngie/bsnmp_cleanup/contrib/bsnmp/snmpd/main.c
Modified: user/ngie/bsnmp_cleanup/contrib/bsnmp/snmpd/main.c
==============================================================================
--- user/ngie/bsnmp_cleanup/contrib/bsnmp/snmpd/main.c Fri Feb 5 21:57:50 2016 (r295338)
+++ user/ngie/bsnmp_cleanup/contrib/bsnmp/snmpd/main.c Fri Feb 5 23:39:24 2016 (r295339)
@@ -648,11 +648,11 @@ decoded:
} else if (usm_user->suser.auth_proto != SNMP_AUTH_NOAUTH &&
(pdu->engine.engine_boots == 0 || pdu->engine.engine_time == 0)) {
snmpd_usmstats.not_in_time_windows++;
- ret = SNMP_CODE_FAILED;
+ ret = SNMPD_INPUT_FAILED;
}
if ((code = snmp_pdu_auth_access(pdu, ip)) != SNMP_CODE_OK)
- ret = SNMP_CODE_FAILED;
+ ret = SNMPD_INPUT_FAILED;
return (ret);
}
@@ -1169,7 +1169,7 @@ recv_dgram(struct port_input *pi, struct
memcpy(laddr, CMSG_DATA(cmsg), sizeof(struct in_addr));
if (cmsg->cmsg_level == SOL_SOCKET &&
cmsg->cmsg_type == SCM_CREDS)
- cred = (struct sockcred *)CMSG_DATA(cmsg);
+ memcpy(cred, CMSG_DATA(cmsg), sizeof(struct sockcred));
}
if (pi->cred)
@@ -1207,7 +1207,7 @@ snmpd_input(struct port_input *pi, struc
ret = recv_stream(pi);
} else {
- struct in_addr *laddr;
+ struct in_addr laddr;
memset(cbuf, 0, CMSG_SPACE(sizeof(struct in_addr)));
msg.msg_control = cbuf;
@@ -1216,11 +1216,11 @@ snmpd_input(struct port_input *pi, struc
cmsgp->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
cmsgp->cmsg_level = IPPROTO_IP;
cmsgp->cmsg_type = IP_SENDSRCADDR;
- laddr = (struct in_addr *)CMSG_DATA(cmsgp);
+ memcpy(&laddr, CMSG_DATA(cmsgp), sizeof(struct in_addr));
- ret = recv_dgram(pi, laddr);
+ ret = recv_dgram(pi, &laddr);
- if (laddr->s_addr == 0) {
+ if (laddr.s_addr == 0) {
msg.msg_control = NULL;
msg.msg_controllen = 0;
}
From owner-svn-src-user@freebsd.org Fri Feb 5 23:46:35 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 793C1A9C0BB
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 5 Feb 2016 23:46:35 +0000 (UTC)
(envelope-from ngie@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 349BE6C8;
Fri, 5 Feb 2016 23:46:35 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u15NkYCR006896;
Fri, 5 Feb 2016 23:46:34 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u15NkYYV006893;
Fri, 5 Feb 2016 23:46:34 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602052346.u15NkYYV006893@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 5 Feb 2016 23:46:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295340 - in user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd:
bsnmpd modules/snmp_mibII tools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 23:46:35 -0000
Author: ngie
Date: Fri Feb 5 23:46:33 2016
New Revision: 295340
URL: https://svnweb.freebsd.org/changeset/base/295340
Log:
Set WARNS?= 6; remove NO_WERROR; reap unused CFLAGS
Modified:
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/bsnmpd/Makefile
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/Makefile.inc
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/bsnmpd/Makefile
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/bsnmpd/Makefile Fri Feb 5 23:39:24 2016 (r295339)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/bsnmpd/Makefile Fri Feb 5 23:46:33 2016 (r295340)
@@ -16,7 +16,6 @@ XSYM= snmpMIB begemotSnmpdModuleTable be
freeBSD freeBSDVersion
CLEANFILES= oid.h tree.c tree.h
MAN= bsnmpd.1 snmpmod.3
-NO_WERROR=
FILESGROUPS= BMIBS DEFS
@@ -27,7 +26,7 @@ DEFSDIR= ${SHAREDIR}/snmp/defs
CFLAGS+= -DSNMPTREE_TYPES
CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT
-CFLAGS+= -DUSE_TCPWRAPPERS -DQUADFMT='"llu"' -DQUADXFMT='"llx"'
+CFLAGS+= -DUSE_TCPWRAPPERS
CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_ERR_H -DHAVE_STRLCPY
LIBADD= begemot bsnmp wrap
@@ -48,4 +47,6 @@ MANFILTER= sed -e 's%@MODPATH@%${LIBDIR}
-e 's%@DEFPATH@%${DEFSDIR}/%g' \
-e 's%@MIBSPATH@%${BMIBSDIR}/%g'
+WARNS?= 6
+
.include <bsd.prog.mk>
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile Fri Feb 5 23:39:24 2016 (r295339)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile Fri Feb 5 23:46:33 2016 (r295340)
@@ -15,8 +15,6 @@ MAN= snmp_mibII.3
CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd
CFLAGS+= -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY -DHAVE_SYS_TREE_H
-# XXX Work around clang warning, until maintainer approves fix.
-NO_WERROR.clang=
DEFS= ${MOD}_tree.def
INCS= snmp_${MOD}.h
Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/Makefile.inc
==============================================================================
--- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/Makefile.inc Fri Feb 5 23:39:24 2016 (r295339)
+++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/Makefile.inc Fri Feb 5 23:46:33 2016 (r295340)
@@ -11,3 +11,5 @@ LIBBSNMPTOOLSDIR= ${.OBJDIR}/../lib
LIBBSNMPTOOLSDIR= ${.CURDIR}/../libbsnmptools
.endif
LIBBSNMPTOOLS= ${LIBBSNMPTOOLSDIR}/libbsnmptools.a
+
+WARNS?= 6
From owner-svn-src-user@freebsd.org Fri Feb 5 23:48:41 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 2DC23A9C180
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 5 Feb 2016 23:48:41 +0000 (UTC) (envelope-from jilles@stack.nl)
Received: from mx1.stack.nl (relay02.stack.nl [IPv6:2001:610:1108:5010::104])
(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
(Client CN "mailhost.stack.nl",
Issuer "CA Cert Signing Authority" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id F29D8881;
Fri, 5 Feb 2016 23:48:40 +0000 (UTC) (envelope-from jilles@stack.nl)
Received: from toad2.stack.nl (toad2.stack.nl [IPv6:2001:610:1108:5010::161])
by mx1.stack.nl (Postfix) with ESMTP id 2726B35930C;
Sat, 6 Feb 2016 00:48:39 +0100 (CET)
Received: by toad2.stack.nl (Postfix, from userid 1677)
id E27E4892B3; Sat, 6 Feb 2016 00:48:38 +0100 (CET)
Date: Sat, 6 Feb 2016 00:48:38 +0100
From: Jilles Tjoelker <jilles@stack.nl>
To: Garrett Cooper <ngie@FreeBSD.org>
Cc: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: Re: svn commit: r295247 - user/ngie/bsnmp_cleanup/contrib/bsnmp/lib
Message-ID: <20160205234838.GB97435@stack.nl>
References: <201602040908.u1498buB006713@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201602040908.u1498buB006713@repo.freebsd.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 23:48:41 -0000
On Thu, Feb 04, 2016 at 09:08:37AM +0000, Garrett Cooper wrote:
> Author: ngie
> Date: Thu Feb 4 09:08:36 2016
> New Revision: 295247
> URL: https://svnweb.freebsd.org/changeset/base/295247
> Log:
> Use mkstemp(3) instead of mktemp(3) when creating temporary files to fix
> the security pragma
> Modified:
> user/ngie/bsnmp_cleanup/contrib/bsnmp/lib/snmpclient.c
> Modified: user/ngie/bsnmp_cleanup/contrib/bsnmp/lib/snmpclient.c
> ==============================================================================
> --- user/ngie/bsnmp_cleanup/contrib/bsnmp/lib/snmpclient.c Thu Feb 4 09:07:44 2016 (r295246)
> +++ user/ngie/bsnmp_cleanup/contrib/bsnmp/lib/snmpclient.c Thu Feb 4 09:08:36 2016 (r295247)
> @@ -1000,7 +1000,7 @@ open_client_local(const char *path)
> snprintf(snmp_client.local_path, sizeof(snmp_client.local_path),
> "%s", SNMP_LOCAL_PATH);
>
> - if (mktemp(snmp_client.local_path) == NULL) {
> + if (mkstemp(snmp_client.local_path) == -1) {
> seterr(&snmp_client, "%s", strerror(errno));
> (void)close(snmp_client.fd);
> snmp_client.fd = -1;
This shuts up the warning, but I think it will also completely break the
client. Since mkstemp() creates a regular file, the subsequent bind()
will fail and the client will not start. Also, the file descriptor is
leaked.
The security check has guessed correctly that mktemp() is being misused,
though. If bind() fails because of [EEXIST], it should be retried with a
new name to guard against a DoS. Fixing the problem this way will not
make the security check happy, though.
The problem can be fixed and the security check made happy by creating a
temporary directory with mode 700 using mkdtemp() and binding to a name
in there. Deletion will be a two-step process.
Looking from a higher level, the bind() call may not be needed. It is
only needed if the server calls getpeername() or passes non-NULL
pointers to accept(), and uses that information. Using the pathname is
likely unsafe since it may contain symlinks.
--
Jilles Tjoelker