diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-05-24 15:23:15 -0400 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2018-06-21 18:50:47 +0200 |
commit | 50d06d1c7d2682b0042e921a76beb509d7ea68e1 (patch) | |
tree | 4f0f29d74e40aaeb1b538324bfbaec5ebbde0157 | |
parent | e4b47f7f19392e3be604e44f6999de2bc9e7ecf3 (diff) |
Improve the example getpass() implementation to show an error return
Also, modernize the code, so that it isn't trying to store a size_t
into an int, and then check the int's sign. :/
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 c8c250333cd254ab3f4d709ebc5ed86a7c065721)
-rw-r--r-- | doc/crypto/PEM_read_bio_PrivateKey.pod | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/crypto/PEM_read_bio_PrivateKey.pod b/doc/crypto/PEM_read_bio_PrivateKey.pod index 43c48b560d..f8d1d1a80f 100644 --- a/doc/crypto/PEM_read_bio_PrivateKey.pod +++ b/doc/crypto/PEM_read_bio_PrivateKey.pod @@ -348,17 +348,16 @@ Skeleton pass phrase callback: int pass_cb(char *buf, int size, int rwflag, void *u) { - int len; - char *tmp; /* We'd probably do something else if 'rwflag' is 1 */ printf("Enter pass phrase for \"%s\"\n", (char *)u); /* get pass phrase, length 'len' into 'tmp' */ - tmp = "hello"; - len = strlen(tmp); - if (len <= 0) - return 0; + char *tmp = "hello"; + if (tmp == NULL) /* An error occurred */ + return -1; + + size_t len = strlen(tmp); if (len > size) len = size; |