Fix bcrypt test

3 files changed, 5 insertions, 3 deletions

diff --git a/src/lib/ffi/ffi.h b/src/lib/ffi/ffi.h
index 18a41938b..ce2253725 100644
--- a/src/lib/ffi/ffi.h
+++ b/src/lib/ffi/ffi.h
@@ -269,9 +269,11 @@ BOTAN_DLL int botan_kdf(const char* kdf_algo,
 
 /*
 * Bcrypt
+* *out_len should be 64 bytes
+* Output is formatted bcrypt $2a$...
 */
 BOTAN_DLL int botan_bcrypt_generate(uint8_t* out, size_t* out_len,
-                                    const char* pass,
+                                    const char* password,
                                     botan_rng_t rng,
                                     size_t work_factor,
                                     uint32_t flags);
diff --git a/src/tests/test_ffi.cpp b/src/tests/test_ffi.cpp
index 63f8a5b20..edc06f90a 100644
--- a/src/tests/test_ffi.cpp
+++ b/src/tests/test_ffi.cpp
@@ -193,7 +193,7 @@ TEST_CASE("FFI bcrypt", "[ffi]")
    CHECK_THAT(botan_bcrypt_generate(outbuf.data(), &ol, "password", rng, 10, 0), Equals(0));
    botan_rng_destroy(rng);
 
-   CHECK_THAT(botan_bcrypt_is_valid("wrong", reinterpret_cast<const char*>(outbuf.data())), Equals(1));
+   REQUIRE(botan_bcrypt_is_valid("wrong", reinterpret_cast<const char*>(outbuf.data())) < 0);
    CHECK_THAT(botan_bcrypt_is_valid("password", reinterpret_cast<const char*>(outbuf.data())), Equals(0));
    }
 
diff --git a/src/tests/test_mceliece.cpp b/src/tests/test_mceliece.cpp
index 0ed62b5ea..fc20d93f7 100644
--- a/src/tests/test_mceliece.cpp
+++ b/src/tests/test_mceliece.cpp
@@ -180,7 +180,7 @@ size_t test_mceliece()
       size_t code_length = params__n__t_min_max[i];
       for(size_t t = params__n__t_min_max[i+1]; t <= params__n__t_min_max[i+2]; t++)
          {
-         std::cout << "testing parameters n = " << code_length << ", t = " << t << std::endl;
+         //std::cout << "testing parameters n = " << code_length << ", t = " << t << std::endl;
 
          McEliece_PrivateKey sk1(rng, code_length, t);
          const McEliece_PublicKey& pk1 = sk1;