Module Name: src
Committed By: martin
Date: Sun Jul 15 10:59:49 UTC 2018
Modified Files:
src/crypto/external/bsd/openssh/dist [netbsd-8]: ssh-agent.1
ssh-agent.c
Log Message:
Pull up following revision(s) (requested by sevan in ticket #922):
crypto/external/bsd/openssh/dist/ssh-agent.1: revision 1.13
crypto/external/bsd/openssh/dist/ssh-agent.c: revision 1.23
Amend whitelisted filesystem paths ssh-agent will look for PKCS11 related
libraries so that things work out of the box with pkgsrc without having to
explicitly whitelist things.
ok christos
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.4.1 \
src/crypto/external/bsd/openssh/dist/ssh-agent.1
cvs rdiff -u -r1.20.4.1 -r1.20.4.2 \
src/crypto/external/bsd/openssh/dist/ssh-agent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/ssh-agent.1
diff -u src/crypto/external/bsd/openssh/dist/ssh-agent.1:1.12 src/crypto/external/bsd/openssh/dist/ssh-agent.1:1.12.4.1
--- src/crypto/external/bsd/openssh/dist/ssh-agent.1:1.12 Tue Apr 18 18:41:46 2017
+++ src/crypto/external/bsd/openssh/dist/ssh-agent.1 Sun Jul 15 10:59:49 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: ssh-agent.1,v 1.12 2017/04/18 18:41:46 christos Exp $
+.\" $NetBSD: ssh-agent.1,v 1.12.4.1 2018/07/15 10:59:49 martin Exp $
.\" $OpenBSD: ssh-agent.1,v 1.64 2016/11/30 06:54:26 jmc Exp $
.\"
.\"
@@ -131,7 +131,7 @@ that may be added using the
option to
.Xr ssh-add 1 .
The default is to allow loading PKCS#11 libraries from
-.Dq /usr/lib/*,/usr/local/lib/* .
+.Dq /usr/lib/*,/usr/pkg/lib/* .
PKCS#11 libraries that do not match the whitelist will be refused.
See PATTERNS in
.Xr ssh_config 5
Index: src/crypto/external/bsd/openssh/dist/ssh-agent.c
diff -u src/crypto/external/bsd/openssh/dist/ssh-agent.c:1.20.4.1 src/crypto/external/bsd/openssh/dist/ssh-agent.c:1.20.4.2
--- src/crypto/external/bsd/openssh/dist/ssh-agent.c:1.20.4.1 Mon Dec 4 10:55:18 2017
+++ src/crypto/external/bsd/openssh/dist/ssh-agent.c Sun Jul 15 10:59:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ssh-agent.c,v 1.20.4.1 2017/12/04 10:55:18 snj Exp $ */
+/* $NetBSD: ssh-agent.c,v 1.20.4.2 2018/07/15 10:59:49 martin Exp $ */
/* $OpenBSD: ssh-agent.c,v 1.224 2017/07/24 04:34:28 djm Exp $ */
/*
* Author: Tatu Ylonen <y...@cs.hut.fi>
@@ -36,7 +36,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: ssh-agent.c,v 1.20.4.1 2017/12/04 10:55:18 snj Exp $");
+__RCSID("$NetBSD: ssh-agent.c,v 1.20.4.2 2018/07/15 10:59:49 martin Exp $");
#include <sys/param.h> /* MIN MAX */
#include <sys/types.h>
@@ -82,7 +82,7 @@ __RCSID("$NetBSD: ssh-agent.c,v 1.20.4.1
#endif
#ifndef DEFAULT_PKCS11_WHITELIST
-# define DEFAULT_PKCS11_WHITELIST "/usr/lib*/*,/usr/local/lib*/*"
+# define DEFAULT_PKCS11_WHITELIST "/usr/lib*/*,/usr/pkg/lib*/*"
#endif
/* Maximum accepted message length */
