summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cipher.c6
-rw-r--r--ssh.c36
2 files changed, 21 insertions, 21 deletions
diff --git a/cipher.c b/cipher.c
index f3d4f69a5..9f4546759 100644
--- a/cipher.c
+++ b/cipher.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cipher.c,v 1.109 2018/02/07 02:06:50 jsing Exp $ */ 1/* $OpenBSD: cipher.c,v 1.110 2018/02/13 03:36:56 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -448,7 +448,7 @@ cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, u_int len)
448{ 448{
449#ifdef WITH_OPENSSL 449#ifdef WITH_OPENSSL
450 const struct sshcipher *c = cc->cipher; 450 const struct sshcipher *c = cc->cipher;
451 int evplen; 451 int evplen;
452#endif 452#endif
453 453
454 if ((cc->cipher->flags & CFLAG_CHACHAPOLY) != 0) { 454 if ((cc->cipher->flags & CFLAG_CHACHAPOLY) != 0) {
@@ -493,7 +493,7 @@ cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv)
493{ 493{
494#ifdef WITH_OPENSSL 494#ifdef WITH_OPENSSL
495 const struct sshcipher *c = cc->cipher; 495 const struct sshcipher *c = cc->cipher;
496 int evplen = 0; 496 int evplen = 0;
497#endif 497#endif
498 498
499 if ((cc->cipher->flags & CFLAG_CHACHAPOLY) != 0) 499 if ((cc->cipher->flags & CFLAG_CHACHAPOLY) != 0)
diff --git a/ssh.c b/ssh.c
index c0bdd38bc..2d8f6506b 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.472 2018/02/11 21:16:56 dtucker Exp $ */ 1/* $OpenBSD: ssh.c,v 1.473 2018/02/13 03:36:56 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1555,29 +1555,29 @@ control_persist_detach(void)
1555 1555
1556 debug("%s: backgrounding master process", __func__); 1556 debug("%s: backgrounding master process", __func__);
1557 1557
1558 /* 1558 /*
1559 * master (current process) into the background, and make the 1559 * master (current process) into the background, and make the
1560 * foreground process a client of the backgrounded master. 1560 * foreground process a client of the backgrounded master.
1561 */ 1561 */
1562 switch ((pid = fork())) { 1562 switch ((pid = fork())) {
1563 case -1: 1563 case -1:
1564 fatal("%s: fork: %s", __func__, strerror(errno)); 1564 fatal("%s: fork: %s", __func__, strerror(errno));
1565 case 0: 1565 case 0:
1566 /* Child: master process continues mainloop */ 1566 /* Child: master process continues mainloop */
1567 break; 1567 break;
1568 default: 1568 default:
1569 /* Parent: set up mux slave to connect to backgrounded master */ 1569 /* Parent: set up mux slave to connect to backgrounded master */
1570 debug2("%s: background process is %ld", __func__, (long)pid); 1570 debug2("%s: background process is %ld", __func__, (long)pid);
1571 stdin_null_flag = ostdin_null_flag; 1571 stdin_null_flag = ostdin_null_flag;
1572 options.request_tty = orequest_tty; 1572 options.request_tty = orequest_tty;
1573 tty_flag = otty_flag; 1573 tty_flag = otty_flag;
1574 close(muxserver_sock); 1574 close(muxserver_sock);
1575 muxserver_sock = -1; 1575 muxserver_sock = -1;
1576 options.control_master = SSHCTL_MASTER_NO; 1576 options.control_master = SSHCTL_MASTER_NO;
1577 muxclient(options.control_path); 1577 muxclient(options.control_path);
1578 /* muxclient() doesn't return on success. */ 1578 /* muxclient() doesn't return on success. */
1579 fatal("Failed to connect to new control master"); 1579 fatal("Failed to connect to new control master");
1580 } 1580 }
1581 if ((devnull = open(_PATH_DEVNULL, O_RDWR)) == -1) { 1581 if ((devnull = open(_PATH_DEVNULL, O_RDWR)) == -1) {
1582 error("%s: open(\"/dev/null\"): %s", __func__, 1582 error("%s: open(\"/dev/null\"): %s", __func__,
1583 strerror(errno)); 1583 strerror(errno));
@@ -1903,7 +1903,7 @@ ssh_session2(struct ssh *ssh, struct passwd *pw)
1903 if (!packet_get_mux()) 1903 if (!packet_get_mux())
1904 muxserver_listen(ssh); 1904 muxserver_listen(ssh);
1905 1905
1906 /* 1906 /*
1907 * If we are in control persist mode and have a working mux listen 1907 * If we are in control persist mode and have a working mux listen
1908 * socket, then prepare to background ourselves and have a foreground 1908 * socket, then prepare to background ourselves and have a foreground
1909 * client attach as a control slave. 1909 * client attach as a control slave.
@@ -1912,18 +1912,18 @@ ssh_session2(struct ssh *ssh, struct passwd *pw)
1912 * after the connection is fully established (in particular, 1912 * after the connection is fully established (in particular,
1913 * async rfwd replies have been received for ExitOnForwardFailure). 1913 * async rfwd replies have been received for ExitOnForwardFailure).
1914 */ 1914 */
1915 if (options.control_persist && muxserver_sock != -1) { 1915 if (options.control_persist && muxserver_sock != -1) {
1916 ostdin_null_flag = stdin_null_flag; 1916 ostdin_null_flag = stdin_null_flag;
1917 ono_shell_flag = no_shell_flag; 1917 ono_shell_flag = no_shell_flag;
1918 orequest_tty = options.request_tty; 1918 orequest_tty = options.request_tty;
1919 otty_flag = tty_flag; 1919 otty_flag = tty_flag;
1920 stdin_null_flag = 1; 1920 stdin_null_flag = 1;
1921 no_shell_flag = 1; 1921 no_shell_flag = 1;
1922 tty_flag = 0; 1922 tty_flag = 0;
1923 if (!fork_after_authentication_flag) 1923 if (!fork_after_authentication_flag)
1924 need_controlpersist_detach = 1; 1924 need_controlpersist_detach = 1;
1925 fork_after_authentication_flag = 1; 1925 fork_after_authentication_flag = 1;
1926 } 1926 }
1927 /* 1927 /*
1928 * ControlPersist mux listen socket setup failed, attempt the 1928 * ControlPersist mux listen socket setup failed, attempt the
1929 * stdio forward setup that we skipped earlier. 1929 * stdio forward setup that we skipped earlier.