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

[openssl.git] / apps / pkcs7.c

diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index c1973646cd2468761de11f5739fc993af9411491..d7feafd2f582e5efc6766b7842b27ae88db12593 100644 (file)
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -71,7 +71,7 @@
 #undef PROG
 #define PROG   pkcs7_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
@@ -145,8 +145,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," -print_certs  print any certs or crl in the input\n");