mirror of
git://anongit.mindrot.org/openssh.git
synced 2025-03-05 14:18:20 +00:00
- markus@cvs.openbsd.org 2000/11/06 16:04:56 [channels.c channels.h clientloop.c nchan.c serverloop.c] [session.c ssh.c] agent forwarding and -R for ssh2, based on work from jhuuskon@messi.uku.fi - markus@cvs.openbsd.org 2000/11/06 16:13:27 [ssh.c sshconnect.c sshd.c] do not disabled rhosts(rsa) if server port > 1024; from pekkas@netcore.fi - markus@cvs.openbsd.org 2000/11/06 16:16:35 [sshconnect.c] downgrade client to 1.3 if server is 1.4; help from mdb@juniper.net - markus@cvs.openbsd.org 2000/11/09 18:04:40 [auth1.c] typo; from mouring@pconline.com - markus@cvs.openbsd.org 2000/11/12 12:03:28 [ssh-agent.c] off-by-one when removing a key from the agent - markus@cvs.openbsd.org 2000/11/12 12:50:39 [auth-rh-rsa.c auth2.c authfd.c authfd.h] [authfile.c hostfile.c kex.c kex.h key.c key.h myproposal.h] [readconf.c readconf.h rsa.c rsa.h servconf.c servconf.h ssh-add.c] [ssh-agent.c ssh-keygen.1 ssh-keygen.c ssh.1 ssh.c ssh_config] [sshconnect1.c sshconnect2.c sshd.8 sshd.c sshd_config ssh-dss.c] [ssh-dss.h ssh-rsa.c ssh-rsa.h dsa.c dsa.h] add support for RSA to SSH2. please test. there are now 3 types of keys: RSA1 is used by ssh-1 only, RSA and DSA are used by SSH2. you can use 'ssh-keygen -t rsa -f ssh2_rsa_file' to generate RSA keys for SSH2 and use the RSA keys for hostkeys or for user keys. SSH2 RSA or DSA keys are added to .ssh/authorised_keys2 as before. - (djm) Fix up Makefile and Redhat init script to create RSA host keys - (djm) Change to interim version
302 lines
7.9 KiB
C
302 lines
7.9 KiB
C
/*
|
|
* 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("$OpenBSD: ssh-add.c,v 1.23 2000/11/12 19:50:38 markus Exp $");
|
|
|
|
#include <openssl/evp.h>
|
|
#include <openssl/rsa.h>
|
|
#include <openssl/dsa.h>
|
|
|
|
#include "rsa.h"
|
|
#include "ssh.h"
|
|
#include "xmalloc.h"
|
|
#include "key.h"
|
|
#include "authfd.h"
|
|
#include "authfile.h"
|
|
|
|
#ifdef HAVE___PROGNAME
|
|
extern char *__progname;
|
|
#else /* HAVE___PROGNAME */
|
|
static const char *__progname = "ssh-add";
|
|
#endif /* HAVE___PROGNAME */
|
|
|
|
void
|
|
delete_file(AuthenticationConnection *ac, const char *filename)
|
|
{
|
|
Key *public;
|
|
char *comment;
|
|
|
|
public = key_new(KEY_RSA1);
|
|
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;
|
|
}
|
|
}
|
|
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);
|
|
}
|
|
|
|
/* 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)
|
|
fprintf(stderr, "All identities removed.\n");
|
|
else
|
|
fprintf(stderr, "Failed to remove all identitities.\n");
|
|
}
|
|
|
|
char *
|
|
ssh_askpass(char *askpass, char *msg)
|
|
{
|
|
pid_t pid;
|
|
size_t len;
|
|
char *nl, *pass;
|
|
int p[2], status;
|
|
char buf[1024];
|
|
|
|
if (askpass == NULL)
|
|
fatal("internal error: askpass undefined");
|
|
if (pipe(p) < 0)
|
|
fatal("ssh_askpass: pipe: %s", strerror(errno));
|
|
if ((pid = fork()) < 0)
|
|
fatal("ssh_askpass: fork: %s", strerror(errno));
|
|
if (pid == 0) {
|
|
close(p[0]);
|
|
if (dup2(p[1], STDOUT_FILENO) < 0)
|
|
fatal("ssh_askpass: dup2: %s", strerror(errno));
|
|
execlp(askpass, askpass, msg, (char *) 0);
|
|
fatal("ssh_askpass: exec(%s): %s", askpass, strerror(errno));
|
|
}
|
|
close(p[1]);
|
|
buf[0] = '\0';
|
|
atomicio(read, p[0], buf, sizeof buf);
|
|
len = strlen(buf);
|
|
close(p[0]);
|
|
while (waitpid(pid, &status, 0) < 0)
|
|
if (errno != EINTR)
|
|
break;
|
|
if (len <= 1)
|
|
return xstrdup("");
|
|
nl = strchr(buf, '\n');
|
|
if (nl)
|
|
*nl = '\0';
|
|
pass = xstrdup(buf);
|
|
memset(buf, 0, sizeof(buf));
|
|
return pass;
|
|
}
|
|
|
|
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);
|
|
if (!load_public_key(filename, public, &saved_comment)) {
|
|
/* ok, so we will assume this is 'some' key */
|
|
type = KEY_UNSPEC;
|
|
saved_comment = xstrdup(filename);
|
|
}
|
|
key_free(public);
|
|
|
|
if (!interactive && getenv("DISPLAY")) {
|
|
if (getenv(SSH_ASKPASS_ENV))
|
|
askpass = getenv(SSH_ASKPASS_ENV);
|
|
else
|
|
askpass = SSH_ASKPASS_DEFAULT;
|
|
}
|
|
|
|
/* At first, try empty passphrase */
|
|
private = key_new(type);
|
|
success = load_private_key(filename, "", private, &comment);
|
|
if (!success) {
|
|
printf("Need passphrase for %.200s\n", filename);
|
|
if (!interactive && askpass == NULL) {
|
|
xfree(saved_comment);
|
|
return;
|
|
}
|
|
snprintf(msg, sizeof msg, "Enter passphrase for %.200s", saved_comment);
|
|
for (;;) {
|
|
char *pass;
|
|
if (interactive) {
|
|
snprintf(buf, sizeof buf, "%s: ", msg);
|
|
pass = read_passphrase(buf, 1);
|
|
} else {
|
|
pass = ssh_askpass(askpass, msg);
|
|
}
|
|
if (strcmp(pass, "") == 0) {
|
|
xfree(pass);
|
|
xfree(saved_comment);
|
|
return;
|
|
}
|
|
success = load_private_key(filename, pass, private, &comment);
|
|
memset(pass, 0, strlen(pass));
|
|
xfree(pass);
|
|
if (success)
|
|
break;
|
|
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);
|
|
else
|
|
fprintf(stderr, "Could not add identity: %s\n", filename);
|
|
key_free(private);
|
|
xfree(saved_comment);
|
|
}
|
|
|
|
void
|
|
list_identities(AuthenticationConnection *ac, int fp)
|
|
{
|
|
Key *key;
|
|
char *comment;
|
|
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 (fp) {
|
|
printf("%d %s %s (%s)\n",
|
|
key_size(key), key_fingerprint(key),
|
|
comment, key_type(key));
|
|
} else {
|
|
if (!key_write(key, stdout))
|
|
fprintf(stderr, "key_write failed");
|
|
fprintf(stdout, " %s\n", comment);
|
|
}
|
|
key_free(key);
|
|
xfree(comment);
|
|
}
|
|
}
|
|
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;
|
|
|
|
init_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);
|
|
}
|
|
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]);
|
|
}
|
|
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, SSH_CLIENT_IDENTITY);
|
|
if (deleting)
|
|
delete_file(ac, buf);
|
|
else
|
|
add_file(ac, buf);
|
|
}
|
|
ssh_close_authentication_connection(ac);
|
|
exit(0);
|
|
}
|