=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-add.c,v retrieving revision 1.16.2.4 retrieving revision 1.17 diff -u -r1.16.2.4 -r1.17 --- src/usr.bin/ssh/ssh-add.c 2001/03/21 18:53:08 1.16.2.4 +++ src/usr.bin/ssh/ssh-add.c 2000/06/20 01:39:44 1.17 @@ -2,52 +2,23 @@ * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , 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. - * - * 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("$OpenBSD: ssh-add.c,v 1.16.2.4 2001/03/21 18:53:08 jason Exp $"); +RCSID("$OpenBSD: ssh-add.c,v 1.17 2000/06/20 01:39:44 markus Exp $"); -#include +#include +#include -#include "ssh.h" #include "rsa.h" -#include "log.h" +#include "ssh.h" #include "xmalloc.h" -#include "key.h" #include "authfd.h" +#include "fingerprint.h" +#include "key.h" #include "authfile.h" -#include "pathnames.h" -#include "readpass.h" void delete_file(AuthenticationConnection *ac, const char *filename) @@ -55,16 +26,12 @@ Key *public; char *comment; - public = key_new(KEY_RSA1); + public = key_new(KEY_RSA); if (!load_public_key(filename, public, &comment)) { - key_free(public); - public = key_new(KEY_UNSPEC); - if (!try_load_public_key(filename, public, &comment)) { - printf("Bad key file %s\n", filename); - return; - } + printf("Bad key file %s: %s\n", filename, strerror(errno)); + return; } - if (ssh_remove_identity(ac, public)) + if (ssh_remove_identity(ac, public->rsa)) fprintf(stderr, "Identity removed: %s (%s)\n", filename, comment); else fprintf(stderr, "Could not remove identity: %s\n", filename); @@ -72,21 +39,14 @@ xfree(comment); } -/* Send a request to remove all identities. */ void delete_all(AuthenticationConnection *ac) { - 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) + /* 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 identities.\n"); + fprintf(stderr, "Failed to remove all identitities.\n"); } char * @@ -98,8 +58,6 @@ int p[2], status; char buf[1024]; - if (fflush(stdout) != 0) - error("ssh_askpass: fflush: %s", strerror(errno)); if (askpass == NULL) fatal("internal error: askpass undefined"); if (pipe(p) < 0) @@ -132,28 +90,17 @@ void add_file(AuthenticationConnection *ac, const char *filename) { - struct stat st; Key *public; Key *private; char *saved_comment, *comment, *askpass = NULL; char buf[1024], msg[1024]; int success; int interactive = isatty(STDIN_FILENO); - int type = KEY_RSA1; - if (stat(filename, &st) < 0) { - perror(filename); - exit(1); - } - /* - * try to load the public key. right now this only works for RSA, - * since DSA keys are fully encrypted - */ - public = key_new(KEY_RSA1); + public = key_new(KEY_RSA); if (!load_public_key(filename, public, &saved_comment)) { - /* ok, so we will assume this is 'some' key */ - type = KEY_UNSPEC; - saved_comment = xstrdup(filename); + printf("Bad key file %s: %s\n", filename, strerror(errno)); + return; } key_free(public); @@ -161,11 +108,11 @@ if (getenv(SSH_ASKPASS_ENV)) askpass = getenv(SSH_ASKPASS_ENV); else - askpass = _PATH_SSH_ASKPASS_DEFAULT; + askpass = SSH_ASKPASS_DEFAULT; } /* At first, try empty passphrase */ - private = key_new(type); + private = key_new(KEY_RSA); success = load_private_key(filename, "", private, &comment); if (!success) { printf("Need passphrase for %.200s\n", filename); @@ -195,43 +142,54 @@ strlcpy(msg, "Bad passphrase, try again", sizeof msg); } } - xfree(comment); - if (ssh_add_identity(ac, private, saved_comment)) - fprintf(stderr, "Identity added: %s (%s)\n", filename, saved_comment); + xfree(saved_comment); + + if (ssh_add_identity(ac, private->rsa, comment)) + fprintf(stderr, "Identity added: %s (%s)\n", filename, comment); else fprintf(stderr, "Could not add identity: %s\n", filename); key_free(private); - xfree(saved_comment); + xfree(comment); } void -list_identities(AuthenticationConnection *ac, int do_fp) +list_identities(AuthenticationConnection *ac, int fp) { - Key *key; - char *comment, *fp; - int had_identities = 0; - int version; + BIGNUM *e, *n; + int status; + char *comment; + int had_identities; - 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); + 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 { - if (!key_write(key, stdout)) - fprintf(stderr, "key_write failed"); - fprintf(stdout, " %s\n", comment); + 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_free(key); - xfree(comment); } + xfree(comment); } + BN_clear_free(e); + BN_clear_free(n); if (!had_identities) printf("The agent has no identities.\n"); } @@ -246,8 +204,15 @@ int i; int deleting = 0; - SSLeay_add_all_algorithms(); + /* 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) { @@ -280,12 +245,11 @@ if (no_files) { pw = getpwuid(getuid()); if (!pw) { - fprintf(stderr, "No user found with uid %u\n", - (u_int)getuid()); + 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, _PATH_SSH_CLIENT_IDENTITY); + snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir, SSH_CLIENT_IDENTITY); if (deleting) delete_file(ac, buf); else