[tor-commits] [tor/master] Merge branch 'prop318_limit_protover_035' into prop318_limit_protover_045

[ahf at torproject.org]

commit 4a80dde43c44e619a53547e73283602747cba370
Merge: f02f8f8946 dd63b97288
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 14 11:31:58 2020 -0400

    Merge branch 'prop318_limit_protover_035' into prop318_limit_protover_045

 changes/ticket40133                 |  5 ++
 src/core/or/protover.c              |  4 +-
 src/rust/protover/errors.rs         |  2 +-
 src/rust/protover/protoset.rs       | 20 +++++---
 src/rust/protover/protover.rs       | 10 ++--
 src/rust/protover/tests/protover.rs | 60 +++++++-----------------
 src/test/test_protover.c            | 91 +++++++++----------------------------
 7 files changed, 66 insertions(+), 126 deletions(-)

diff --cc src/rust/protover/protover.rs
index 550732734c,536667f61b..0060864a2e
--- a/src/rust/protover/protover.rs
+++ b/src/rust/protover/protover.rs
@@@ -889,9 -871,14 +889,9 @@@ mod test 
  
      #[test]
      fn test_protoentry_from_str_too_many_versions() {
-         assert_protoentry_is_unparseable!("Desc=1-4294967295");
+         assert_protoentry_is_unparseable!("Desc=1-64");
      }
  
 -    #[test]
 -    fn test_protoentry_from_str_() {
 -        assert_protoentry_is_unparseable!("");
 -    }
 -
      #[test]
      fn test_protoentry_all_supported_single_protocol_single_version() {
          let protocol: UnvalidatedProtoEntry = "Cons=1".parse().unwrap();
diff --cc src/test/test_protover.c
index 4ccec73699,b4689045cf..f129aa7f1c
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@@ -29,10 -22,10 +29,10 @@@ test_protover_parse(void *arg
    tt_skip();
   done:
    ;
 -#else
 +#else /* !defined(HAVE_RUST) */
    char *re_encoded = NULL;
  
-   const char *orig = "Foo=1,3 Bar=3 Baz= Quux=9-12,14,15-16,900";
+   const char *orig = "Foo=1,3 Bar=3 Baz= Quux=9-12,14,15-16";
    smartlist_t *elts = parse_protocol_list(orig);
  
    tt_assert(elts);