summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-05-16 11:43:53 -0400
committerNick Mathewson <nickm@torproject.org>2018-05-16 11:43:53 -0400
commitddc3eb20b72c607c5445d34e04154e68b5d77eb1 (patch)
tree6dfb91a2880bae6deaf126acf7a2a6d93139c233 /src/common
parent6acbd4c112d984c8a3fcfa1a387093131b740ca7 (diff)
parent881f7157f648eb8a39e5dfd3efb95951ee7ac215 (diff)
downloadtor-ddc3eb20b72c607c5445d34e04154e68b5d77eb1.tar.gz
tor-ddc3eb20b72c607c5445d34e04154e68b5d77eb1.zip
Merge branch 'bug26116_029' into bug26116_033
Diffstat (limited to 'src/common')
-rw-r--r--src/common/crypto_rsa.c2
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>