diff options
Diffstat (limited to 'auth-rsa.c')
-rw-r--r-- | auth-rsa.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/auth-rsa.c b/auth-rsa.c index 8a02b8a8f..16369d47c 100644 --- a/auth-rsa.c +++ b/auth-rsa.c | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$OpenBSD: auth-rsa.c,v 1.59 2004/05/09 01:19:27 djm Exp $"); | 17 | RCSID("$OpenBSD: auth-rsa.c,v 1.60 2004/06/21 17:36:31 avsm Exp $"); |
18 | 18 | ||
19 | #include <openssl/rsa.h> | 19 | #include <openssl/rsa.h> |
20 | #include <openssl/md5.h> | 20 | #include <openssl/md5.h> |
@@ -203,7 +203,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) | |||
203 | */ | 203 | */ |
204 | while (fgets(line, sizeof(line), f)) { | 204 | while (fgets(line, sizeof(line), f)) { |
205 | char *cp; | 205 | char *cp; |
206 | char *options; | 206 | char *key_options; |
207 | 207 | ||
208 | linenum++; | 208 | linenum++; |
209 | 209 | ||
@@ -221,7 +221,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) | |||
221 | */ | 221 | */ |
222 | if (*cp < '0' || *cp > '9') { | 222 | if (*cp < '0' || *cp > '9') { |
223 | int quoted = 0; | 223 | int quoted = 0; |
224 | options = cp; | 224 | key_options = cp; |
225 | for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) { | 225 | for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) { |
226 | if (*cp == '\\' && cp[1] == '"') | 226 | if (*cp == '\\' && cp[1] == '"') |
227 | cp++; /* Skip both */ | 227 | cp++; /* Skip both */ |
@@ -229,7 +229,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) | |||
229 | quoted = !quoted; | 229 | quoted = !quoted; |
230 | } | 230 | } |
231 | } else | 231 | } else |
232 | options = NULL; | 232 | key_options = NULL; |
233 | 233 | ||
234 | /* Parse the key from the line. */ | 234 | /* Parse the key from the line. */ |
235 | if (hostfile_read_key(&cp, &bits, key) == 0) { | 235 | if (hostfile_read_key(&cp, &bits, key) == 0) { |
@@ -254,7 +254,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) | |||
254 | * If our options do not allow this key to be used, | 254 | * If our options do not allow this key to be used, |
255 | * do not send challenge. | 255 | * do not send challenge. |
256 | */ | 256 | */ |
257 | if (!auth_parse_options(pw, options, file, linenum)) | 257 | if (!auth_parse_options(pw, key_options, file, linenum)) |
258 | continue; | 258 | continue; |
259 | 259 | ||
260 | /* break out, this key is allowed */ | 260 | /* break out, this key is allowed */ |