Merge branch 'bug26116_033' into maint-0.3.3

This commit is contained in:
Nick Mathewson
2018-05-24 09:40:00 -04:00
2 changed files with 8 additions and 1 deletions
+1 -1
View File
@@ -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>