diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
commit | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (patch) | |
tree | af8e928bd79d3f2d0219bb5b2c78b573ec31d94c /ssh-add.c | |
parent | 9ad7b718d42e43f3a285fcbc8f91193931fce324 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
import openssh-4.2p1-gsskex-20050926-2.patch
Diffstat (limited to 'ssh-add.c')
-rw-r--r-- | ssh-add.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: ssh-add.c,v 1.70 2004/05/08 00:21:31 djm Exp $"); | 38 | RCSID("$OpenBSD: ssh-add.c,v 1.72 2005/07/17 07:17:55 djm Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | 41 | ||
@@ -145,7 +145,7 @@ add_file(AuthenticationConnection *ac, const char *filename) | |||
145 | /* clear passphrase since it did not work */ | 145 | /* clear passphrase since it did not work */ |
146 | clear_pass(); | 146 | clear_pass(); |
147 | snprintf(msg, sizeof msg, "Enter passphrase for %.200s: ", | 147 | snprintf(msg, sizeof msg, "Enter passphrase for %.200s: ", |
148 | comment); | 148 | comment); |
149 | for (;;) { | 149 | for (;;) { |
150 | pass = read_passphrase(msg, RP_ALLOW_STDIN); | 150 | pass = read_passphrase(msg, RP_ALLOW_STDIN); |
151 | if (strcmp(pass, "") == 0) { | 151 | if (strcmp(pass, "") == 0) { |
@@ -389,7 +389,7 @@ main(int argc, char **argv) | |||
389 | goto done; | 389 | goto done; |
390 | } | 390 | } |
391 | 391 | ||
392 | for(i = 0; default_files[i]; i++) { | 392 | for (i = 0; default_files[i]; i++) { |
393 | snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir, | 393 | snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir, |
394 | default_files[i]); | 394 | default_files[i]); |
395 | if (stat(buf, &st) < 0) | 395 | if (stat(buf, &st) < 0) |
@@ -402,7 +402,7 @@ main(int argc, char **argv) | |||
402 | if (count == 0) | 402 | if (count == 0) |
403 | ret = 1; | 403 | ret = 1; |
404 | } else { | 404 | } else { |
405 | for(i = 0; i < argc; i++) { | 405 | for (i = 0; i < argc; i++) { |
406 | if (do_file(ac, deleting, argv[i]) == -1) | 406 | if (do_file(ac, deleting, argv[i]) == -1) |
407 | ret = 1; | 407 | ret = 1; |
408 | } | 408 | } |