- Merged very large OpenBSD source code reformat

 - OpenBSD CVS updates
   - [channels.c cipher.c compat.c log-client.c scp.c serverloop.c]
     [ssh.h sshd.8 sshd.c]
     syslog changes:
     * Unified Logmessage for all auth-types, for success and for failed
     * Standard connections get only ONE line in the LOG when level==LOG:
       Auth-attempts are logged only, if authentication is:
          a) successfull or
          b) with passwd or
          c) we had more than AUTH_FAIL_LOG failues
     * many log() became verbose()
     * old behaviour with level=VERBOSE
   - [readconf.c readconf.h ssh.1 ssh.h sshconnect.c sshd.c]
     tranfer s/key challenge/response data in SSH_SMSG_AUTH_TIS_CHALLENGE
     messages. allows use of s/key in windows (ttssh, securecrt) and
     ssh-1.2.27 clients without 'ssh -v', ok: niels@
   - [sshd.8]
     -V, for fallback to openssh in SSH2 compatibility mode
   - [sshd.c]
     fix sigchld race; cjc5@po.cwru.edu

1 files changed, 248 insertions, 267 deletions

diff --git a/ssh-add.c b/ssh-add.c
index a95914417..f94dcdabb 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,20 +1,13 @@
 /*
-
-ssh-add.c
-
-Author: Tatu Ylonen <ylo@cs.hut.fi>
-
-Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-                   All rights reserved
-
-Created: Thu Apr  6 00:52:24 1995 ylo
-
-Adds an identity to the authentication server, or removes an identity.
-
-*/
+ * Author: Tatu Ylonen <ylo@cs.hut.fi>
+ * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+ *                    All rights reserved
+ * Created: Thu Apr  6 00:52:24 1995 ylo
+ * Adds an identity to the authentication server, or removes an identity.
+ */
 
 #include "includes.h"
-RCSID("$Id: ssh-add.c,v 1.12 1999/11/23 00:24:32 damien Exp $");
+RCSID("$Id: ssh-add.c,v 1.13 1999/11/24 13:26:22 damien Exp $");
 
 #include "rsa.h"
 #include "ssh.h"
