20 usr.bin/ssh/session.c
View file
@@ -1,4 +1,4 @@
/* $OpenBSD: session.c,v 1.322 2020/07/03 07:02:37 djm Exp $ */
/* $OpenBSD: session.c,v 1.323 2020/07/05 23:59:45 djm Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -613,7 +613,7 @@ do_exec_pty(struct ssh *ssh, Session *s, const char *command)
}
s->pid = pid;

/* Parent. Close the slave side of the pseudo tty. */
/* Parent. Close the child side of the pseudo tty. */
close(ttyfd);

/* Enter interactive session. */
@@ -787,12 +787,12 @@ check_quietlogin(Session *s, const char *command)
* into the environment. If the file does not exist, this does nothing.
* Otherwise, it must consist of empty lines, comments (line starts with '#')
* and assignments of the form name=value. No other forms are allowed.
* If whitelist is not NULL, then it is interpreted as a pattern list and
* If allowlist is not NULL, then it is interpreted as a pattern list and
* only variable names that match it will be accepted.
*/
static void
read_environment_file(char ***env, u_int *envsize,
const char *filename, const char *whitelist)
const char *filename, const char *allowlist)
{
FILE *f;
char *line = NULL, *cp, *value;
@@ -825,8 +825,8 @@ read_environment_file(char ***env, u_int *envsize,
*/
*value = '\0';
value++;
if (whitelist != NULL &&
match_pattern_list(cp, whitelist, 0) != 1)
if (allowlist != NULL &&
match_pattern_list(cp, allowlist, 0) != 1)
continue;
child_set_env(env, envsize, cp, value);
}
@@ -896,10 +896,10 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell)
cp = strchr(ocp, '=');
if (*cp == '=') {
*cp = '\0';
/* Apply PermitUserEnvironment whitelist */
if (options.permit_user_env_whitelist == NULL ||
/* Apply PermitUserEnvironment allowlist */
if (options.permit_user_env_allowlist == NULL ||
match_pattern_list(ocp,
options.permit_user_env_whitelist, 0) == 1)
options.permit_user_env_allowlist, 0) == 1)
child_set_env(&env, &envsize,
ocp, cp + 1);
}
@@ -912,7 +912,7 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell)
snprintf(buf, sizeof buf, "%.200s/.ssh/environment",
pw->pw_dir);
read_environment_file(&env, &envsize, buf,
options.permit_user_env_whitelist);
options.permit_user_env_allowlist);
}

/* Environment specified by admin */
8 usr.bin/ssh/ssh-agent.c
View file
@@ -1,4 +1,4 @@
/* $OpenBSD: ssh-agent.c,v 1.261 2020/06/22 06:37:38 jmc Exp $ */
/* $OpenBSD: ssh-agent.c,v 1.262 2020/07/05 23:59:45 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -79,8 +79,8 @@
#include "ssh-pkcs11.h"
#include "sk-api.h"

#ifndef DEFAULT_PROVIDER_WHITELIST
# define DEFAULT_PROVIDER_WHITELIST "/usr/lib*/*,/usr/local/lib*/*"
#ifndef DEFAULT_ALLOWED_PROVIDERS
# define DEFAULT_ALLOWED_PROVIDERS "/usr/lib*/*,/usr/local/lib*/*"
#endif

/* Maximum accepted message length */
@@ -1340,7 +1340,7 @@ main(int ac, char **av)
usage();

if (allowed_providers == NULL)
allowed_providers = xstrdup(DEFAULT_PROVIDER_WHITELIST);
allowed_providers = xstrdup(DEFAULT_ALLOWED_PROVIDERS);

if (ac == 0 && !c_flag && !s_flag) {
shell = getenv("SHELL");
12 usr.bin/ssh/ssh.c
View file
@@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.530 2020/06/26 05:02:03 dtucker Exp $ */
/* $OpenBSD: ssh.c,v 1.531 2020/07/05 23:59:45 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -121,11 +121,11 @@ int stdin_null_flag = 0;

/*
* Flag indicating that the current process should be backgrounded and
* a new slave launched in the foreground for ControlPersist.
* a new mux-client launched in the foreground for ControlPersist.
*/
int need_controlpersist_detach = 0;

/* Copies of flags for ControlPersist foreground slave */
/* Copies of flags for ControlPersist foreground mux-client */
int ostdin_null_flag, ono_shell_flag, otty_flag, orequest_tty;

/*
@@ -1670,7 +1670,7 @@ control_persist_detach(void)
/* Child: master process continues mainloop */
break;
default:
/* Parent: set up mux slave to connect to backgrounded master */
/* Parent: set up mux client to connect to backgrounded master */
debug2("%s: background process is %ld", __func__, (long)pid);
stdin_null_flag = ostdin_null_flag;
options.request_tty = orequest_tty;
@@ -2049,9 +2049,9 @@ ssh_session2(struct ssh *ssh, struct passwd *pw)
/*
* If we are in control persist mode and have a working mux listen
* socket, then prepare to background ourselves and have a foreground
* client attach as a control slave.
* client attach as a control client.
* NB. we must save copies of the flags that we override for
* the backgrounding, since we defer attachment of the slave until
* the backgrounding, since we defer attachment of the client until
* after the connection is fully established (in particular,
* async rfwd replies have been received for ExitOnForwardFailure).
*/