Improve the example getpass() implementation to show an error return
authorNick Mathewson <nickm@torproject.org>
Thu, 24 May 2018 19:23:15 +0000 (15:23 -0400)
committerRichard Levitte <levitte@openssl.org>
Thu, 21 Jun 2018 17:10:51 +0000 (19:10 +0200)
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)
(cherry picked from commit 50d06d1c7d2682b0042e921a76beb509d7ea68e1)

doc/crypto/pem.pod

index 811a5e532dfec55b2c1aa9af11bc73ea8d332e77..de9ecca648f82ae6fe65c51707af229a5a96543d 100644 (file)
@@ -409,17 +409,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", 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;