| ssh-add.c (215116) | ssh-add.c (221420) |
|---|---|
| 1/* $OpenBSD: ssh-add.c,v 1.96 2010/05/14 00:47:22 djm Exp $ */ | 1/* $OpenBSD: ssh-add.c,v 1.100 2010/08/31 12:33:38 djm Exp $ */ |
| 2/* 3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 5 * All rights reserved 6 * Adds an identity to the authentication server, or removes an identity. 7 * 8 * As far as I am concerned, the code I have written for this software 9 * can be used freely for any purpose. Any derived versions of this --- 55 unchanged lines hidden (view full) --- 65 66/* argv0 */ 67extern char *__progname; 68 69/* Default files to add */ 70static char *default_files[] = { 71 _PATH_SSH_CLIENT_ID_RSA, 72 _PATH_SSH_CLIENT_ID_DSA, | 2/* 3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 5 * All rights reserved 6 * Adds an identity to the authentication server, or removes an identity. 7 * 8 * As far as I am concerned, the code I have written for this software 9 * can be used freely for any purpose. Any derived versions of this --- 55 unchanged lines hidden (view full) --- 65 66/* argv0 */ 67extern char *__progname; 68 69/* Default files to add */ 70static char *default_files[] = { 71 _PATH_SSH_CLIENT_ID_RSA, 72 _PATH_SSH_CLIENT_ID_DSA, |
| 73#ifdef OPENSSL_HAS_ECC 74 _PATH_SSH_CLIENT_ID_ECDSA, 75#endif |
|
| 73 _PATH_SSH_CLIENT_IDENTITY, 74 NULL 75}; 76 77/* Default lifetime (0 == forever) */ 78static int lifetime = 0; 79 80/* User has to confirm key use */ --- 286 unchanged lines hidden (view full) --- 367 368 /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ 369 sanitise_stdfd(); 370 371 __progname = ssh_get_progname(argv[0]); 372 init_rng(); 373 seed_rng(); 374 | 76 _PATH_SSH_CLIENT_IDENTITY, 77 NULL 78}; 79 80/* Default lifetime (0 == forever) */ 81static int lifetime = 0; 82 83/* User has to confirm key use */ --- 286 unchanged lines hidden (view full) --- 370 371 /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ 372 sanitise_stdfd(); 373 374 __progname = ssh_get_progname(argv[0]); 375 init_rng(); 376 seed_rng(); 377 |
| 375 SSLeay_add_all_algorithms(); | 378 OpenSSL_add_all_algorithms(); |
| 376 377 /* At first, get a connection to the authentication agent. */ 378 ac = ssh_get_authentication_connection(); 379 if (ac == NULL) { 380 fprintf(stderr, 381 "Could not open a connection to your authentication agent.\n"); 382 exit(2); 383 } --- 86 unchanged lines hidden --- | 379 380 /* At first, get a connection to the authentication agent. */ 381 ac = ssh_get_authentication_connection(); 382 if (ac == NULL) { 383 fprintf(stderr, 384 "Could not open a connection to your authentication agent.\n"); 385 exit(2); 386 } --- 86 unchanged lines hidden --- |