summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ssh.c b/ssh.c
index 24ee54142..67d297c0a 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.179 2002/06/12 01:09:52 markus Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.180 2002/06/30 21:59:45 deraadt Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>
@@ -552,7 +552,7 @@ again:
552 if (buffer_len(&command) == 0) 552 if (buffer_len(&command) == 0)
553 tty_flag = 1; 553 tty_flag = 1;
554 554
555 /* Force no tty*/ 555 /* Force no tty */
556 if (no_tty_flag) 556 if (no_tty_flag)
557 tty_flag = 0; 557 tty_flag = 0;
558 /* Do not allocate a tty if stdin is not a tty. */ 558 /* Do not allocate a tty if stdin is not a tty. */
@@ -637,7 +637,8 @@ again:
637 if (options.rhosts_rsa_authentication || 637 if (options.rhosts_rsa_authentication ||
638 options.hostbased_authentication) { 638 options.hostbased_authentication) {
639 sensitive_data.nkeys = 3; 639 sensitive_data.nkeys = 3;
640 sensitive_data.keys = xmalloc(sensitive_data.nkeys*sizeof(Key)); 640 sensitive_data.keys = xmalloc(sensitive_data.nkeys *
641 sizeof(Key));
641 642
642 PRIV_START; 643 PRIV_START;
643 sensitive_data.keys[0] = key_load_private_type(KEY_RSA1, 644 sensitive_data.keys[0] = key_load_private_type(KEY_RSA1,