Commit f47e5647 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix signer option and support format SMIME. 



Fix -signer option in smime utility to output signer certificates
when verifying.

Add support for format SMIME for -inform and -outform with cms and
smime utilities.

PR#4215

Reviewed-by: default avatarViktor Dukhovni <viktor@openssl.org>
parent 3ec8a1cf

apps/apps.h

+1 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ typedef struct string_int_pair_st { 
# define OPT_FMT_HTTP            (1L <<  9)

# define OPT_FMT_PVK             (1L << 10)

# define OPT_FMT_PDE     (OPT_FMT_PEMDER | OPT_FMT_ENGINE)

# define OPT_FMT_PDS     (OPT_FMT_PEMDER | OPT_FMT_SMIME)

# define OPT_FMT_ANY     ( \

        OPT_FMT_PEMDER | OPT_FMT_PKCS12 | OPT_FMT_SMIME | \

        OPT_FMT_ENGINE | OPT_FMT_MSBLOB | OPT_FMT_NETSCAPE | \

apps/cms.c

+4 −4
Original line number Diff line number Diff line
@@ -134,8 +134,8 @@ OPTIONS cms_options[] = { 
        "  cert.pem... recipient certs for encryption\n"},

    {OPT_HELP_STR, 1, '-', "Valid options are:\n"},

    {"help", OPT_HELP, '-', "Display this summary"},

    {"inform", OPT_INFORM, 'F', "Input format SMIME (default), PEM or DER"},

    {"outform", OPT_OUTFORM, 'F',

    {"inform", OPT_INFORM, 'c', "Input format SMIME (default), PEM or DER"},

    {"outform", OPT_OUTFORM, 'c',

     "Output format SMIME (default), PEM or DER"},

    {"in", OPT_IN, '<', "Input file"},

    {"out", OPT_OUT, '>', "Output file"},
@@ -278,11 +278,11 @@ int cms_main(int argc, char **argv) 
            ret = 0;

            goto end;

        case OPT_INFORM:

            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &informat))

            if (!opt_format(opt_arg(), OPT_FMT_PDS, &informat))

                goto opthelp;

            break;

        case OPT_OUTFORM:

            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &outformat))

            if (!opt_format(opt_arg(), OPT_FMT_PDS, &outformat))

                goto opthelp;

            break;

        case OPT_OUT:

apps/opt.c

+3 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ char *opt_init(int ac, char **av, const OPTIONS *o) 
        switch (i) {

        case   0: case '-': case '/': case '<': case '>': case 'E': case 'F':

        case 'M': case 'U': case 'f': case 'l': case 'n': case 'p': case 's':

        case 'u':

        case 'u': case 'c':

            break;

        default:

            assert(0);
@@ -756,10 +756,12 @@ int opt_next(void) 
                return -1;

            }

            break;

        case 'c':

        case 'E':

        case 'F':

        case 'f':

            if (opt_format(arg,

                           o->valtype == 'c' ? OPT_FMT_PDS :

                           o->valtype == 'E' ? OPT_FMT_PDE :

                           o->valtype == 'F' ? OPT_FMT_PEMDER

                           : OPT_FMT_ANY, &ival))

apps/smime.c

+5 −5
Original line number Diff line number Diff line
@@ -115,15 +115,15 @@ OPTIONS smime_options[] = { 
    {"noattr", OPT_NOATTR, '-', "Don't include any signed attributes"},

    {"binary", OPT_BINARY, '-', "Don't translate message to text"},

    {"certfile", OPT_CERTFILE, '<', "Other certificates file"},

    {"signer", OPT_SIGNER, '<', "Signer certificate file"},

    {"signer", OPT_SIGNER, 's', "Signer certificate file"},

    {"recip", OPT_RECIP, '<', "Recipient certificate file for decryption"},

    {"in", OPT_IN, '<', "Input file"},

    {"inform", OPT_INFORM, 'F', "Input format SMIME (default), PEM or DER"},

    {"inform", OPT_INFORM, 'c', "Input format SMIME (default), PEM or DER"},

    {"inkey", OPT_INKEY, '<',

     "Input private key (if not signer or recipient)"},

    {"keyform", OPT_KEYFORM, 'f', "Input private key format (PEM or ENGINE)"},

    {"out", OPT_OUT, '>', "Output file"},

    {"outform", OPT_OUTFORM, 'F',

    {"outform", OPT_OUTFORM, 'c',

     "Output format SMIME (default), PEM or DER"},

    {"content", OPT_CONTENT, '<',

     "Supply or override content for detached signature"},
@@ -200,14 +200,14 @@ int smime_main(int argc, char **argv) 
            ret = 0;

            goto end;

        case OPT_INFORM:

            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &informat))

            if (!opt_format(opt_arg(), OPT_FMT_PDS, &informat))

                goto opthelp;

            break;

        case OPT_IN:

            infile = opt_arg();

            break;

        case OPT_OUTFORM:

            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &outformat))

            if (!opt_format(opt_arg(), OPT_FMT_PDS, &outformat))

                goto opthelp;

            break;

        case OPT_OUT: