src/usr.bin/ssh/ssh-add.c - diff

Return to ssh-add.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh-add.c between version 1.72 and 1.72.2.2

version 1.72, 2005/07/17 07:17:55

version 1.72.2.2, 2006/10/06 03:19:33

Line 1

/* $OpenBSD$ */

* Author: Tatu Ylonen <ylo@cs.hut.fi>

Line 34

Line 35

* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#include "includes.h"

#include <sys/types.h>

RCSID("$OpenBSD$");

#include <sys/stat.h>

#include <sys/param.h>

#include <openssl/evp.h>

#include <fcntl.h>

#include <pwd.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <unistd.h>

#include "xmalloc.h"

#include "ssh.h"

#include "rsa.h"

#include "log.h"

#include "xmalloc.h"

#include "key.h"

#include "buffer.h"

#include "authfd.h"

#include "authfile.h"

#include "pathnames.h"

Line 124

Line 134

static int

add_file(AuthenticationConnection *ac, const char *filename)

{

struct stat st;

Key *private;

char *comment = NULL;

char msg[1024];

int ret = -1;

int fd, perms_ok, ret = -1;

if (stat(filename, &st) < 0) {

if ((fd = open(filename, O_RDONLY)) < 0) {

perror(filename);

return -1;

}

* Since we'll try to load a keyfile multiple times, permission errors

* will occur multiple times, so check perms first and bail if wrong.

perms_ok = key_perm_ok(fd, filename);

close(fd);

if (!perms_ok)

return -1;

/* At first, try empty passphrase */

private = key_load_private(filename, "", &comment);

if (comment == NULL)

Line 287

Line 306

static void

usage(void)

{

fprintf(stderr, "Usage: %s [options]\n", __progname);

fprintf(stderr, "Usage: %s [options] [file ...]\n", __progname);

fprintf(stderr, "Options:\n");

fprintf(stderr, " -l List fingerprints of all identities.\n");

fprintf(stderr, " -L List public key parameters of all identities.\n");

Line 312

Line 331

char *sc_reader_id = NULL;

int i, ch, deleting = 0, ret = 0;

/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */

sanitise_stdfd();

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");

fprintf(stderr,

"Could not open a connection to your authentication agent.\n");

exit(2);

}

while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) {

Line 327

Line 350

if (list_identities(ac, ch == 'l' ? 1 : 0) == -1)

ret = 1;

goto done;

break;

case 'x':

case 'X':

if (lock_agent(ac, ch == 'x' ? 1 : 0) == -1)

ret = 1;

goto done;

break;

case 'c':

confirm = 1;

break;

Line 344

Line 365

if (delete_all(ac) == -1)

ret = 1;

goto done;

break;

case 's':

sc_reader_id = optarg;

break;