X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/f095fcc73b54270bf4e7cac5603fb1bb19cb5a4c..1843a4251fa30af433f6edb8b5e0892d34dbd000:/ssh-add.c

diff --git a/ssh-add.c b/ssh-add.c
index 7788f10b..84a8c20f 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,327 +1,246 @@
 /*
-
-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
+ * Adds an identity to the authentication server, or removes an identity.
+ *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
+ *
+ * SSH2 implementation,
+ * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #include "includes.h"
-RCSID("$Id$");
+RCSID("$OpenBSD: ssh-add.c,v 1.40 2001/06/24 05:35:33 markus Exp $");
+
+#include <openssl/evp.h>
 
-#include "rsa.h"
 #include "ssh.h"
+#include "rsa.h"
+#include "log.h"
 #include "xmalloc.h"
+#include "key.h"
 #include "authfd.h"
-#include "fingerprint.h"
-
-#ifdef USE_EXTERNAL_ASKPASS
-int askpass(const char *filename, RSA *key, const char *saved_comment, char **comment);
-#endif /* USE_EXTERNAL_ASKPASS */
+#include "authfile.h"
+#include "pathnames.h"
+#include "readpass.h"
 
 #ifdef HAVE___PROGNAME
 extern char *__progname;
-#else /* HAVE___PROGNAME */
-const char *__progname = "ssh-add";
-#endif /* HAVE___PROGNAME */
+#else
+char *__progname;
+#endif
+
+/* we keep a cache of one passphrases */
+static char *pass = NULL;
+static void
+clear_pass(void)
+{
+	if (pass) {
+		memset(pass, 0, strlen(pass));
+		xfree(pass);
+		pass = NULL;
+	}
+}
 
-void
+static 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;
-    }
+	Key *public;
+	char *comment = NULL;
 
-  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);
+	public = key_load_public(filename, &comment);
+	if (public == NULL) {
+		printf("Bad key file %s\n", filename);
+		return;
+	}
+	if (ssh_remove_identity(ac, public))
+		fprintf(stderr, "Identity removed: %s (%s)\n", filename, comment);
+	else
+		fprintf(stderr, "Could not remove identity: %s\n", filename);
+	key_free(public);
+	xfree(comment);
 }
 
-void
+/* Send a request to remove all identities. */
+static 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");
+	int success = 1;
+
+	if (!ssh_remove_all_identities(ac, 1))
+		success = 0;
+	/* ignore error-code for ssh2 */
+	ssh_remove_all_identities(ac, 2);
+
+	if (success)
+		fprintf(stderr, "All identities removed.\n");
+	else
+		fprintf(stderr, "Failed to remove all identities.\n");
 }
 
-void
+static 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;
-
-      while (prompts && !success)
-		{
-        success = askpass(filename, key, saved_comment, &comment);
-		  prompts--;
-		}
-		if (!success)
-		{
-        xfree(saved_comment);
-        return;
+	struct stat st;
+	Key *private;
+	char *comment = NULL;
+	char msg[1024];
+
+	if (stat(filename, &st) < 0) {
+		perror(filename);
+		exit(1);
+	}
+	/* At first, try empty passphrase */
+	private = key_load_private(filename, "", &comment);
+	if (comment == NULL)
+		comment = xstrdup(filename);
+	/* try last */
+	if (private == NULL && pass != NULL)
+		private = key_load_private(filename, pass, NULL);
+	if (private == NULL) {
+		/* clear passphrase since it did not work */
+		clear_pass();
+		snprintf(msg, sizeof msg, "Enter passphrase for %.200s: ",
+		   comment);
+		for (;;) {
+			pass = read_passphrase(msg, RP_ALLOW_STDIN);
+			if (strcmp(pass, "") == 0) {
+				clear_pass();
+				xfree(comment);
+				return;
+			}
+			private = key_load_private(filename, pass, &comment);
+			if (private != NULL)
+				break;
+			clear_pass();
+			strlcpy(msg, "Bad passphrase, try again: ", sizeof msg);
 		}
-#else /* !USE_EXTERNAL_ASKPASS */
-      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);
+	}
+	if (ssh_add_identity(ac, private, comment))
+		fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
+	else
+		fprintf(stderr, "Could not add identity: %s\n", filename);
+	xfree(comment);
+	key_free(private);
 }
 
-void
-list_identities(AuthenticationConnection *ac, int fp)
+static void
+list_identities(AuthenticationConnection *ac, int do_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);
+	Key *key;
+	char *comment, *fp;
+	int had_identities = 0;
+	int version;
+
+	for (version = 1; version <= 2; version++) {
+		for (key = ssh_get_first_identity(ac, &comment, version);
+		     key != NULL;
+		     key = ssh_get_next_identity(ac, &comment, version)) {
+			had_identities = 1;
+			if (do_fp) {
+				fp = key_fingerprint(key, SSH_FP_MD5,
+				    SSH_FP_HEX);
+				printf("%d %s %s (%s)\n",
+				    key_size(key), fp, comment, key_type(key));
+				xfree(fp);
+			} else {
+				if (!key_write(key, stdout))
+					fprintf(stderr, "key_write failed");
+				fprintf(stdout, " %s\n", comment);
+			}
+			key_free(key);
+			xfree(comment);
+		}
 	}
-      }
-      xfree(comment);
-    }
-  BN_clear_free(e);
-  BN_clear_free(n);
-  if (!had_identities)
-    printf("The agent has no identities.\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) {
-    extern char *__progname;
-
-    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;
-	}
-      if (strcmp(argv[i], "-d") == 0)
-	{
-	  deleting = 1;
-	  continue;
+	AuthenticationConnection *ac = NULL;
+	struct passwd *pw;
+	char buf[1024];
+	int no_files = 1;
+	int i;
+	int deleting = 0;
+
+	__progname = get_progname(argv[0]);
+	init_rng();
+	seed_rng();
+
+	SSLeay_add_all_algorithms();
+
+	/* 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 %u\n",
+			    (u_int)getuid());
+			ssh_close_authentication_connection(ac);
+			exit(1);
+		}
+		snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir, _PATH_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);
-}
-
-#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 (%s)", filename, 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);  
+	clear_pass();
+	ssh_close_authentication_connection(ac);
+	exit(0);
 }
-#endif /* USE_EXTERNAL_ASKPASS */