nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Preserve errno when loading encrypted ed25519 keys.

Browse Source
This commit is contained in:
Nick Mathewson 2015-07-14 10:23:07 -04:00
parent b566cb9e84
commit 0a6997d78b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/routerkeys.c
View File

@ -21,6 +21,7 @@ read_encrypted_secret_key(ed25519_secret_key_t *out,
char pwbuf[256]; char pwbuf[256];
uint8_t encrypted_key[256]; uint8_t encrypted_key[256];
char *tag = NULL; char *tag = NULL;
int saved_errno = 0;
ssize_t encrypted_len = crypto_read_tagged_contents_from_file(fname, ssize_t encrypted_len = crypto_read_tagged_contents_from_file(fname,
ENC_KEY_HEADER, ENC_KEY_HEADER,
@ -28,6 +29,7 @@ read_encrypted_secret_key(ed25519_secret_key_t *out,
encrypted_key, encrypted_key,
sizeof(encrypted_key)); sizeof(encrypted_key));
if (encrypted_len < 0) { if (encrypted_len < 0) {
saved_errno = errno;
log_info(LD_OR, "%s is missing", fname); log_info(LD_OR, "%s is missing", fname);
r = 0; r = 0;
goto done; goto done;
@ -46,6 +48,7 @@ read_encrypted_secret_key(ed25519_secret_key_t *out,
pwbuf, pwlen); pwbuf, pwlen);
if (r == UNPWBOX_CORRUPTED) { if (r == UNPWBOX_CORRUPTED) {
log_err(LD_OR, "%s is corrupted.", fname); log_err(LD_OR, "%s is corrupted.", fname);
saved_errno = EINVAL;
goto done; goto done;
} else if (r == UNPWBOX_OKAY) { } else if (r == UNPWBOX_OKAY) {
break; break;
@ -57,6 +60,7 @@ read_encrypted_secret_key(ed25519_secret_key_t *out,
if (secret_len != ED25519_SECKEY_LEN) { if (secret_len != ED25519_SECKEY_LEN) {
log_err(LD_OR, "%s is corrupted.", fname); log_err(LD_OR, "%s is corrupted.", fname);
saved_errno = EINVAL;
goto done; goto done;
} }
memcpy(out->seckey, secret, ED25519_SECKEY_LEN); memcpy(out->seckey, secret, ED25519_SECKEY_LEN);
@ -70,6 +74,8 @@ read_encrypted_secret_key(ed25519_secret_key_t *out,
memwipe(secret, 0, secret_len); memwipe(secret, 0, secret_len);
tor_free(secret); tor_free(secret);
} }
if (saved_errno)
errno = saved_errno;
return r; return r;
} }