diff options
author | Damien Miller <djm@mindrot.org> | 2011-10-18 16:06:14 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-10-18 16:06:14 +1100 |
commit | c51a5ab2c6f7ea4ae42e70d1d00bdf57c28f8c36 (patch) | |
tree | 5e8106f528aaa5fb62536c4ccc314dfb6a840cb3 /auth-options.c | |
parent | 91f3eaec886825c42cf6e38d4e2af0f52b5aa35f (diff) |
- djm@cvs.openbsd.org 2011/10/18 04:58:26
[auth-options.c key.c]
remove explict search for \0 in packet strings, this job is now done
implicitly by buffer_get_cstring; ok markus
Diffstat (limited to 'auth-options.c')
-rw-r--r-- | auth-options.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/auth-options.c b/auth-options.c index b3c19c1c0..0e67bd8c0 100644 --- a/auth-options.c +++ b/auth-options.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth-options.c,v 1.55 2011/09/23 00:22:04 dtucker Exp $ */ | 1 | /* $OpenBSD: auth-options.c,v 1.56 2011/10/18 04:58:26 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -452,10 +452,6 @@ parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw, | |||
452 | buffer_append(&data, data_blob, dlen); | 452 | buffer_append(&data, data_blob, dlen); |
453 | debug3("found certificate option \"%.100s\" len %u", | 453 | debug3("found certificate option \"%.100s\" len %u", |
454 | name, dlen); | 454 | name, dlen); |
455 | if (strlen(name) != nlen) { | ||
456 | error("Certificate constraint name contains \\0"); | ||
457 | goto out; | ||
458 | } | ||
459 | found = 0; | 455 | found = 0; |
460 | if ((which & OPTIONS_EXTENSIONS) != 0) { | 456 | if ((which & OPTIONS_EXTENSIONS) != 0) { |
461 | if (strcmp(name, "permit-X11-forwarding") == 0) { | 457 | if (strcmp(name, "permit-X11-forwarding") == 0) { |
@@ -485,11 +481,6 @@ parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw, | |||
485 | "corrupt", name); | 481 | "corrupt", name); |
486 | goto out; | 482 | goto out; |
487 | } | 483 | } |
488 | if (strlen(command) != clen) { | ||
489 | error("force-command constraint " | ||
490 | "contains \\0"); | ||
491 | goto out; | ||
492 | } | ||
493 | if (*cert_forced_command != NULL) { | 484 | if (*cert_forced_command != NULL) { |
494 | error("Certificate has multiple " | 485 | error("Certificate has multiple " |
495 | "force-command options"); | 486 | "force-command options"); |
@@ -506,11 +497,6 @@ parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw, | |||
506 | "\"%s\" corrupt", name); | 497 | "\"%s\" corrupt", name); |
507 | goto out; | 498 | goto out; |
508 | } | 499 | } |
509 | if (strlen(allowed) != clen) { | ||
510 | error("source-address constraint " | ||
511 | "contains \\0"); | ||
512 | goto out; | ||
513 | } | ||
514 | if ((*cert_source_address_done)++) { | 500 | if ((*cert_source_address_done)++) { |
515 | error("Certificate has multiple " | 501 | error("Certificate has multiple " |
516 | "source-address options"); | 502 | "source-address options"); |