Commit 25f923dd authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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

Remove references to 'TXT' in -inform and -outform switches.
parent 150a4320

CHANGES

+10 −0
Original line number Diff line number Diff line
@@ -4,6 +4,16 @@ 


 Changes between 0.9.4 and 0.9.5  [xx XXX 1999]



  *) New function X509_CTX_rget_chain(), this returns the chain

     from an X509_CTX structure with a dup of the stack and all

     the X509 reference counts upped: so the stack will exist

     after X509_CTX_cleanup() has been called. Modify pkcs12.c

     to use this.



     Also make SSL_SESSION_print() print out the verify return

     code.

     [Steve Henson]



  *) Add manpage for the pkcs12 command. Also change the default

     behaviour so MAC iteration counts are used unless the new

     -nomaciter option is used. This improves file security and

apps/crl.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
static char *crl_usage[]={

"usage: crl args\n",

"\n",

" -inform arg     - input format - default PEM (one of DER, TXT or PEM)\n",

" -inform arg     - input format - default PEM (DER or PEM)\n",

" -outform arg    - output format - default PEM\n",

" -text           - print out a text format version\n",

" -in arg         - input file - default stdin\n",

apps/crl2p7.c

+3 −3
Original line number Diff line number Diff line
@@ -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");

apps/dh.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
#undef PROG

#define PROG	dh_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

apps/dsaparam.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
#undef PROG

#define PROG	dsaparam_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