Fix Ursa crypto provider crashes on errors

Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
hyperledger · Sep 11, 2019 · 4af3143 · 4af3143
1 parent 435c929
commit 4af3143
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/shared_model/cryptography/ed25519_ursa_impl/crypto_provider.cpp b/shared_model/cryptography/ed25519_ursa_impl/crypto_provider.cpp
@@ -25,7 +25,8 @@ namespace shared_model {
       if (!ursa_ed25519_sign(&kMessage, &kPrivateKey, &signature, &err)) {
         // handle error
         ursa_ed25519_string_free(err.message);
-      };
+        return Signed{""};
+      }
 
       Signed result(std::string((const std::string::value_type *)signature.data,
                                 signature.len));
@@ -67,7 +68,8 @@ namespace shared_model {
       if (!ursa_ed25519_keypair_new(&public_key, &private_key, &err)) {
         // handle error
         ursa_ed25519_string_free(err.message);
-      };
+        return Keypair{PublicKey{""}, PrivateKey{""}};
+      }
 
       Keypair result(PublicKey(std::string(
                          (const std::string::value_type *)public_key.data,
@@ -94,7 +96,8 @@ namespace shared_model {
               &kSeed, &public_key, &private_key, &err)) {
         // handle error
         ursa_ed25519_string_free(err.message);
-      };
+        return Keypair{PublicKey{""}, PrivateKey{""}};
+      }
 
       Keypair result(PublicKey(std::string(
                          (const std::string::value_type *)public_key.data,