diff options
author | Alexander Færøy <ahf@torproject.org> | 2021-03-03 15:16:20 +0000 |
---|---|---|
committer | Alexander Færøy <ahf@torproject.org> | 2021-03-03 15:16:20 +0000 |
commit | 80b6054bb016aca0b18f8da79f23a859a804ef07 (patch) | |
tree | ee8c9db39c7443b7d1915aa037fce0e5bdd163ea /src | |
parent | a1ce89a5543ce1d7e4afb49290761324b21540e8 (diff) | |
parent | 8785a75e2f0c44f1585b563d8043c64c6489acaa (diff) | |
download | tor-80b6054bb016aca0b18f8da79f23a859a804ef07.tar.gz tor-80b6054bb016aca0b18f8da79f23a859a804ef07.zip |
Merge remote-tracking branch 'tor-gitlab/mr/213'
Diffstat (limited to 'src')
-rw-r--r-- | src/tools/tor-gencert.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index e4f6530b46..e7561654c7 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -248,6 +248,8 @@ generate_key(int bits) return rsa; } +#define MIN_PASSPHRASE_LEN 4 + /** Try to read the identity key from <b>identity_key_file</b>. If no such * file exists and create_identity_key is set, make a new identity key and * store it. Return 0 on success, nonzero on failure. @@ -288,11 +290,16 @@ load_identity_key(void) * the terminal. */ if (!PEM_write_PKCS8PrivateKey_nid(f, identity_key, NID_pbe_WithSHA1And3_Key_TripleDES_CBC, - passphrase, (int)passphrase_len, + passphrase, (int) passphrase_len, NULL, NULL)) { - log_err(LD_GENERAL, "Couldn't write identity key to %s", - identity_key_file); - crypto_openssl_log_errors(LOG_ERR, "Writing identity key"); + if ((int) passphrase_len < MIN_PASSPHRASE_LEN) { + log_err(LD_GENERAL, "Passphrase empty or too short. Passphrase needs " + "to be at least %d characters.", MIN_PASSPHRASE_LEN); + } else { + log_err(LD_GENERAL, "Couldn't write identity key to %s", + identity_key_file); + crypto_openssl_log_errors(LOG_ERR, "Writing identity key"); + } abort_writing_to_file(open_file); return 1; } |