New function X509_CTX_rget_chain(), make SSL_SESSION_print() display return code.

[openssl.git] / apps / crl2p7.c

diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index f4b216f68b2a7e76cd3d253826a2b178e2fd789c..8514be2a4f3115e5bfdfbf266d15a3fb752d6b97 100644 (file)
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -76,7 +76,7 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
 #undef PROG
 #define PROG   crl2pkcs7_main
 
-/* -inform arg - input format - default PEM (one of DER, TXT or PEM)
+/* -inform arg - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg     - input file - default stdin
  * -out arg    - output file - default stdout
@@ -157,8 +157,8 @@ int MAIN(int argc, char **argv)
 bad:
                BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
                BIO_printf(bio_err,"where options are\n");
-               BIO_printf(bio_err," -inform arg    input format - one of DER TXT PEM\n");
-               BIO_printf(bio_err," -outform arg   output format - one of DER TXT PEM\n");
+               BIO_printf(bio_err," -inform arg    input format - DER or PEM\n");
+               BIO_printf(bio_err," -outform arg   output format - DER or PEM\n");
                BIO_printf(bio_err," -in arg        input file\n");
                BIO_printf(bio_err," -out arg       output file\n");
                BIO_printf(bio_err," -certfile arg  certificates file of chain to a trusted CA\n");
@@ -193,7 +193,7 @@ bad:
                if      (informat == FORMAT_ASN1)
                        crl=d2i_X509_CRL_bio(in,NULL);
                else if (informat == FORMAT_PEM)
-                       crl=PEM_read_bio_X509_CRL(in,NULL,NULL);
+                       crl=PEM_read_bio_X509_CRL(in,NULL,NULL,NULL);
                else    {
                        BIO_printf(bio_err,"bad input format specified for input crl\n");
                        goto end;
@@ -304,7 +304,7 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
                }
 
        /* This loads from a file, a stack of x509/crl/pkey sets */
-       sk=PEM_X509_INFO_read_bio(in,NULL,NULL);
+       sk=PEM_X509_INFO_read_bio(in,NULL,NULL,NULL);
        if (sk == NULL) {
                BIO_printf(bio_err,"error reading the file, %s\n",certfile);
                goto end;