fix build for hfs feature

nazar-pc · Feb 2, 2022 · 8186005 · 8186005
1 parent 3c512ed
commit 8186005
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/builder.rs b/src/builder.rs
@@ -246,7 +246,7 @@ impl<'builder> Builder<'builder> {
                 let kem = resolver.resolve_kem(&kem_choice).ok_or(InitStage::GetKemImpl)?;
                 hs.set_kem(kem);
             } else {
-                return Err(InitStage::GetKemImpl)
+                return Err(InitStage::GetKemImpl.into())
             }
         }
         Ok(())

diff --git a/src/params/mod.rs b/src/params/mod.rs
@@ -118,7 +118,7 @@ impl FromStr for KemChoice {
         use self::KemChoice::*;
         match s {
             "Kyber1024" => Ok(Kyber1024),
-            _ => return Err(PatternProblem::UnsupportedKemType),
+            _ => return Err(PatternProblem::UnsupportedKemType.into()),
         }
     }
 }
@@ -221,7 +221,7 @@ impl FromStr for NoiseParams {
 
         // Validate that a KEM is specified iff the hfs modifier is present
         if p.handshake.is_hfs() != p.kem.is_some() {
-            return Err(PatternProblem::TooFewParameters);
+            return Err(PatternProblem::TooFewParameters.into());
         }
         Ok(p)
     }

diff --git a/src/params/patterns.rs b/src/params/patterns.rs
@@ -510,7 +510,7 @@ impl<'a> TryFrom<&'a HandshakeChoice> for HandshakeTokens {
 /// if `handshake` is invalid because of this. Otherwise it will return `()`.
 fn check_hfs_and_oneway_conflict(handshake: &HandshakeChoice) -> Result<(), Error> {
     if handshake.is_hfs() && handshake.pattern.is_oneway() {
-        return Err(PatternProblem::UnsupportedModifier)
+        return Err(PatternProblem::UnsupportedModifier.into())
     } else {
         Ok(())
     }