Commit ceab33e2 authored by FdaSilvaYY's avatar FdaSilvaYY Committed by Rich Salz
Browse files

Typo and comment fix 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1301)
parent fefa4d55

apps/cms.c

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ int cms_main(int argc, char **argv) 
            signerfile = opt_arg();

            break;

        case OPT_INKEY:

            /* If previous -inkey arument add signer to list */

            /* If previous -inkey argument add signer to list */

            if (keyfile) {

                if (signerfile == NULL) {

                    BIO_puts(bio_err, "Illegal -inkey without -signer\n");

apps/ocsp.c

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ OPTIONS ocsp_options[] = { 
    {"timeout", OPT_TIMEOUT, 'p',

     "Connection timeout (in seconds) to the OCSP responder"},

    {"url", OPT_URL, 's', "Responder URL"},

    {"host", OPT_HOST, 's', "host:prot top to connect to"},

    {"host", OPT_HOST, 's', "TCP/IP hostname:port to connect to"},

    {"port", OPT_PORT, 'p', "Port to run responder on"},

    {"ignore_err", OPT_IGNORE_ERR, '-'},

    {"noverify", OPT_NOVERIFY, '-', "Don't verify response at all"},
@@ -114,7 +114,7 @@ OPTIONS ocsp_options[] = { 
    {"resp_no_certs", OPT_RESP_NO_CERTS, '-',

     "Don't include any certificates in response"},

    {"resp_key_id", OPT_RESP_KEY_ID, '-',

     "Identify reponse by signing certificate key ID"},

     "Identify response by signing certificate key ID"},

    {"no_certs", OPT_NO_CERTS, '-',

     "Don't include any certificates in signed request"},

    {"no_signature_verify", OPT_NO_SIGNATURE_VERIFY, '-',

apps/s_server.c

+2 −2
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ OPTIONS s_server_options[] = { 
    {"Verify", OPT_UPPER_V_VERIFY, 'n',

     "Turn on peer certificate verification, must have a cert"},

    {"cert", OPT_CERT, '<', "Certificate file to use; default is " TEST_CERT},

    {"naccept", OPT_NACCEPT, 'p', "Terminate after pnum connections"},

    {"naccept", OPT_NACCEPT, 'p', "Terminate after #num connections"},

    {"serverinfo", OPT_SERVERINFO, 's',

     "PEM serverinfo file for certificate"},

    {"certform", OPT_CERTFORM, 'F',
@@ -788,7 +788,7 @@ OPTIONS s_server_options[] = { 
     "-Private Key file to use for servername if not in -cert2"},

    {"tlsextdebug", OPT_TLSEXTDEBUG, '-',

     "Hex dump of all TLS extensions received"},

    {"HTTP", OPT_HTTP, '-', "Like -WWW but ./path incluedes HTTP headers"},

    {"HTTP", OPT_HTTP, '-', "Like -WWW but ./path includes HTTP headers"},

    {"id_prefix", OPT_ID_PREFIX, 's',

     "Generate SSL/TLS session IDs prefixed by arg"},

    {"rand", OPT_RAND, 's',

apps/smime.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ int smime_main(int argc, char **argv) 
                goto opthelp;

            break;

        case OPT_INKEY:

            /* If previous -inkey arument add signer to list */

            /* If previous -inkey argument add signer to list */

            if (keyfile) {

                if (signerfile == NULL) {

                    BIO_printf(bio_err,

crypto/ct/ct_b64.c

+4 −3
Original line number Diff line number Diff line
@@ -116,9 +116,10 @@ SCT *SCT_new_from_base64(unsigned char version, const char *logid_base64, 
}



/*

 * This methods returns: 1 on Success,

 * 0 on decoding failure,

 * -1 on internal (malloc) failure, or invalid parameter if any.

 * Allocate, build and returns a new |ct_log| from input |pkey_base64|

 * It returns 1 on success,

 * 0 on decoding failure, or invalid parameter if any

 * -1 on internal (malloc) failure

 */

int CTLOG_new_from_base64(CTLOG **ct_log, const char *pkey_base64, const char *name)

{