generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update from HEAD.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2008-04-09 22:12:10 +00:00
parent 173acc185c
commit 79996e3335
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/cms.c
View File

@ -69,7 +69,7 @@
#undef PROG #undef PROG
#define PROG cms_main #define PROG cms_main
static int save_certs(char *signerfile, STACK_OF(X509) *signers); 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 void receipt_request_print(BIO *out, CMS_ContentInfo *cms);
static CMS_ReceiptRequest *make_receipt_request(STACK *rr_to, int rr_allorfirst, static CMS_ReceiptRequest *make_receipt_request(STACK *rr_to, int rr_allorfirst,
STACK *rr_from); STACK *rr_from);
@ -566,7 +566,7 @@ int MAIN(int argc, char **argv)
if (badarg) if (badarg)
{ {
argerr: 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, "where options are\n");
BIO_printf (bio_err, "-encrypt encrypt message\n"); BIO_printf (bio_err, "-encrypt encrypt message\n");
BIO_printf (bio_err, "-decrypt decrypt encrypted message\n"); BIO_printf (bio_err, "-decrypt decrypt encrypted message\n");
@ -851,7 +851,7 @@ int MAIN(int argc, char **argv)
{ {
if (!(store = setup_verify(bio_err, CAfile, CApath))) if (!(store = setup_verify(bio_err, CAfile, CApath)))
goto end; goto end;
X509_STORE_set_verify_cb_func(store, smime_cb); X509_STORE_set_verify_cb_func(store, cms_cb);
if (vpm) if (vpm)
X509_STORE_set1_param(store, vpm); X509_STORE_set1_param(store, vpm);
} }
@ -1171,7 +1171,7 @@ static int save_certs(char *signerfile, STACK_OF(X509) *signers)
/* Minimal callback just to output policy info (if any) */ /* 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; int error;