src/usr.bin/openssl/pkcs7.c - diff

Return to pkcs7.c CVS log

Up to [local] / src / usr.bin / openssl

Diff for /src/usr.bin/openssl/pkcs7.c between version 1.5 and 1.6

version 1.5, 2015/08/22 16:36:05

version 1.6, 2015/09/11 14:30:23

Line 71

#include <openssl/x509.h>

static struct {

#ifndef OPENSSL_NO_ENGINE

char *engine;

#endif

char *infile;

int informat;

int noout;

Line 85

Line 82

} pkcs7_config;

static struct option pkcs7_options[] = {

#ifndef OPENSSL_NO_ENGINE

{

.name = "engine",

.argname = "id",

.desc = "Use the engine specified by the given identifier",

.type = OPTION_ARG,

.opt.arg = &pkcs7_config.engine,

#endif

{

.name = "in",

.argname = "file",

.desc = "Input file (default stdin)",

Line 152

Line 140

static void

pkcs7_usage()

{

fprintf(stderr, "usage: pkcs7 [-engine id] [-in file] "

fprintf(stderr, "usage: pkcs7 [-in file] "

"[-inform DER | PEM] [-noout]\n"

" [-out file] [-outform DER | PEM] [-print_certs] [-text]\n\n");

options_usage(pkcs7_options);

Line 175

Line 163

pkcs7_usage();

goto end;

}

#ifndef OPENSSL_NO_ENGINE

setup_engine(bio_err, pkcs7_config.engine, 0);

#endif

in = BIO_new(BIO_s_file());

out = BIO_new(BIO_s_file());