diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-24 09:40:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-24 09:40:06 -0400 |
| commit | f48fb8a720c7cca79249248f92e3bc99cee3414d (patch) | |
| tree | f0284c6e1f69f1137f417aadb0feb49b2f2ec4ee /src/common | |
| parent | d3a972561aeb38d7b346be1826054c60bf3adfaa (diff) | |
| parent | c380562aed5242eab6449b054199d742f02833dd (diff) | |
| download | tor-f48fb8a720c7cca79249248f92e3bc99cee3414d.tar.gz tor-f48fb8a720c7cca79249248f92e3bc99cee3414d.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.1
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/crypto.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c index b82f181a39..d2801e0d45 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -653,7 +653,12 @@ pem_no_password_cb(char *buf, int size, int rwflag, void *u) (void)size; (void)rwflag; (void)u; - return 0; + /* The openssl documentation says that a callback "must" return 0 if an + * error occurred. But during the 1.1.1 series (commit c82c3462267afdbbaa5 + * they changed the interpretation so that 0 indicates an empty password and + * -1 indicates an error. We want to reject any encrypted PEM buffers, so we + * return -1. This will work on older OpenSSL versions and LibreSSL too. */ + return -1; } /** Read a PEM-encoded private key from the <b>len</b>-byte string <b>s</b> |