diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-05-24 09:40:00 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-05-24 09:40:00 -0400 |
commit | c000763f1eadb01bdb1fc159e698ebcff58b3b8b (patch) | |
tree | 5a545cbe722f3a46edd5256e5445e15e8b9d82a0 /src | |
parent | ff27b7ce60b20ad831b3f0a92b49236103d47410 (diff) | |
parent | ddc3eb20b72c607c5445d34e04154e68b5d77eb1 (diff) | |
download | tor-c000763f1eadb01bdb1fc159e698ebcff58b3b8b.tar.gz tor-c000763f1eadb01bdb1fc159e698ebcff58b3b8b.zip |
Merge branch 'bug26116_033' into maint-0.3.3
Diffstat (limited to 'src')
-rw-r--r-- | src/common/crypto_rsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/crypto_rsa.c b/src/common/crypto_rsa.c index fa572580a4..259656810b 100644 --- a/src/common/crypto_rsa.c +++ b/src/common/crypto_rsa.c @@ -237,7 +237,7 @@ pem_no_password_cb(char *buf, int size, int rwflag, void *u) (void)size; (void)rwflag; (void)u; - return 0; + return -1; } /** Read a PEM-encoded private key from the <b>len</b>-byte string <b>s</b> |