mirrors/minisign
1
0
Fork 0
mirror of https://github.com/jedisct1/minisign.git synced 2025-04-05 20:07:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

Tell what's going on when hashing the password

Browse source
This commit is contained in:
Frank Denis 2015-06-08 15:04:04 +02:00
parent ef81e72604
commit 6a2e8df4c2
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/minisign.c
View file

@ -262,6 +262,8 @@ seckey_load(const char *sk_file)
if (get_password(pwd, PASSWORDMAXBYTES, "Password: ") != 0) { if (get_password(pwd, PASSWORDMAXBYTES, "Password: ") != 0) {
exit_msg("get_password()"); exit_msg("get_password()");
} }
printf("Deriving a key from the password and decrypting the secret key... ");
fflush(stdout);
stream = xsodium_malloc(sizeof seckey_struct->keynum_sk); stream = xsodium_malloc(sizeof seckey_struct->keynum_sk);
if (crypto_pwhash_scryptsalsa208sha256 if (crypto_pwhash_scryptsalsa208sha256
(stream, sizeof seckey_struct->keynum_sk, pwd, strlen(pwd), (stream, sizeof seckey_struct->keynum_sk, pwd, strlen(pwd),
@ -273,6 +275,7 @@ seckey_load(const char *sk_file)
xor_buf((unsigned char *) (void *) &seckey_struct->keynum_sk, stream, xor_buf((unsigned char *) (void *) &seckey_struct->keynum_sk, stream,
sizeof seckey_struct->keynum_sk); sizeof seckey_struct->keynum_sk);
sodium_free(stream); sodium_free(stream);
puts("done");
seckey_chk(chk, seckey_struct); seckey_chk(chk, seckey_struct);
if (memcmp(chk, seckey_struct->keynum_sk.chk, sizeof chk) != 0) { if (memcmp(chk, seckey_struct->keynum_sk.chk, sizeof chk) != 0) {
exit_msg("Wrong password for that key"); exit_msg("Wrong password for that key");
@ -435,6 +438,8 @@ generate(const char *pk_file, const char *sk_file, const char *comment)
if (strcmp(pwd, pwd2) != 0) { if (strcmp(pwd, pwd2) != 0) {
exit_msg("Passwords don't match"); exit_msg("Passwords don't match");
} }
printf("Deriving a key from the password in order to encrypt the secret key... ");
fflush(stdout);
stream = xsodium_malloc(sizeof seckey_struct->keynum_sk); stream = xsodium_malloc(sizeof seckey_struct->keynum_sk);
if (crypto_pwhash_scryptsalsa208sha256 if (crypto_pwhash_scryptsalsa208sha256
(stream, sizeof seckey_struct->keynum_sk, pwd, strlen(pwd), (stream, sizeof seckey_struct->keynum_sk, pwd, strlen(pwd),
@ -448,6 +453,7 @@ generate(const char *pk_file, const char *sk_file, const char *comment)
xor_buf((unsigned char *) (void *) &seckey_struct->keynum_sk, stream, xor_buf((unsigned char *) (void *) &seckey_struct->keynum_sk, stream,
sizeof seckey_struct->keynum_sk); sizeof seckey_struct->keynum_sk);
sodium_free(stream); sodium_free(stream);
puts("done");
if ((fp = fopen_create_useronly(sk_file)) == NULL) { if ((fp = fopen_create_useronly(sk_file)) == NULL) {
exit_err(sk_file); exit_err(sk_file);