[openssl] master update

[yang.yang at baishancloud.com]

The branch master has been updated
       via  4b931252bedae3f1a5c1b9836ca20a5af9445bc7 (commit)
      from  edc62356485257a37eb8775f25c5a19345b83a50 (commit)


- Log -----------------------------------------------------------------
commit 4b931252bedae3f1a5c1b9836ca20a5af9445bc7
Author: Paul Yang <yang.yang at baishancloud.com>
Date:   Wed Jun 26 17:36:56 2019 +0800

    Fix incorrect usage of a test case
    
    test/x509_check_cert_pkey_test.c has incorrect usage description.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9250)

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

Summary of changes:
 test/x509_check_cert_pkey_test.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/x509_check_cert_pkey_test.c b/test/x509_check_cert_pkey_test.c
index 434054f..6c1587b 100644
--- a/test/x509_check_cert_pkey_test.c
+++ b/test/x509_check_cert_pkey_test.c
@@ -110,10 +110,11 @@ const OPTIONS *test_get_options(void)
 {
     enum { OPT_TEST_ENUM };
     static const OPTIONS test_options[] = {
-        OPT_TEST_OPTIONS_WITH_EXTRA_USAGE("certname key.pem type expected\n"),
-        { OPT_HELP_STR, 1, '-', "certname\tCertificate filename .pem/.req\n" },
-        { OPT_HELP_STR, 1, '-', "type\t\tvalue must be 'pem' or 'req'\n" },
-        { OPT_HELP_STR, 1, '-', "expected\tthe expected return value\n" },
+        OPT_TEST_OPTIONS_WITH_EXTRA_USAGE("cert key type expected\n"),
+        { OPT_HELP_STR, 1, '-', "cert\tcertificate or CSR filename in PEM\n" },
+        { OPT_HELP_STR, 1, '-', "key\tprivate key filename in PEM\n" },
+        { OPT_HELP_STR, 1, '-', "type\t\tvalue must be 'cert' or 'req'\n" },
+        { OPT_HELP_STR, 1, '-', "expected\tthe expected return value, either 'ok' or 'failed'\n" },
         { NULL }
     };
     return test_options;