diff options
author | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
commit | 9b71add4cecf753c45f5fbd6ff0913bc95b3e95d (patch) | |
tree | d4ea8fdb30c7949c6433f5277c39548ea579d4dc /ssh-add.c | |
parent | ed07bcbea56007ab5b218ddf3aa6a7d4e21966e0 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
Merge 4.2p1 to the trunk.
Diffstat (limited to 'ssh-add.c')
-rw-r--r-- | ssh-add.c | 4 |
1 files changed, 2 insertions, 2 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.71 2005/03/10 22:01:06 deraadt 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) { |