1 files changed, 17 insertions, 12 deletions

diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs
index 06c4dd2398..da87509ffa 100644
--- a/src/rust/protover/protover.rs
+++ b/src/rust/protover/protover.rs
@@ -160,31 +160,31 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr {
         cstr!(
             "Cons=1-2 \
              Desc=1-2 \
-             DirCache=1-2 \
+             DirCache=2 \
              FlowCtrl=1 \
              HSDir=1-2 \
-             HSIntro=3-4 \
+             HSIntro=3-5 \
              HSRend=1-2 \
              Link=1-5 \
              LinkAuth=3 \
              Microdesc=1-2 \
              Padding=2 \
-             Relay=1-2"
+             Relay=1-3"
         )
     } else {
         cstr!(
             "Cons=1-2 \
              Desc=1-2 \
-             DirCache=1-2 \
+             DirCache=2 \
              FlowCtrl=1 \
              HSDir=1-2 \
-             HSIntro=3-4 \
+             HSIntro=3-5 \
              HSRend=1-2 \
              Link=1-5 \
              LinkAuth=1,3 \
              Microdesc=1-2 \
              Padding=2 \
-             Relay=1-2"
+             Relay=1-3"
         )
     }
 }
@@ -253,6 +253,11 @@ impl FromStr for ProtoEntry {
     /// Otherwise, the `Err` value of this `Result` is a `ProtoverError`.
     fn from_str(protocol_entry: &str) -> Result<ProtoEntry, ProtoverError> {
         let mut proto_entry: ProtoEntry = ProtoEntry::default();
+
+        if protocol_entry.is_empty() {
+            return Ok(proto_entry);
+        }
+
         let entries = protocol_entry.split(' ');
 
         for entry in entries {
@@ -501,6 +506,10 @@ impl UnvalidatedProtoEntry {
     ) -> Result<Vec<(&'a str, &'a str)>, ProtoverError> {
         let mut protovers: Vec<(&str, &str)> = Vec::new();
 
+        if protocol_string.is_empty() {
+            return Ok(protovers);
+        }
+
         for subproto in protocol_string.split(' ') {
             let mut parts = subproto.splitn(2, '=');
 
@@ -859,7 +868,8 @@ mod test {
 
     #[test]
     fn test_protoentry_from_str_empty() {
-        assert_protoentry_is_unparseable!("");
+        assert_protoentry_is_parseable!("");
+        assert!(UnvalidatedProtoEntry::from_str("").is_ok());
     }
 
     #[test]
@@ -883,11 +893,6 @@ mod test {
     }
 
     #[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();
         let unsupported: Option<UnvalidatedProtoEntry> = protocol.all_supported();