Update documentation for PEM callback: error is now -1.
authorNick Mathewson <nickm@torproject.org>
Wed, 16 May 2018 15:07:48 +0000 (11:07 -0400)
committerRichard Levitte <levitte@openssl.org>
Thu, 21 Jun 2018 16:47:39 +0000 (18:47 +0200)
In previous versions of OpenSSL, the documentation for PEM_read_*
said:

   The callback B<must> return the number of characters in the
   passphrase or 0 if an error occurred.

But since c82c3462267afdbbaa5, 0 is now treated as a non-error
return value.  Applications that want to indicate an error need to
return -1 instead.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6271)

(cherry picked from commit bbbf752a3c8b5a966bcb48fc71a3dc03832e7b27)

doc/crypto/PEM_read_bio_PrivateKey.pod

index 6b3006ef352311364e6bedffffa7d2f3edc43489..43c48b560dbeffddcb780aed8c0d9a1a673d7eec 100644 (file)
@@ -294,7 +294,7 @@ for it twice) if B<rwflag> is 1. The B<u> parameter has the same
 value as the B<u> parameter passed to the PEM routine. It allows
 arbitrary data to be passed to the callback by the application
 (for example a window handle in a GUI application). The callback
-B<must> return the number of characters in the passphrase or 0 if
+B<must> return the number of characters in the passphrase or -1 if
 an error occurred.
 
 =head1 EXAMPLES