@@ -35,291 +28,279 @@ const char *__progname = "ssh-add";
 void
 delete_file(AuthenticationConnection *ac, const char *filename)
 {
-  RSA *key;
-  char *comment;
-
-  key = RSA_new();
-  if (!load_public_key(filename, key, &comment))
-    {
-      printf("Bad key file %s: %s\n", filename, strerror(errno));
-      return;
-    }
-
-  if (ssh_remove_identity(ac, key))
-    fprintf(stderr, "Identity removed: %s (%s)\n", filename, comment);
-  else
-    fprintf(stderr, "Could not remove identity: %s\n", filename);
-  RSA_free(key);
-  xfree(comment);
+        RSA *key;
+        char *comment;
+
+        key = RSA_new();
+        if (!load_public_key(filename, key, &comment)) {
+                printf("Bad key file %s: %s\n", filename, strerror(errno));
+                return;
+        }
+        if (ssh_remove_identity(ac, key))
+                fprintf(stderr, "Identity removed: %s (%s)\n", filename, comment);
+        else
+                fprintf(stderr, "Could not remove identity: %s\n", filename);
+        RSA_free(key);
+        xfree(comment);
 }
 
 void
 delete_all(AuthenticationConnection *ac)
 {
-  /* Send a request to remove all identities. */
-  if (ssh_remove_all_identities(ac))
-    fprintf(stderr, "All identities removed.\n");
-  else
-    fprintf(stderr, "Failed to remove all identitities.\n");
+        /* Send a request to remove all identities. */
+        if (ssh_remove_all_identities(ac))
+                fprintf(stderr, "All identities removed.\n");
+        else
+                fprintf(stderr, "Failed to remove all identitities.\n");
 }
 
 void
 add_file(AuthenticationConnection *ac, const char *filename)
 {
-  RSA *key;
-  RSA *public_key;
-  char *saved_comment, *comment;
-  int success;
-  
-  key = RSA_new();
-  public_key = RSA_new();
-  if (!load_public_key(filename, public_key, &saved_comment))
-    {
-      printf("Bad key file %s: %s\n", filename, strerror(errno));
-      return;
-    }
-  RSA_free(public_key);
-
-  /* At first, try empty passphrase */
-  success = load_private_key(filename, "", key, &comment);
-  if (!success) {
-    printf("Need passphrase for %s (%s).\n", filename, saved_comment);
-    if (!isatty(STDIN_FILENO)) {
-#ifdef USE_EXTERNAL_ASKPASS
-      int prompts = 3;
+        RSA *key;
+        RSA *public_key;
+        char *saved_comment, *comment;
+        int success;
+
+        key = RSA_new();
+        public_key = RSA_new();
+        if (!load_public_key(filename, public_key, &saved_comment)) {
+                printf("Bad key file %s: %s\n", filename, strerror(errno));
+                return;
+        }
+        RSA_free(public_key);
 
-      while (prompts && !success)
-                {
-        success = askpass(filename, key, saved_comment, &comment);
-                  prompts--;
-                }
-                if (!success)
-                {
-        xfree(saved_comment);
-        return;
-                }
+        /* At first, try empty passphrase */
+        success = load_private_key(filename, "", key, &comment);
+        if (!success) {
+                printf("Need passphrase for %s (%s).\n", filename, saved_comment);
+                if (!isatty(STDIN_FILENO)) {
+#ifdef USE_EXTERNAL_ASKPASS
+                        int prompts = 3;
+                        while (prompts && !success) {
+                                success = askpass(filename, key, saved_comment, &comment);
+                                prompts--;
+                        }
+                        if (!success) {
+                                xfree(saved_comment);
+                                return;
+                        }
 #else /* !USE_EXTERNAL_ASKPASS */
-      xfree(saved_comment);
-      return;
+                xfree(saved_comment);
+                return;
 #endif /* USE_EXTERNAL_ASKPASS */
-    }
-
-    while (!success) {
-      char *pass = read_passphrase("Enter passphrase: ", 1);
-      if (strcmp(pass, "") == 0){
-        xfree(pass);
-        xfree(saved_comment);
-        return;
-      }
-      success = load_private_key(filename, pass, key, &comment);
-      memset(pass, 0, strlen(pass));
-      xfree(pass);
-      if (success)
-        break;
-      printf("Bad passphrase.\n");
-    } 
-  }
-  xfree(saved_comment);
-
-  if (ssh_add_identity(ac, key, comment))
-    fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
-  else
-    fprintf(stderr, "Could not add identity: %s\n", filename);
-  RSA_free(key);
-  xfree(comment);
+                }
+
+                while (!success) {
+                        char *pass = read_passphrase("Enter passphrase: ", 1);
+                        if (strcmp(pass, "") == 0) {
+                                xfree(pass);
+                                xfree(saved_comment);
+                                return;
+                        }
+                        success = load_private_key(filename, pass, key, &comment);
+                        memset(pass, 0, strlen(pass));
+                        xfree(pass);
+                        if (success)
+                                break;
+                        printf("Bad passphrase.\n");
+                }
+        }
+        xfree(saved_comment);
+
+        if (ssh_add_identity(ac, key, comment))
+                fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
+        else
+                fprintf(stderr, "Could not add identity: %s\n", filename);
+        RSA_free(key);
+        xfree(comment);
 }
 
 void
 list_identities(AuthenticationConnection *ac, int fp)
 {
-  BIGNUM *e, *n;
-  int status;
-  char *comment;
-  int had_identities;
-
-  e = BN_new();
-  n = BN_new();
-  had_identities = 0;
-  for (status = ssh_get_first_identity(ac, e, n, &comment);
-       status;
-       status = ssh_get_next_identity(ac, e, n, &comment))
-    {
-      unsigned int bits = BN_num_bits(n);
-      had_identities = 1;
-      if (fp) {
-        printf("%d %s %s\n", bits, fingerprint(e, n), comment);
-      } else {
-        char *ebuf, *nbuf;
-        ebuf = BN_bn2dec(e);
-        if (ebuf == NULL) {
-          error("list_identities: BN_bn2dec(e) failed.");
-        }else{
-          nbuf = BN_bn2dec(n);
-          if (nbuf == NULL) {
-            error("list_identities: BN_bn2dec(n) failed.");
-          }else{
-            printf("%d %s %s %s\n", bits, ebuf, nbuf, comment);
-            free(nbuf);
-          }
-          free(ebuf);
+        BIGNUM *e, *n;
+        int status;
+        char *comment;
+        int had_identities;
+
+        e = BN_new();
+        n = BN_new();
+        had_identities = 0;
+        for (status = ssh_get_first_identity(ac, e, n, &comment);
+             status;
+             status = ssh_get_next_identity(ac, e, n, &comment)) {
+                unsigned int bits = BN_num_bits(n);
+                had_identities = 1;
+                if (fp) {
+                        printf("%d %s %s\n", bits, fingerprint(e, n), comment);
+                } else {
+                        char *ebuf, *nbuf;
+                        ebuf = BN_bn2dec(e);
+                        if (ebuf == NULL) {
+                                error("list_identities: BN_bn2dec(e) failed.");
+                        } else {
+                                nbuf = BN_bn2dec(n);
+                                if (nbuf == NULL) {
+                                        error("list_identities: BN_bn2dec(n) failed.");
+                                } else {
+                                        printf("%d %s %s %s\n", bits, ebuf, nbuf, comment);
+                                        free(nbuf);
+                                }
+                                free(ebuf);
+                        }
+                }
+                xfree(comment);
         }
-      }
-      xfree(comment);
-    }
-  BN_clear_free(e);
-  BN_clear_free(n);
-  if (!had_identities)
-    printf("The agent has no identities.\n");
+        BN_clear_free(e);
+        BN_clear_free(n);
+        if (!had_identities)
+                printf("The agent has no identities.\n");
 }
 
 int
 main(int argc, char **argv)
 {
-  AuthenticationConnection *ac = NULL;
-  struct passwd *pw;
-  char buf[1024];
-  int no_files = 1;
-  int i;
-  int deleting = 0;
-
-  /* check if RSA support exists */
-  if (rsa_alive() == 0) {
-    fprintf(stderr,
-      "%s: no RSA support in libssl and libcrypto.  See ssl(8).\n",
-      __progname);
-    exit(1);
-  }
-
-  /* At first, get a connection to the authentication agent. */
-  ac = ssh_get_authentication_connection();
-  if (ac == NULL) {
-    fprintf(stderr, "Could not open a connection to your authentication agent.\n");
-    exit(1);
-  }
-
-  for (i = 1; i < argc; i++)
-    {
-      if ((strcmp(argv[i], "-l") == 0) ||
-          (strcmp(argv[i], "-L") == 0))
-        {
-          list_identities(ac, argv[i][1] == 'l' ? 1 : 0);
-          no_files = 0; /* Don't default-add/delete if -l. */
-          continue;
+        AuthenticationConnection *ac = NULL;
+        struct passwd *pw;
+        char buf[1024];
+        int no_files = 1;
+        int i;
+        int deleting = 0;
+
+        /* check if RSA support exists */
+        if (rsa_alive() == 0) {
+                extern char *__progname;
+
+                fprintf(stderr,
+                        "%s: no RSA support in libssl and libcrypto.  See ssl(8).\n",
+                        __progname);
+                exit(1);
         }
-      if (strcmp(argv[i], "-d") == 0)
-        {
-          deleting = 1;
-          continue;
+        /* At first, get a connection to the authentication agent. */
+        ac = ssh_get_authentication_connection();
+        if (ac == NULL) {
+                fprintf(stderr, "Could not open a connection to your authentication agent.\n");
+                exit(1);
         }
-      if (strcmp(argv[i], "-D") == 0)
-        {
-          delete_all(ac);
-          no_files = 0;
-          continue;
+        for (i = 1; i < argc; i++) {
+                if ((strcmp(argv[i], "-l") == 0) ||
+                    (strcmp(argv[i], "-L") == 0)) {
+                        list_identities(ac, argv[i][1] == 'l' ? 1 : 0);
+                        /* Don't default-add/delete if -l. */
+                        no_files = 0;
+                        continue;
+                }
+                if (strcmp(argv[i], "-d") == 0) {
+                        deleting = 1;
+                        continue;
+                }
+                if (strcmp(argv[i], "-D") == 0) {
+                        delete_all(ac);
+                        no_files = 0;
+                        continue;
+                }
+                no_files = 0;
+                if (deleting)
+                        delete_file(ac, argv[i]);
+                else
+                        add_file(ac, argv[i]);
         }
-      no_files = 0;
-      if (deleting)
-        delete_file(ac, argv[i]);
-      else
-        add_file(ac, argv[i]);
-    }
-  if (no_files)
-    {
-      pw = getpwuid(getuid());
-      if (!pw)
-        {
-          fprintf(stderr, "No user found with uid %d\n", (int)getuid());
-          ssh_close_authentication_connection(ac);
-          exit(1);
+        if (no_files) {
+                pw = getpwuid(getuid());
+                if (!pw) {
+                        fprintf(stderr, "No user found with uid %d\n", (int) getuid());
+                        ssh_close_authentication_connection(ac);
+                        exit(1);
+                }
+                snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir, SSH_CLIENT_IDENTITY);
+                if (deleting)
+                        delete_file(ac, buf);
+                else
+                        add_file(ac, buf);
         }
-      snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir, SSH_CLIENT_IDENTITY);
-      if (deleting)
-        delete_file(ac, buf);
-      else
-        add_file(ac, buf);
-    }
-  ssh_close_authentication_connection(ac);
-  exit(0);
+        ssh_close_authentication_connection(ac);
+        exit(0);
 }
 
 #ifdef USE_EXTERNAL_ASKPASS
 int askpass(const char *filename, RSA *key, const char *saved_comment, char **comment)
 {
-  int pipes[2];
-  char buf[1024];
-  int tmp;
-  pid_t child;
-  FILE *pipef;
-
-  /* Check that we are X11-capable */
-  if (getenv("DISPLAY") == NULL)
-        exit(1);
-
-  if (pipe(pipes) == -1) {
-    fprintf(stderr, "Creating pipes failed: %s\n", strerror(errno));
-    exit(1);
-  }
-
-  if (fflush(NULL) == EOF) {
-    fprintf(stderr, "Cannot flush buffers: %s\n", strerror(errno));
-    exit(1);
-  }
-
-  child = fork();
-  if (child == -1) {
-    fprintf(stderr, "Cannot fork: %s\n", strerror(errno));
-    exit(1);
-  }
-  
-  if (child == 0) {
-    /* In child */
-
-    close(pipes[0]);
-    if (dup2(pipes[1], 1) ==-1) {
-      fprintf(stderr, "dup2 failed: %s\n", strerror(errno));
-      exit(1);
-    }
-
-    tmp = snprintf(buf, sizeof(buf), "Need passphrase for %s", saved_comment);
-    /* skip the prompt if it won't fit */
-    if ((tmp < 0) || (tmp >= sizeof(buf)))
-      tmp = execlp(ASKPASS_PROGRAM, "ssh-askpass", 0);
-    else
-      tmp = execlp(ASKPASS_PROGRAM, "ssh-askpass", buf, 0);
-
-    /* Shouldn't get this far */    
-    fprintf(stderr, "Executing ssh-askpass failed: %s\n", strerror(errno));
-    exit(1);
-  } 
-
-  /* In parent */
-  close(pipes[1]);
-
-  if ((pipef = fdopen(pipes[0], "r")) == NULL) {
-    fprintf(stderr, "fdopen failed: %s\n", strerror(errno));
-    exit(1);
-  }
-  
-  /* Read passphrase back from child, abort if none presented */
-  if(fgets(buf, sizeof(buf), pipef) == NULL)
-    exit(1);
-
-  fclose(pipef);
-
-  if (strchr(buf, '\n'))
-    *strchr(buf, '\n') = 0;
-
-  if (waitpid(child, NULL, 0) == -1) {
-    fprintf(stderr, "Waiting for child failed: %s\n",
-    strerror(errno));
-    exit(1);
-  }
-
-  /* Try password as it was presented */
-  tmp = load_private_key(filename, buf, key, comment);
-
-  memset(buf, 0, sizeof(buf));
-
-  return(tmp);  
+        int pipes[2];
+        char buf[1024];
+        int tmp;
+        pid_t child;
+        FILE *pipef;
+
+        /* Check that we are X11-capable */
+        if (getenv("DISPLAY") == NULL)
+                exit(1);
+
+        if (pipe(pipes) == -1) {
+                fprintf(stderr, "Creating pipes failed: %s\n", strerror(errno));
+                exit(1);
+        }
+
+        if (fflush(NULL) == EOF) {
+                fprintf(stderr, "Cannot flush buffers: %s\n", strerror(errno));
+                exit(1);
+        }
+
+        child = fork();
+        if (child == -1) {
+                fprintf(stderr, "Cannot fork: %s\n", strerror(errno));
+                exit(1);
+        }
+
+        if (child == 0) {
+        /* In child */
+
+        close(pipes[0]);
+        if (dup2(pipes[1], 1) ==-1) {
+                fprintf(stderr, "dup2 failed: %s\n", strerror(errno));
+                exit(1);
+        }
+
+        tmp = snprintf(buf, sizeof(buf), "Need passphrase for %s", saved_comment);
+        /* skip the prompt if it won't fit */
+        if ((tmp < 0) || (tmp >= sizeof(buf)))
+                tmp = execlp(ASKPASS_PROGRAM, "ssh-askpass", 0);
+        else
+                tmp = execlp(ASKPASS_PROGRAM, "ssh-askpass", buf, 0);
+
+        /* Shouldn't get this far */    
+                fprintf(stderr, "Executing ssh-askpass failed: %s\n", strerror(errno));
+                exit(1);
+        } 
+
+        /* In parent */
+        close(pipes[1]);
+
+        if ((pipef = fdopen(pipes[0], "r")) == NULL) {
+                fprintf(stderr, "fdopen failed: %s\n", strerror(errno));
+                exit(1);
+        }
+
+        /* Read passphrase back from child, abort if none presented */
+        if(fgets(buf, sizeof(buf), pipef) == NULL)
+                exit(1);
+
+        fclose(pipef);
+
+        if (strchr(buf, '\n'))
+        *strchr(buf, '\n') = 0;
+
+        if (waitpid(child, NULL, 0) == -1) {
+                fprintf(stderr, "Waiting for child failed: %s\n",
+                strerror(errno));
+                exit(1);
+        }
+
+        /* Try password as it was presented */
+        tmp = load_private_key(filename, buf, key, comment);
+
+        memset(buf, 0, sizeof(buf));
+
+        return(tmp);  
 }
 #endif /* USE_EXTERNAL_ASKPASS */