← Back to branch summary

~ubuntu-branches/ubuntu/utopic/openssl/utopic

« back to all changes in this revision

Viewing changes to apps/pkcs7.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2011-04-02 13:19:19 UTC
  • mfrom: (1.2.1 upstream) (11.2.2 experimental)
  • mto: This revision was merged to the branch mainline in revision 55.
  • Revision ID: james.westby@ubuntu.com-20110402131919-anszuslper64ey9e
Tags: 1.0.0d-1
http://bugs.debian.org/607609
* New upstream version
  - Fixes CVE-2011-0014
* Make libssl-doc Replaces/Breaks with old libssl-dev packages
  (Closes: #607609)
* Only export the symbols we should, instead of all.
* Add symbol file.
* Upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/pkcs7.c
82
82
 
83
83
int MAIN(int argc, char **argv)
84
84
        {
85
 
#ifndef OPENSSL_NO_ENGINE
86
 
        ENGINE *e = NULL;
87
 
#endif
88
85
        PKCS7 *p7=NULL;
89
86
        int i,badops=0;
90
87
        BIO *in=NULL,*out=NULL;
91
88
        int informat,outformat;
92
89
        char *infile,*outfile,*prog;
93
 
        int print_certs=0,text=0,noout=0;
 
90
        int print_certs=0,text=0,noout=0,p7_print=0;
94
91
        int ret=1;
95
92
#ifndef OPENSSL_NO_ENGINE
96
93
        char *engine=NULL;
139
136
                        noout=1;
140
137
                else if (strcmp(*argv,"-text") == 0)
141
138
                        text=1;
 
139
                else if (strcmp(*argv,"-print") == 0)
 
140
                        p7_print=1;
142
141
                else if (strcmp(*argv,"-print_certs") == 0)
143
142
                        print_certs=1;
144
143
#ifndef OPENSSL_NO_ENGINE
180
179
        ERR_load_crypto_strings();
181
180
 
182
181
#ifndef OPENSSL_NO_ENGINE
183
 
        e = setup_engine(bio_err, engine, 0);
 
182
        setup_engine(bio_err, engine, 0);
184
183
#endif
185
184
 
186
185
        in=BIO_new(BIO_s_file());
238
237
                        }
239
238
                }
240
239
 
 
240
        if (p7_print)
 
241
                PKCS7_print_ctx(out, p7, 0, NULL);
 
242
 
241
243
        if (print_certs)
242
244
                {
243
245
                STACK_OF(X509) *certs=NULL;