Revert argument swap change... oops CMS_uncompress() was consistent...

[openssl.git] / apps / cms.c

diff --git a/apps/cms.c b/apps/cms.c
index 30dd296bc022ecb3d9a8ab54b68f2796da7e499f..b1ffb382ad1b37874a4b718091249eb905b824a1 100644 (file)
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -69,7 +69,7 @@
 #undef PROG
 #define PROG cms_main
 static int save_certs(char *signerfile, STACK_OF(X509) *signers);
-static int smime_cb(int ok, X509_STORE_CTX *ctx);
+static int cms_cb(int ok, X509_STORE_CTX *ctx);
 static void receipt_request_print(BIO *out, CMS_ContentInfo *cms);
 static CMS_ReceiptRequest *make_receipt_request(STACK *rr_to, int rr_allorfirst,
                                                                STACK *rr_from);
@@ -567,7 +567,7 @@ int MAIN(int argc, char **argv)
        if (badarg)
                {
                argerr:
-               BIO_printf (bio_err, "Usage smime [options] cert.pem ...\n");
+               BIO_printf (bio_err, "Usage cms [options] cert.pem ...\n");
                BIO_printf (bio_err, "where options are\n");
                BIO_printf (bio_err, "-encrypt       encrypt message\n");
                BIO_printf (bio_err, "-decrypt       decrypt encrypted message\n");
@@ -852,7 +852,7 @@ int MAIN(int argc, char **argv)
                {
                if (!(store = setup_verify(bio_err, CAfile, CApath)))
                        goto end;
-               X509_STORE_set_verify_cb_func(store, smime_cb);
+               X509_STORE_set_verify_cb_func(store, cms_cb);
                if (vpm)
                        X509_STORE_set1_param(store, vpm);
                }
@@ -891,7 +891,7 @@ int MAIN(int argc, char **argv)
                        }
                if (!(flags & CMS_STREAM))
                        {
-                       if (!CMS_final(cms, in, flags))
+                       if (!CMS_final(cms, in, NULL, flags))
                                goto end;
                        }
                }
@@ -978,7 +978,7 @@ int MAIN(int argc, char **argv)
                /* If not streaming or resigning finalize structure */
                if ((operation == SMIME_SIGN) && !(flags & CMS_STREAM))
                        {
-                       if (!CMS_final(cms, in, flags))
+                       if (!CMS_final(cms, in, NULL, flags))
                                goto end;
                        }
                }
@@ -1177,7 +1177,7 @@ static int save_certs(char *signerfile, STACK_OF(X509) *signers)
 
 /* Minimal callback just to output policy info (if any) */
 
-static int smime_cb(int ok, X509_STORE_CTX *ctx)
+static int cms_cb(int ok, X509_STORE_CTX *ctx)
        {
        int error;