There have been a number of complaints from a number of sources that names

[oweals/openssl.git] / apps / crl2p7.c

diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index 8634e3a1ec075f74fa07e0c80f58fc84367cffb1..ebf5fe90eca7503fe2ee2a21c1ebc895c6662ff8 100644 (file)
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -76,12 +76,14 @@ 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
  */
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int i,badops=0;
@@ -157,8 +159,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");
@@ -218,7 +220,7 @@ bad:
        if (crl != NULL)
                {
                sk_X509_CRL_push(crl_stack,crl);
-               crl=NULL; /* now part of p7 for Freeing */
+               crl=NULL; /* now part of p7 for OPENSSL_freeing */
                }
 
        if ((cert_stack=sk_X509_new(NULL)) == NULL) goto end;
@@ -325,7 +327,7 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
 
        ret=count;
 end:
-       /* never need to Free x */
+       /* never need to OPENSSL_free x */
        if (in != NULL) BIO_free(in);
        if (sk != NULL) sk_X509_INFO_free(sk);
        return(ret);