[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  98bdae6a04f7467243e44a29663e91e1bd846af3 (commit)
      from  f11a74ef79d3944844593d8d76d43f048bdb709d (commit)


- Log -----------------------------------------------------------------
commit 98bdae6a04f7467243e44a29663e91e1bd846af3
Author: ning <xiaofu.ning at ingeek.com>
Date:   Wed Mar 11 15:28:05 2020 +0800

    pkcs12 demo: output correct file names on error.
    
    CLA: Trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/11304)

-----------------------------------------------------------------------

Summary of changes:
 demos/pkcs12/pkread.c  | 2 +-
 demos/pkcs12/pkwrite.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/demos/pkcs12/pkread.c b/demos/pkcs12/pkread.c
index 33fba5d290..d29ab98a60 100644
--- a/demos/pkcs12/pkread.c
+++ b/demos/pkcs12/pkread.c
@@ -79,7 +79,7 @@ int main(int argc, char **argv)
     name = find_friendly_name(p12);
     PKCS12_free(p12);
     if ((fp = fopen(argv[3], "w")) == NULL) {
-        fprintf(stderr, "Error opening file %s\n", argv[1]);
+        fprintf(stderr, "Error opening file %s\n", argv[3]);
         goto err;
     }
     if (name != NULL)
diff --git a/demos/pkcs12/pkwrite.c b/demos/pkcs12/pkwrite.c
index e9ad8cde26..262b49dc31 100644
--- a/demos/pkcs12/pkwrite.c
+++ b/demos/pkcs12/pkwrite.c
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
         exit(1);
     }
     if ((fp = fopen(argv[4], "wb")) == NULL) {
-        fprintf(stderr, "Error opening file %s\n", argv[1]);
+        fprintf(stderr, "Error opening file %s\n", argv[4]);
         ERR_print_errors_fp(stderr);
         exit(1);
     }