Fix C-API, on vpuh, return old hash on failure.

libpasta · Dec 16, 2017 · dd722a8 · dd722a8
1 parent a26e490
commit dd722a8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/libpasta-capi/ctest/test b/libpasta-capi/ctest/test
diff --git a/libpasta-capi/ctest/test.c b/libpasta-capi/ctest/test.c
@@ -22,6 +22,9 @@ int main(void) {
  // free_string(hash) // dont need to free this since it's static
  free_string(newhash);
 
+ assert (!verify_password_update_hash(hash, "not my password", &newhash));
+ printf("New hash: %s\n", newhash);
+ free_string(newhash);
 
  printf("\x1b[1;32mC test passed\x1b[m\n");
  return 0;

diff --git a/libpasta-capi/src/lib.rs b/libpasta-capi/src/lib.rs
@@ -59,15 +59,11 @@ pub extern "C" fn verify_password_update_hash(hash: *const c_char, password: *co
  assert!(!password.is_null());
  CStr::from_ptr(password).to_str().unwrap()
  };
- if libpasta::verify_password_update_hash(&mut hash, password) {
- unsafe {
- *new_hash = CString::new(hash).unwrap().into_raw();
- }
- // mem::forget(hash);
- true
- } else {
- false
+ let res = libpasta::verify_password_update_hash(&mut hash, password);
+ unsafe {
+ *new_hash = CString::new(hash).unwrap().into_raw();
  }
+ res
 }
 
 #[no_mangle]