tor

commit ddc3eb20b72c607c5445d34e04154e68b5d77eb1
parent 6acbd4c112d984c8a3fcfa1a387093131b740ca7
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 16 May 2018 11:43:53 -0400

Merge branch 'bug26116_029' into bug26116_033

Diffstat:
A
changes/bug26116
 | 
7
+++++++
M
src/common/crypto_rsa.c
 | 
2
+-

2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/changes/bug26116 b/changes/bug26116
@@ -0,0 +1,7 @@
+  o Minor bugfixes (compatibility, openssl):
+    - Work around a change in OpenSSL 1.1.1 where
+      return values that would previously indicate "no password" now
+      indicate an empty password. Without this workaround, Tor instances
+      running with OpenSSL 1.1.1 would accept descriptors that other Tor
+      instances would reject. Fixes bug 26116; bugfix on 0.2.5.16.
+      
diff --git 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>