1999-10-27 03:42:43 +00:00
|
|
|
/*
|
1999-11-24 13:26:21 +00:00
|
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
|
|
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
|
|
* All rights reserved
|
|
|
|
* Created: Mon Mar 27 02:26:40 1995 ylo
|
|
|
|
* Identity and host key generation and maintenance.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#include "includes.h"
|
2000-06-22 11:32:31 +00:00
|
|
|
RCSID("$OpenBSD: ssh-keygen.c,v 1.27 2000/06/20 01:39:44 markus Exp $");
|
2000-04-29 13:57:08 +00:00
|
|
|
|
|
|
|
#include <openssl/evp.h>
|
|
|
|
#include <openssl/pem.h>
|
|
|
|
#include <openssl/rsa.h>
|
|
|
|
#include <openssl/dsa.h>
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#include "ssh.h"
|
|
|
|
#include "xmalloc.h"
|
1999-11-17 06:29:08 +00:00
|
|
|
#include "fingerprint.h"
|
2000-04-29 13:57:08 +00:00
|
|
|
#include "key.h"
|
|
|
|
#include "rsa.h"
|
|
|
|
#include "dsa.h"
|
|
|
|
#include "authfile.h"
|
|
|
|
#include "uuencode.h"
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-04-29 13:57:08 +00:00
|
|
|
/* Number of bits in the RSA/DSA key. This value can be changed on the command line. */
|
1999-10-27 03:42:43 +00:00
|
|
|
int bits = 1024;
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Flag indicating that we just want to change the passphrase. This can be
|
|
|
|
* set on the command line.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
int change_passphrase = 0;
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Flag indicating that we just want to change the comment. This can be set
|
|
|
|
* on the command line.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
int change_comment = 0;
|
|
|
|
|
|
|
|
int quiet = 0;
|
|
|
|
|
1999-11-17 06:29:08 +00:00
|
|
|
/* Flag indicating that we just want to see the key fingerprint */
|
|
|
|
int print_fingerprint = 0;
|
|
|
|
|
1999-11-21 07:31:57 +00:00
|
|
|
/* The identity file name, given on the command line or entered by the user. */
|
|
|
|
char identity_file[1024];
|
|
|
|
int have_identity = 0;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
/* This is set to the passphrase if given on the command line. */
|
|
|
|
char *identity_passphrase = NULL;
|
|
|
|
|
|
|
|
/* This is set to the new passphrase if given on the command line. */
|
|
|
|
char *identity_new_passphrase = NULL;
|
|
|
|
|
|
|
|
/* This is set to the new comment if given on the command line. */
|
|
|
|
char *identity_comment = NULL;
|
|
|
|
|
2000-04-29 13:57:08 +00:00
|
|
|
/* Dump public key file in format used by real and the original SSH 2 */
|
|
|
|
int convert_to_ssh2 = 0;
|
|
|
|
int convert_from_ssh2 = 0;
|
|
|
|
int print_public = 0;
|
|
|
|
int dsa_mode = 0;
|
|
|
|
|
1999-11-21 07:31:57 +00:00
|
|
|
/* argv0 */
|
1999-11-24 13:26:21 +00:00
|
|
|
#ifdef HAVE___PROGNAME
|
1999-11-21 07:31:57 +00:00
|
|
|
extern char *__progname;
|
1999-11-24 13:26:21 +00:00
|
|
|
#else /* HAVE___PROGNAME */
|
2000-05-01 10:59:50 +00:00
|
|
|
static const char *__progname = "ssh-keygen";
|
1999-11-24 13:26:21 +00:00
|
|
|
#endif /* HAVE___PROGNAME */
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-04-29 13:57:08 +00:00
|
|
|
char hostname[MAXHOSTNAMELEN];
|
|
|
|
|
1999-11-21 07:31:57 +00:00
|
|
|
void
|
|
|
|
ask_filename(struct passwd *pw, const char *prompt)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
char buf[1024];
|
|
|
|
snprintf(identity_file, sizeof(identity_file), "%s/%s",
|
- Remove references to SSLeay.
- Big OpenBSD CVS update
- markus@cvs.openbsd.org
[clientloop.c]
- typo
[session.c]
- update proctitle on pty alloc/dealloc, e.g. w/ windows client
[session.c]
- update proctitle for proto 1, too
[channels.h nchan.c serverloop.c session.c sshd.c]
- use c-style comments
- deraadt@cvs.openbsd.org
[scp.c]
- more atomicio
- markus@cvs.openbsd.org
[channels.c]
- set O_NONBLOCK
[ssh.1]
- update AUTHOR
[readconf.c ssh-keygen.c ssh.h]
- default DSA key file ~/.ssh/id_dsa
[clientloop.c]
- typo, rm verbose debug
- deraadt@cvs.openbsd.org
[ssh-keygen.1]
- document DSA use of ssh-keygen
[sshd.8]
- a start at describing what i understand of the DSA side
[ssh-keygen.1]
- document -X and -x
[ssh-keygen.c]
- simplify usage
- markus@cvs.openbsd.org
[sshd.8]
- there is no rhosts_dsa
[ssh-keygen.1]
- document -y, update -X,-x
[nchan.c]
- fix close for non-open ssh1 channels
[servconf.c servconf.h ssh.h sshd.8 sshd.c ]
- s/DsaKey/HostDSAKey/, document option
[sshconnect2.c]
- respect number_of_password_prompts
[channels.c channels.h servconf.c servconf.h session.c sshd.8]
- GatewayPorts for sshd, ok deraadt@
[ssh-add.1 ssh-agent.1 ssh.1]
- more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
[ssh.1]
- more info on proto 2
[sshd.8]
- sync AUTHOR w/ ssh.1
[key.c key.h sshconnect.c]
- print key type when talking about host keys
[packet.c]
- clear padding in ssh2
[dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
- replace broken uuencode w/ libc b64_ntop
[auth2.c]
- log failure before sending the reply
[key.c radix.c uuencode.c]
- remote trailing comments before calling __b64_pton
[auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
[sshconnect2.c sshd.8]
- add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
- Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
2000-05-07 02:03:14 +00:00
|
|
|
pw->pw_dir,
|
|
|
|
dsa_mode ? SSH_CLIENT_ID_DSA: SSH_CLIENT_IDENTITY);
|
1999-11-24 13:26:21 +00:00
|
|
|
printf("%s (%s): ", prompt, identity_file);
|
|
|
|
fflush(stdout);
|
|
|
|
if (fgets(buf, sizeof(buf), stdin) == NULL)
|
|
|
|
exit(1);
|
|
|
|
if (strchr(buf, '\n'))
|
|
|
|
*strchr(buf, '\n') = 0;
|
|
|
|
if (strcmp(buf, "") != 0)
|
|
|
|
strlcpy(identity_file, buf, sizeof(identity_file));
|
|
|
|
have_identity = 1;
|
1999-11-17 06:29:08 +00:00
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-04-29 13:57:08 +00:00
|
|
|
int
|
|
|
|
try_load_key(char *filename, Key *k)
|
|
|
|
{
|
|
|
|
int success = 1;
|
|
|
|
if (!load_private_key(filename, "", k, NULL)) {
|
|
|
|
char *pass = read_passphrase("Enter passphrase: ", 1);
|
|
|
|
if (!load_private_key(filename, pass, k, NULL)) {
|
|
|
|
success = 0;
|
|
|
|
}
|
|
|
|
memset(pass, 0, strlen(pass));
|
|
|
|
xfree(pass);
|
|
|
|
}
|
|
|
|
return success;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define SSH_COM_MAGIC_BEGIN "---- BEGIN SSH2 PUBLIC KEY ----"
|
|
|
|
#define SSH_COM_MAGIC_END "---- END SSH2 PUBLIC KEY ----"
|
|
|
|
|
|
|
|
void
|
|
|
|
do_convert_to_ssh2(struct passwd *pw)
|
|
|
|
{
|
|
|
|
Key *k;
|
|
|
|
int len;
|
|
|
|
unsigned char *blob;
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
if (!have_identity)
|
|
|
|
ask_filename(pw, "Enter file in which the key is");
|
|
|
|
if (stat(identity_file, &st) < 0) {
|
|
|
|
perror(identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
k = key_new(KEY_DSA);
|
|
|
|
if (!try_load_key(identity_file, k)) {
|
|
|
|
fprintf(stderr, "load failed\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
dsa_make_key_blob(k, &blob, &len);
|
|
|
|
fprintf(stdout, SSH_COM_MAGIC_BEGIN "\n");
|
|
|
|
fprintf(stdout,
|
|
|
|
"Comment: \"%d-bit DSA, converted from openssh by %s@%s\"\n",
|
|
|
|
BN_num_bits(k->dsa->p),
|
|
|
|
pw->pw_name, hostname);
|
|
|
|
dump_base64(stdout, blob, len);
|
|
|
|
fprintf(stdout, SSH_COM_MAGIC_END "\n");
|
|
|
|
key_free(k);
|
|
|
|
xfree(blob);
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
do_convert_from_ssh2(struct passwd *pw)
|
|
|
|
{
|
|
|
|
Key *k;
|
|
|
|
int blen;
|
|
|
|
char line[1024], *p;
|
|
|
|
char blob[8096];
|
|
|
|
char encoded[8096];
|
|
|
|
struct stat st;
|
2000-05-09 01:02:59 +00:00
|
|
|
int escaped = 0;
|
2000-04-29 13:57:08 +00:00
|
|
|
FILE *fp;
|
|
|
|
|
|
|
|
if (!have_identity)
|
|
|
|
ask_filename(pw, "Enter file in which the key is");
|
|
|
|
if (stat(identity_file, &st) < 0) {
|
|
|
|
perror(identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
fp = fopen(identity_file, "r");
|
|
|
|
if (fp == NULL) {
|
|
|
|
perror(identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
encoded[0] = '\0';
|
|
|
|
while (fgets(line, sizeof(line), fp)) {
|
2000-05-09 01:02:59 +00:00
|
|
|
if (!(p = strchr(line, '\n'))) {
|
|
|
|
fprintf(stderr, "input line too long.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (p > line && p[-1] == '\\')
|
|
|
|
escaped++;
|
2000-04-29 13:57:08 +00:00
|
|
|
if (strncmp(line, "----", 4) == 0 ||
|
|
|
|
strstr(line, ": ") != NULL) {
|
|
|
|
fprintf(stderr, "ignore: %s", line);
|
|
|
|
continue;
|
|
|
|
}
|
2000-05-09 01:02:59 +00:00
|
|
|
if (escaped) {
|
|
|
|
escaped--;
|
|
|
|
fprintf(stderr, "escaped: %s", line);
|
|
|
|
continue;
|
2000-04-29 13:57:08 +00:00
|
|
|
}
|
|
|
|
*p = '\0';
|
|
|
|
strlcat(encoded, line, sizeof(encoded));
|
|
|
|
}
|
|
|
|
blen = uudecode(encoded, (unsigned char *)blob, sizeof(blob));
|
|
|
|
if (blen < 0) {
|
|
|
|
fprintf(stderr, "uudecode failed.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
k = dsa_key_from_blob(blob, blen);
|
|
|
|
if (!key_write(k, stdout))
|
|
|
|
fprintf(stderr, "key_write failed");
|
|
|
|
key_free(k);
|
|
|
|
fprintf(stdout, "\n");
|
|
|
|
fclose(fp);
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
do_print_public(struct passwd *pw)
|
|
|
|
{
|
|
|
|
Key *k;
|
|
|
|
int len;
|
|
|
|
unsigned char *blob;
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
if (!have_identity)
|
|
|
|
ask_filename(pw, "Enter file in which the key is");
|
|
|
|
if (stat(identity_file, &st) < 0) {
|
|
|
|
perror(identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
k = key_new(KEY_DSA);
|
|
|
|
if (!try_load_key(identity_file, k)) {
|
|
|
|
fprintf(stderr, "load failed\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
dsa_make_key_blob(k, &blob, &len);
|
|
|
|
if (!key_write(k, stdout))
|
|
|
|
fprintf(stderr, "key_write failed");
|
|
|
|
key_free(k);
|
|
|
|
xfree(blob);
|
|
|
|
fprintf(stdout, "\n");
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
1999-11-17 06:29:08 +00:00
|
|
|
void
|
|
|
|
do_fingerprint(struct passwd *pw)
|
|
|
|
{
|
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c]
- int atomicio -> ssize_t (for alpha). ok deraadt@
[auth-rsa.c]
- delay MD5 computation until client sends response, free() early, cleanup.
[cipher.c]
- void* -> unsigned char*, ok niels@
[hostfile.c]
- remove unused variable 'len'. fix comments.
- remove unused variable
[log-client.c log-server.c]
- rename a cpp symbol, to avoid param.h collision
[packet.c]
- missing xfree()
- getsockname() requires initialized tolen; andy@guildsoftware.com
- use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
from Holger.Trapp@Informatik.TU-Chemnitz.DE
[pty.c pty.h]
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
[readconf.c]
- turn off x11-fwd for the client, too.
[rsa.c]
- PKCS#1 padding
[scp.c]
- allow '.' in usernames; from jedgar@fxp.org
[servconf.c]
- typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
- sync with sshd_config
[ssh-keygen.c]
- enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
[ssh.1]
- Change invalid 'CHAT' loglevel to 'VERBOSE'
[ssh.c]
- suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
- turn off x11-fwd for the client, too.
[sshconnect.c]
- missing xfree()
- retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
- read error vs. "Connection closed by remote host"
[sshd.8]
- ie. -> i.e.,
- do not link to a commercial page..
- sync with sshd_config
[sshd.c]
- no need for poll.h; from bright@wintelcom.net
- log with level log() not fatal() if peer behaves badly.
- don't panic if client behaves strange. ok deraadt@
- make no-port-forwarding for RSA keys deny both -L and -R style fwding
- delay close() of pty until the pty has been chowned back to root
- oops, fix comment, too.
- missing xfree()
- move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
- create x11 cookie file
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
2000-03-09 10:27:49 +00:00
|
|
|
FILE *f;
|
|
|
|
BIGNUM *e, *n;
|
2000-04-29 13:57:08 +00:00
|
|
|
Key *public;
|
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c]
- int atomicio -> ssize_t (for alpha). ok deraadt@
[auth-rsa.c]
- delay MD5 computation until client sends response, free() early, cleanup.
[cipher.c]
- void* -> unsigned char*, ok niels@
[hostfile.c]
- remove unused variable 'len'. fix comments.
- remove unused variable
[log-client.c log-server.c]
- rename a cpp symbol, to avoid param.h collision
[packet.c]
- missing xfree()
- getsockname() requires initialized tolen; andy@guildsoftware.com
- use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
from Holger.Trapp@Informatik.TU-Chemnitz.DE
[pty.c pty.h]
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
[readconf.c]
- turn off x11-fwd for the client, too.
[rsa.c]
- PKCS#1 padding
[scp.c]
- allow '.' in usernames; from jedgar@fxp.org
[servconf.c]
- typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
- sync with sshd_config
[ssh-keygen.c]
- enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
[ssh.1]
- Change invalid 'CHAT' loglevel to 'VERBOSE'
[ssh.c]
- suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
- turn off x11-fwd for the client, too.
[sshconnect.c]
- missing xfree()
- retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
- read error vs. "Connection closed by remote host"
[sshd.8]
- ie. -> i.e.,
- do not link to a commercial page..
- sync with sshd_config
[sshd.c]
- no need for poll.h; from bright@wintelcom.net
- log with level log() not fatal() if peer behaves badly.
- don't panic if client behaves strange. ok deraadt@
- make no-port-forwarding for RSA keys deny both -L and -R style fwding
- delay close() of pty until the pty has been chowned back to root
- oops, fix comment, too.
- missing xfree()
- move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
- create x11 cookie file
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
2000-03-09 10:27:49 +00:00
|
|
|
char *comment = NULL, *cp, *ep, line[16*1024];
|
|
|
|
int i, skip = 0, num = 1, invalid = 1;
|
2000-03-17 12:40:15 +00:00
|
|
|
unsigned int ignore;
|
1999-11-24 13:26:21 +00:00
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
if (!have_identity)
|
|
|
|
ask_filename(pw, "Enter file in which the key is");
|
|
|
|
if (stat(identity_file, &st) < 0) {
|
|
|
|
perror(identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
2000-04-29 13:57:08 +00:00
|
|
|
public = key_new(KEY_RSA);
|
|
|
|
if (load_public_key(identity_file, public, &comment)) {
|
|
|
|
printf("%d %s %s\n", BN_num_bits(public->rsa->n),
|
|
|
|
key_fingerprint(public), comment);
|
|
|
|
key_free(public);
|
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c]
- int atomicio -> ssize_t (for alpha). ok deraadt@
[auth-rsa.c]
- delay MD5 computation until client sends response, free() early, cleanup.
[cipher.c]
- void* -> unsigned char*, ok niels@
[hostfile.c]
- remove unused variable 'len'. fix comments.
- remove unused variable
[log-client.c log-server.c]
- rename a cpp symbol, to avoid param.h collision
[packet.c]
- missing xfree()
- getsockname() requires initialized tolen; andy@guildsoftware.com
- use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
from Holger.Trapp@Informatik.TU-Chemnitz.DE
[pty.c pty.h]
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
[readconf.c]
- turn off x11-fwd for the client, too.
[rsa.c]
- PKCS#1 padding
[scp.c]
- allow '.' in usernames; from jedgar@fxp.org
[servconf.c]
- typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
- sync with sshd_config
[ssh-keygen.c]
- enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
[ssh.1]
- Change invalid 'CHAT' loglevel to 'VERBOSE'
[ssh.c]
- suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
- turn off x11-fwd for the client, too.
[sshconnect.c]
- missing xfree()
- retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
- read error vs. "Connection closed by remote host"
[sshd.8]
- ie. -> i.e.,
- do not link to a commercial page..
- sync with sshd_config
[sshd.c]
- no need for poll.h; from bright@wintelcom.net
- log with level log() not fatal() if peer behaves badly.
- don't panic if client behaves strange. ok deraadt@
- make no-port-forwarding for RSA keys deny both -L and -R style fwding
- delay close() of pty until the pty has been chowned back to root
- oops, fix comment, too.
- missing xfree()
- move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
- create x11 cookie file
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
2000-03-09 10:27:49 +00:00
|
|
|
exit(0);
|
|
|
|
}
|
2000-04-29 13:57:08 +00:00
|
|
|
key_free(public);
|
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c]
- int atomicio -> ssize_t (for alpha). ok deraadt@
[auth-rsa.c]
- delay MD5 computation until client sends response, free() early, cleanup.
[cipher.c]
- void* -> unsigned char*, ok niels@
[hostfile.c]
- remove unused variable 'len'. fix comments.
- remove unused variable
[log-client.c log-server.c]
- rename a cpp symbol, to avoid param.h collision
[packet.c]
- missing xfree()
- getsockname() requires initialized tolen; andy@guildsoftware.com
- use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
from Holger.Trapp@Informatik.TU-Chemnitz.DE
[pty.c pty.h]
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
[readconf.c]
- turn off x11-fwd for the client, too.
[rsa.c]
- PKCS#1 padding
[scp.c]
- allow '.' in usernames; from jedgar@fxp.org
[servconf.c]
- typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
- sync with sshd_config
[ssh-keygen.c]
- enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
[ssh.1]
- Change invalid 'CHAT' loglevel to 'VERBOSE'
[ssh.c]
- suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
- turn off x11-fwd for the client, too.
[sshconnect.c]
- missing xfree()
- retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
- read error vs. "Connection closed by remote host"
[sshd.8]
- ie. -> i.e.,
- do not link to a commercial page..
- sync with sshd_config
[sshd.c]
- no need for poll.h; from bright@wintelcom.net
- log with level log() not fatal() if peer behaves badly.
- don't panic if client behaves strange. ok deraadt@
- make no-port-forwarding for RSA keys deny both -L and -R style fwding
- delay close() of pty until the pty has been chowned back to root
- oops, fix comment, too.
- missing xfree()
- move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
- create x11 cookie file
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
2000-03-09 10:27:49 +00:00
|
|
|
|
2000-04-29 13:57:08 +00:00
|
|
|
/* XXX */
|
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c]
- int atomicio -> ssize_t (for alpha). ok deraadt@
[auth-rsa.c]
- delay MD5 computation until client sends response, free() early, cleanup.
[cipher.c]
- void* -> unsigned char*, ok niels@
[hostfile.c]
- remove unused variable 'len'. fix comments.
- remove unused variable
[log-client.c log-server.c]
- rename a cpp symbol, to avoid param.h collision
[packet.c]
- missing xfree()
- getsockname() requires initialized tolen; andy@guildsoftware.com
- use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
from Holger.Trapp@Informatik.TU-Chemnitz.DE
[pty.c pty.h]
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
[readconf.c]
- turn off x11-fwd for the client, too.
[rsa.c]
- PKCS#1 padding
[scp.c]
- allow '.' in usernames; from jedgar@fxp.org
[servconf.c]
- typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
- sync with sshd_config
[ssh-keygen.c]
- enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
[ssh.1]
- Change invalid 'CHAT' loglevel to 'VERBOSE'
[ssh.c]
- suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
- turn off x11-fwd for the client, too.
[sshconnect.c]
- missing xfree()
- retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
- read error vs. "Connection closed by remote host"
[sshd.8]
- ie. -> i.e.,
- do not link to a commercial page..
- sync with sshd_config
[sshd.c]
- no need for poll.h; from bright@wintelcom.net
- log with level log() not fatal() if peer behaves badly.
- don't panic if client behaves strange. ok deraadt@
- make no-port-forwarding for RSA keys deny both -L and -R style fwding
- delay close() of pty until the pty has been chowned back to root
- oops, fix comment, too.
- missing xfree()
- move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
- create x11 cookie file
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
2000-03-09 10:27:49 +00:00
|
|
|
f = fopen(identity_file, "r");
|
|
|
|
if (f != NULL) {
|
1999-11-24 13:26:21 +00:00
|
|
|
n = BN_new();
|
|
|
|
e = BN_new();
|
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c]
- int atomicio -> ssize_t (for alpha). ok deraadt@
[auth-rsa.c]
- delay MD5 computation until client sends response, free() early, cleanup.
[cipher.c]
- void* -> unsigned char*, ok niels@
[hostfile.c]
- remove unused variable 'len'. fix comments.
- remove unused variable
[log-client.c log-server.c]
- rename a cpp symbol, to avoid param.h collision
[packet.c]
- missing xfree()
- getsockname() requires initialized tolen; andy@guildsoftware.com
- use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
from Holger.Trapp@Informatik.TU-Chemnitz.DE
[pty.c pty.h]
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
[readconf.c]
- turn off x11-fwd for the client, too.
[rsa.c]
- PKCS#1 padding
[scp.c]
- allow '.' in usernames; from jedgar@fxp.org
[servconf.c]
- typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
- sync with sshd_config
[ssh-keygen.c]
- enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
[ssh.1]
- Change invalid 'CHAT' loglevel to 'VERBOSE'
[ssh.c]
- suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
- turn off x11-fwd for the client, too.
[sshconnect.c]
- missing xfree()
- retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
- read error vs. "Connection closed by remote host"
[sshd.8]
- ie. -> i.e.,
- do not link to a commercial page..
- sync with sshd_config
[sshd.c]
- no need for poll.h; from bright@wintelcom.net
- log with level log() not fatal() if peer behaves badly.
- don't panic if client behaves strange. ok deraadt@
- make no-port-forwarding for RSA keys deny both -L and -R style fwding
- delay close() of pty until the pty has been chowned back to root
- oops, fix comment, too.
- missing xfree()
- move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
- create x11 cookie file
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
2000-03-09 10:27:49 +00:00
|
|
|
while (fgets(line, sizeof(line), f)) {
|
|
|
|
i = strlen(line) - 1;
|
|
|
|
if (line[i] != '\n') {
|
|
|
|
error("line %d too long: %.40s...", num, line);
|
|
|
|
skip = 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
num++;
|
|
|
|
if (skip) {
|
|
|
|
skip = 0;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
line[i] = '\0';
|
|
|
|
|
|
|
|
/* Skip leading whitespace, empty and comment lines. */
|
|
|
|
for (cp = line; *cp == ' ' || *cp == '\t'; cp++)
|
|
|
|
;
|
|
|
|
if (!*cp || *cp == '\n' || *cp == '#')
|
|
|
|
continue ;
|
|
|
|
i = strtol(cp, &ep, 10);
|
|
|
|
if (i == 0 || ep == NULL || (*ep != ' ' && *ep != '\t')) {
|
|
|
|
int quoted = 0;
|
|
|
|
comment = cp;
|
|
|
|
for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) {
|
|
|
|
if (*cp == '\\' && cp[1] == '"')
|
|
|
|
cp++; /* Skip both */
|
|
|
|
else if (*cp == '"')
|
|
|
|
quoted = !quoted;
|
|
|
|
}
|
|
|
|
if (!*cp)
|
|
|
|
continue;
|
|
|
|
*cp++ = '\0';
|
|
|
|
}
|
|
|
|
ep = cp;
|
2000-03-17 12:40:15 +00:00
|
|
|
if (auth_rsa_read_key(&cp, &ignore, e, n)) {
|
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c]
- int atomicio -> ssize_t (for alpha). ok deraadt@
[auth-rsa.c]
- delay MD5 computation until client sends response, free() early, cleanup.
[cipher.c]
- void* -> unsigned char*, ok niels@
[hostfile.c]
- remove unused variable 'len'. fix comments.
- remove unused variable
[log-client.c log-server.c]
- rename a cpp symbol, to avoid param.h collision
[packet.c]
- missing xfree()
- getsockname() requires initialized tolen; andy@guildsoftware.com
- use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
from Holger.Trapp@Informatik.TU-Chemnitz.DE
[pty.c pty.h]
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
[readconf.c]
- turn off x11-fwd for the client, too.
[rsa.c]
- PKCS#1 padding
[scp.c]
- allow '.' in usernames; from jedgar@fxp.org
[servconf.c]
- typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
- sync with sshd_config
[ssh-keygen.c]
- enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
[ssh.1]
- Change invalid 'CHAT' loglevel to 'VERBOSE'
[ssh.c]
- suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
- turn off x11-fwd for the client, too.
[sshconnect.c]
- missing xfree()
- retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
- read error vs. "Connection closed by remote host"
[sshd.8]
- ie. -> i.e.,
- do not link to a commercial page..
- sync with sshd_config
[sshd.c]
- no need for poll.h; from bright@wintelcom.net
- log with level log() not fatal() if peer behaves badly.
- don't panic if client behaves strange. ok deraadt@
- make no-port-forwarding for RSA keys deny both -L and -R style fwding
- delay close() of pty until the pty has been chowned back to root
- oops, fix comment, too.
- missing xfree()
- move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
- create x11 cookie file
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
2000-03-09 10:27:49 +00:00
|
|
|
invalid = 0;
|
|
|
|
comment = *cp ? cp : comment;
|
|
|
|
printf("%d %s %s\n", BN_num_bits(n),
|
|
|
|
fingerprint(e, n),
|
|
|
|
comment ? comment : "no comment");
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
|
|
|
}
|
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c]
- int atomicio -> ssize_t (for alpha). ok deraadt@
[auth-rsa.c]
- delay MD5 computation until client sends response, free() early, cleanup.
[cipher.c]
- void* -> unsigned char*, ok niels@
[hostfile.c]
- remove unused variable 'len'. fix comments.
- remove unused variable
[log-client.c log-server.c]
- rename a cpp symbol, to avoid param.h collision
[packet.c]
- missing xfree()
- getsockname() requires initialized tolen; andy@guildsoftware.com
- use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
from Holger.Trapp@Informatik.TU-Chemnitz.DE
[pty.c pty.h]
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
[readconf.c]
- turn off x11-fwd for the client, too.
[rsa.c]
- PKCS#1 padding
[scp.c]
- allow '.' in usernames; from jedgar@fxp.org
[servconf.c]
- typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
- sync with sshd_config
[ssh-keygen.c]
- enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
[ssh.1]
- Change invalid 'CHAT' loglevel to 'VERBOSE'
[ssh.c]
- suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
- turn off x11-fwd for the client, too.
[sshconnect.c]
- missing xfree()
- retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
- read error vs. "Connection closed by remote host"
[sshd.8]
- ie. -> i.e.,
- do not link to a commercial page..
- sync with sshd_config
[sshd.c]
- no need for poll.h; from bright@wintelcom.net
- log with level log() not fatal() if peer behaves badly.
- don't panic if client behaves strange. ok deraadt@
- make no-port-forwarding for RSA keys deny both -L and -R style fwding
- delay close() of pty until the pty has been chowned back to root
- oops, fix comment, too.
- missing xfree()
- move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
- create x11 cookie file
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
2000-03-09 10:27:49 +00:00
|
|
|
BN_free(e);
|
|
|
|
BN_free(n);
|
|
|
|
fclose(f);
|
|
|
|
}
|
|
|
|
if (invalid) {
|
|
|
|
printf("%s is not a valid key file.\n", identity_file);
|
|
|
|
exit(1);
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
|
|
|
exit(0);
|
1999-11-17 06:29:08 +00:00
|
|
|
}
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/*
|
|
|
|
* Perform changing a passphrase. The argument is the passwd structure
|
|
|
|
* for the current user.
|
|
|
|
*/
|
1999-11-17 06:29:08 +00:00
|
|
|
void
|
|
|
|
do_change_passphrase(struct passwd *pw)
|
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
char *comment;
|
|
|
|
char *old_passphrase, *passphrase1, *passphrase2;
|
|
|
|
struct stat st;
|
2000-04-29 13:57:08 +00:00
|
|
|
Key *private;
|
|
|
|
Key *public;
|
|
|
|
int type = dsa_mode ? KEY_DSA : KEY_RSA;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
if (!have_identity)
|
|
|
|
ask_filename(pw, "Enter file in which the key is");
|
|
|
|
if (stat(identity_file, &st) < 0) {
|
|
|
|
perror(identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
2000-04-29 13:57:08 +00:00
|
|
|
|
|
|
|
if (type == KEY_RSA) {
|
|
|
|
/* XXX this works currently only for RSA */
|
|
|
|
public = key_new(type);
|
|
|
|
if (!load_public_key(identity_file, public, NULL)) {
|
|
|
|
printf("%s is not a valid key file.\n", identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
/* Clear the public key since we are just about to load the whole file. */
|
|
|
|
key_free(public);
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Try to load the file with empty passphrase. */
|
2000-04-29 13:57:08 +00:00
|
|
|
private = key_new(type);
|
|
|
|
if (!load_private_key(identity_file, "", private, &comment)) {
|
1999-11-24 13:26:21 +00:00
|
|
|
if (identity_passphrase)
|
|
|
|
old_passphrase = xstrdup(identity_passphrase);
|
|
|
|
else
|
|
|
|
old_passphrase = read_passphrase("Enter old passphrase: ", 1);
|
2000-04-29 13:57:08 +00:00
|
|
|
if (!load_private_key(identity_file, old_passphrase, private, &comment)) {
|
1999-11-24 13:26:21 +00:00
|
|
|
memset(old_passphrase, 0, strlen(old_passphrase));
|
|
|
|
xfree(old_passphrase);
|
|
|
|
printf("Bad passphrase.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
memset(old_passphrase, 0, strlen(old_passphrase));
|
|
|
|
xfree(old_passphrase);
|
|
|
|
}
|
|
|
|
printf("Key has comment '%s'\n", comment);
|
|
|
|
|
|
|
|
/* Ask the new passphrase (twice). */
|
|
|
|
if (identity_new_passphrase) {
|
|
|
|
passphrase1 = xstrdup(identity_new_passphrase);
|
|
|
|
passphrase2 = NULL;
|
|
|
|
} else {
|
|
|
|
passphrase1 =
|
|
|
|
read_passphrase("Enter new passphrase (empty for no passphrase): ", 1);
|
|
|
|
passphrase2 = read_passphrase("Enter same passphrase again: ", 1);
|
|
|
|
|
|
|
|
/* Verify that they are the same. */
|
|
|
|
if (strcmp(passphrase1, passphrase2) != 0) {
|
|
|
|
memset(passphrase1, 0, strlen(passphrase1));
|
|
|
|
memset(passphrase2, 0, strlen(passphrase2));
|
|
|
|
xfree(passphrase1);
|
|
|
|
xfree(passphrase2);
|
|
|
|
printf("Pass phrases do not match. Try again.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
/* Destroy the other copy. */
|
|
|
|
memset(passphrase2, 0, strlen(passphrase2));
|
|
|
|
xfree(passphrase2);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/* Save the file using the new passphrase. */
|
2000-04-29 13:57:08 +00:00
|
|
|
if (!save_private_key(identity_file, passphrase1, private, comment)) {
|
1999-11-24 13:26:21 +00:00
|
|
|
printf("Saving the key failed: %s: %s.\n",
|
|
|
|
identity_file, strerror(errno));
|
|
|
|
memset(passphrase1, 0, strlen(passphrase1));
|
|
|
|
xfree(passphrase1);
|
2000-04-29 13:57:08 +00:00
|
|
|
key_free(private);
|
1999-11-24 13:26:21 +00:00
|
|
|
xfree(comment);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
/* Destroy the passphrase and the copy of the key in memory. */
|
|
|
|
memset(passphrase1, 0, strlen(passphrase1));
|
|
|
|
xfree(passphrase1);
|
2000-04-29 13:57:08 +00:00
|
|
|
key_free(private); /* Destroys contents */
|
1999-11-24 13:26:21 +00:00
|
|
|
xfree(comment);
|
|
|
|
|
|
|
|
printf("Your identification has been saved with the new passphrase.\n");
|
|
|
|
exit(0);
|
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/*
|
|
|
|
* Change the comment of a private key file.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
void
|
|
|
|
do_change_comment(struct passwd *pw)
|
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
char new_comment[1024], *comment;
|
2000-04-29 13:57:08 +00:00
|
|
|
Key *private;
|
|
|
|
Key *public;
|
1999-11-24 13:26:21 +00:00
|
|
|
char *passphrase;
|
|
|
|
struct stat st;
|
|
|
|
FILE *f;
|
|
|
|
|
|
|
|
if (!have_identity)
|
|
|
|
ask_filename(pw, "Enter file in which the key is");
|
|
|
|
if (stat(identity_file, &st) < 0) {
|
|
|
|
perror(identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Try to load the public key from the file the verify that it is
|
|
|
|
* readable and of the proper format.
|
|
|
|
*/
|
2000-04-29 13:57:08 +00:00
|
|
|
public = key_new(KEY_RSA);
|
|
|
|
if (!load_public_key(identity_file, public, NULL)) {
|
1999-11-24 13:26:21 +00:00
|
|
|
printf("%s is not a valid key file.\n", identity_file);
|
|
|
|
exit(1);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
1999-11-25 00:54:57 +00:00
|
|
|
|
2000-04-29 13:57:08 +00:00
|
|
|
private = key_new(KEY_RSA);
|
|
|
|
if (load_private_key(identity_file, "", private, &comment))
|
1999-11-24 13:26:21 +00:00
|
|
|
passphrase = xstrdup("");
|
|
|
|
else {
|
|
|
|
if (identity_passphrase)
|
|
|
|
passphrase = xstrdup(identity_passphrase);
|
|
|
|
else if (identity_new_passphrase)
|
|
|
|
passphrase = xstrdup(identity_new_passphrase);
|
|
|
|
else
|
|
|
|
passphrase = read_passphrase("Enter passphrase: ", 1);
|
|
|
|
/* Try to load using the passphrase. */
|
2000-04-29 13:57:08 +00:00
|
|
|
if (!load_private_key(identity_file, passphrase, private, &comment)) {
|
1999-11-24 13:26:21 +00:00
|
|
|
memset(passphrase, 0, strlen(passphrase));
|
|
|
|
xfree(passphrase);
|
|
|
|
printf("Bad passphrase.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
printf("Key now has comment '%s'\n", comment);
|
|
|
|
|
|
|
|
if (identity_comment) {
|
|
|
|
strlcpy(new_comment, identity_comment, sizeof(new_comment));
|
|
|
|
} else {
|
|
|
|
printf("Enter new comment: ");
|
|
|
|
fflush(stdout);
|
|
|
|
if (!fgets(new_comment, sizeof(new_comment), stdin)) {
|
|
|
|
memset(passphrase, 0, strlen(passphrase));
|
2000-04-29 13:57:08 +00:00
|
|
|
key_free(private);
|
1999-11-24 13:26:21 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (strchr(new_comment, '\n'))
|
|
|
|
*strchr(new_comment, '\n') = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Save the file using the new passphrase. */
|
2000-04-29 13:57:08 +00:00
|
|
|
if (!save_private_key(identity_file, passphrase, private, new_comment)) {
|
1999-11-24 13:26:21 +00:00
|
|
|
printf("Saving the key failed: %s: %s.\n",
|
|
|
|
identity_file, strerror(errno));
|
|
|
|
memset(passphrase, 0, strlen(passphrase));
|
|
|
|
xfree(passphrase);
|
2000-04-29 13:57:08 +00:00
|
|
|
key_free(private);
|
1999-11-24 13:26:21 +00:00
|
|
|
xfree(comment);
|
|
|
|
exit(1);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
memset(passphrase, 0, strlen(passphrase));
|
|
|
|
xfree(passphrase);
|
2000-04-29 13:57:08 +00:00
|
|
|
key_free(private);
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
strlcat(identity_file, ".pub", sizeof(identity_file));
|
|
|
|
f = fopen(identity_file, "w");
|
|
|
|
if (!f) {
|
|
|
|
printf("Could not save your public key in %s\n", identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
2000-04-29 13:57:08 +00:00
|
|
|
if (!key_write(public, f))
|
|
|
|
fprintf(stderr, "write key failed");
|
|
|
|
key_free(public);
|
|
|
|
fprintf(f, " %s\n", new_comment);
|
1999-11-24 13:26:21 +00:00
|
|
|
fclose(f);
|
|
|
|
|
|
|
|
xfree(comment);
|
|
|
|
|
|
|
|
printf("The comment in your key file has been changed.\n");
|
|
|
|
exit(0);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-21 07:31:57 +00:00
|
|
|
void
|
|
|
|
usage(void)
|
|
|
|
{
|
- Remove references to SSLeay.
- Big OpenBSD CVS update
- markus@cvs.openbsd.org
[clientloop.c]
- typo
[session.c]
- update proctitle on pty alloc/dealloc, e.g. w/ windows client
[session.c]
- update proctitle for proto 1, too
[channels.h nchan.c serverloop.c session.c sshd.c]
- use c-style comments
- deraadt@cvs.openbsd.org
[scp.c]
- more atomicio
- markus@cvs.openbsd.org
[channels.c]
- set O_NONBLOCK
[ssh.1]
- update AUTHOR
[readconf.c ssh-keygen.c ssh.h]
- default DSA key file ~/.ssh/id_dsa
[clientloop.c]
- typo, rm verbose debug
- deraadt@cvs.openbsd.org
[ssh-keygen.1]
- document DSA use of ssh-keygen
[sshd.8]
- a start at describing what i understand of the DSA side
[ssh-keygen.1]
- document -X and -x
[ssh-keygen.c]
- simplify usage
- markus@cvs.openbsd.org
[sshd.8]
- there is no rhosts_dsa
[ssh-keygen.1]
- document -y, update -X,-x
[nchan.c]
- fix close for non-open ssh1 channels
[servconf.c servconf.h ssh.h sshd.8 sshd.c ]
- s/DsaKey/HostDSAKey/, document option
[sshconnect2.c]
- respect number_of_password_prompts
[channels.c channels.h servconf.c servconf.h session.c sshd.8]
- GatewayPorts for sshd, ok deraadt@
[ssh-add.1 ssh-agent.1 ssh.1]
- more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
[ssh.1]
- more info on proto 2
[sshd.8]
- sync AUTHOR w/ ssh.1
[key.c key.h sshconnect.c]
- print key type when talking about host keys
[packet.c]
- clear padding in ssh2
[dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
- replace broken uuencode w/ libc b64_ntop
[auth2.c]
- log failure before sending the reply
[key.c radix.c uuencode.c]
- remote trailing comments before calling __b64_pton
[auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
[sshconnect2.c sshd.8]
- add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
- Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
2000-05-07 02:03:14 +00:00
|
|
|
printf("Usage: %s [-lpqxXydc] [-b bits] [-f file] [-C comment] [-N new-pass] [-P pass]\n", __progname);
|
1999-11-24 13:26:21 +00:00
|
|
|
exit(1);
|
1999-11-21 07:31:57 +00:00
|
|
|
}
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/*
|
|
|
|
* Main program for key management.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
int
|
|
|
|
main(int ac, char **av)
|
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
char dotsshdir[16 * 1024], comment[1024], *passphrase1, *passphrase2;
|
|
|
|
struct passwd *pw;
|
|
|
|
int opt;
|
|
|
|
struct stat st;
|
|
|
|
FILE *f;
|
2000-04-29 13:57:08 +00:00
|
|
|
Key *private;
|
|
|
|
Key *public;
|
1999-11-24 13:26:21 +00:00
|
|
|
extern int optind;
|
|
|
|
extern char *optarg;
|
|
|
|
|
2000-07-09 12:42:32 +00:00
|
|
|
init_rng();
|
|
|
|
|
2000-06-07 09:55:44 +00:00
|
|
|
SSLeay_add_all_algorithms();
|
2000-04-29 13:57:08 +00:00
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/* we need this for the home * directory. */
|
1999-11-24 13:26:21 +00:00
|
|
|
pw = getpwuid(getuid());
|
|
|
|
if (!pw) {
|
|
|
|
printf("You don't exist, go away!\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2000-04-29 13:57:08 +00:00
|
|
|
if (gethostname(hostname, sizeof(hostname)) < 0) {
|
|
|
|
perror("gethostname");
|
|
|
|
exit(1);
|
|
|
|
}
|
1999-11-25 00:54:57 +00:00
|
|
|
|
2000-04-29 13:57:08 +00:00
|
|
|
while ((opt = getopt(ac, av, "dqpclRxXyb:f:P:N:C:")) != EOF) {
|
1999-11-24 13:26:21 +00:00
|
|
|
switch (opt) {
|
|
|
|
case 'b':
|
|
|
|
bits = atoi(optarg);
|
|
|
|
if (bits < 512 || bits > 32768) {
|
|
|
|
printf("Bits has bad value.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'l':
|
|
|
|
print_fingerprint = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'p':
|
|
|
|
change_passphrase = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'c':
|
|
|
|
change_comment = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'f':
|
|
|
|
strlcpy(identity_file, optarg, sizeof(identity_file));
|
|
|
|
have_identity = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'P':
|
|
|
|
identity_passphrase = optarg;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'N':
|
|
|
|
identity_new_passphrase = optarg;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'C':
|
|
|
|
identity_comment = optarg;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'q':
|
|
|
|
quiet = 1;
|
|
|
|
break;
|
|
|
|
|
2000-04-29 13:57:08 +00:00
|
|
|
case 'R':
|
|
|
|
if (rsa_alive() == 0)
|
|
|
|
exit(1);
|
|
|
|
else
|
|
|
|
exit(0);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'x':
|
|
|
|
convert_to_ssh2 = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'X':
|
|
|
|
convert_from_ssh2 = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'y':
|
|
|
|
print_public = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'd':
|
|
|
|
dsa_mode = 1;
|
|
|
|
break;
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
case '?':
|
|
|
|
default:
|
|
|
|
usage();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (optind < ac) {
|
|
|
|
printf("Too many arguments.\n");
|
|
|
|
usage();
|
|
|
|
}
|
|
|
|
if (change_passphrase && change_comment) {
|
|
|
|
printf("Can only have one of -p and -c.\n");
|
|
|
|
usage();
|
|
|
|
}
|
2000-04-29 13:57:08 +00:00
|
|
|
/* check if RSA support is needed and exists */
|
|
|
|
if (dsa_mode == 0 && rsa_alive() == 0) {
|
|
|
|
fprintf(stderr,
|
|
|
|
"%s: no RSA support in libssl and libcrypto. See ssl(8).\n",
|
|
|
|
__progname);
|
|
|
|
exit(1);
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
if (print_fingerprint)
|
|
|
|
do_fingerprint(pw);
|
|
|
|
if (change_passphrase)
|
|
|
|
do_change_passphrase(pw);
|
|
|
|
if (change_comment)
|
|
|
|
do_change_comment(pw);
|
2000-04-29 13:57:08 +00:00
|
|
|
if (convert_to_ssh2)
|
|
|
|
do_convert_to_ssh2(pw);
|
|
|
|
if (convert_from_ssh2)
|
|
|
|
do_convert_from_ssh2(pw);
|
|
|
|
if (print_public)
|
|
|
|
do_print_public(pw);
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
arc4random_stir();
|
|
|
|
|
2000-04-29 13:57:08 +00:00
|
|
|
if (dsa_mode != 0) {
|
|
|
|
if (!quiet)
|
|
|
|
printf("Generating DSA parameter and key.\n");
|
|
|
|
public = private = dsa_generate_key(bits);
|
|
|
|
if (private == NULL) {
|
|
|
|
fprintf(stderr, "dsa_generate_keys failed");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (quiet)
|
|
|
|
rsa_set_verbose(0);
|
|
|
|
/* Generate the rsa key pair. */
|
|
|
|
public = key_new(KEY_RSA);
|
|
|
|
private = key_new(KEY_RSA);
|
|
|
|
rsa_generate_key(private->rsa, public->rsa, bits);
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
if (!have_identity)
|
|
|
|
ask_filename(pw, "Enter file in which to save the key");
|
|
|
|
|
|
|
|
/* Create ~/.ssh directory if it doesn\'t already exist. */
|
|
|
|
snprintf(dotsshdir, sizeof dotsshdir, "%s/%s", pw->pw_dir, SSH_USER_DIR);
|
|
|
|
if (strstr(identity_file, dotsshdir) != NULL &&
|
|
|
|
stat(dotsshdir, &st) < 0) {
|
|
|
|
if (mkdir(dotsshdir, 0755) < 0)
|
|
|
|
error("Could not create directory '%s'.", dotsshdir);
|
|
|
|
else if (!quiet)
|
|
|
|
printf("Created directory '%s'.\n", dotsshdir);
|
|
|
|
}
|
|
|
|
/* If the file already exists, ask the user to confirm. */
|
|
|
|
if (stat(identity_file, &st) >= 0) {
|
|
|
|
char yesno[3];
|
|
|
|
printf("%s already exists.\n", identity_file);
|
|
|
|
printf("Overwrite (y/n)? ");
|
|
|
|
fflush(stdout);
|
|
|
|
if (fgets(yesno, sizeof(yesno), stdin) == NULL)
|
|
|
|
exit(1);
|
|
|
|
if (yesno[0] != 'y' && yesno[0] != 'Y')
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
/* Ask for a passphrase (twice). */
|
|
|
|
if (identity_passphrase)
|
|
|
|
passphrase1 = xstrdup(identity_passphrase);
|
|
|
|
else if (identity_new_passphrase)
|
|
|
|
passphrase1 = xstrdup(identity_new_passphrase);
|
|
|
|
else {
|
|
|
|
passphrase_again:
|
|
|
|
passphrase1 =
|
|
|
|
read_passphrase("Enter passphrase (empty for no passphrase): ", 1);
|
|
|
|
passphrase2 = read_passphrase("Enter same passphrase again: ", 1);
|
|
|
|
if (strcmp(passphrase1, passphrase2) != 0) {
|
|
|
|
/* The passphrases do not match. Clear them and retry. */
|
|
|
|
memset(passphrase1, 0, strlen(passphrase1));
|
|
|
|
memset(passphrase2, 0, strlen(passphrase2));
|
|
|
|
xfree(passphrase1);
|
|
|
|
xfree(passphrase2);
|
|
|
|
printf("Passphrases do not match. Try again.\n");
|
|
|
|
goto passphrase_again;
|
|
|
|
}
|
|
|
|
/* Clear the other copy of the passphrase. */
|
|
|
|
memset(passphrase2, 0, strlen(passphrase2));
|
|
|
|
xfree(passphrase2);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (identity_comment) {
|
|
|
|
strlcpy(comment, identity_comment, sizeof(comment));
|
|
|
|
} else {
|
2000-04-16 01:18:38 +00:00
|
|
|
/* Create default commend field for the passphrase. */
|
1999-11-24 13:26:21 +00:00
|
|
|
snprintf(comment, sizeof comment, "%s@%s", pw->pw_name, hostname);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Save the key with the given passphrase and comment. */
|
2000-04-29 13:57:08 +00:00
|
|
|
if (!save_private_key(identity_file, passphrase1, private, comment)) {
|
1999-11-24 13:26:21 +00:00
|
|
|
printf("Saving the key failed: %s: %s.\n",
|
2000-04-29 13:57:08 +00:00
|
|
|
identity_file, strerror(errno));
|
1999-11-24 13:26:21 +00:00
|
|
|
memset(passphrase1, 0, strlen(passphrase1));
|
|
|
|
xfree(passphrase1);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
/* Clear the passphrase. */
|
|
|
|
memset(passphrase1, 0, strlen(passphrase1));
|
|
|
|
xfree(passphrase1);
|
|
|
|
|
|
|
|
/* Clear the private key and the random number generator. */
|
2000-04-29 13:57:08 +00:00
|
|
|
if (private != public) {
|
|
|
|
key_free(private);
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
arc4random_stir();
|
|
|
|
|
|
|
|
if (!quiet)
|
|
|
|
printf("Your identification has been saved in %s.\n", identity_file);
|
|
|
|
|
|
|
|
strlcat(identity_file, ".pub", sizeof(identity_file));
|
|
|
|
f = fopen(identity_file, "w");
|
|
|
|
if (!f) {
|
|
|
|
printf("Could not save your public key in %s\n", identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
2000-04-29 13:57:08 +00:00
|
|
|
if (!key_write(public, f))
|
|
|
|
fprintf(stderr, "write key failed");
|
|
|
|
fprintf(f, " %s\n", comment);
|
1999-11-24 13:26:21 +00:00
|
|
|
fclose(f);
|
|
|
|
|
|
|
|
if (!quiet) {
|
2000-04-29 13:57:08 +00:00
|
|
|
printf("Your public key has been saved in %s.\n",
|
|
|
|
identity_file);
|
1999-11-24 13:26:21 +00:00
|
|
|
printf("The key fingerprint is:\n");
|
2000-04-29 13:57:08 +00:00
|
|
|
printf("%s %s\n", key_fingerprint(public), comment);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
2000-04-29 13:57:08 +00:00
|
|
|
|
|
|
|
key_free(public);
|
1999-11-24 13:26:21 +00:00
|
|
|
exit(0);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|