Commit 6175b375 authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge in recent changes from 0.9.6-stable. 

make update.
parent d0074113

CHANGES

+7 −0
Original line number Diff line number Diff line
@@ -4,6 +4,13 @@ 


 Changes between 0.9.6c and 0.9.6d  [XX xxx XXXX]



  *) Fix object definitions for Private and Enterprise: they were not

     recognized in their shortname (=lowercase) representation. Extend

     obj_dat.pl to issue an error when using undefined keywords instead

     of silently ignoring the problem (Svenning Sorensen

     <sss@sss.dnsalias.net>).

     [Lutz Jaenicke]



  *) Fix DH_generate_parameters() so that it works for 'non-standard'

     generators, i.e. generators other than 2 and 5.  (Previously, the

     code did not properly initialise the 'add' and 'rem' values to

Makefile.org

+2 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ do_gnu-shared: 
	( set -x; ${CC} ${SHARED_LDFLAGS} \

		-shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

		-Wl,-soname=lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

		-Wl,-Bsymbolic \

		-Wl,--whole-archive lib$$i.a \

		-Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \

	libs="$$libs -l$$i"; \
@@ -288,6 +289,7 @@ do_darwin-shared: 
do_cygwin-shared:

	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

	( set -x; ${CC}  -shared -o cyg$$i.dll \

		-Wl,-Bsymbolic \

		-Wl,--whole-archive lib$$i.a \

		-Wl,--out-implib,lib$$i.dll.a \

		-Wl,--no-whole-archive $$libs ) || exit 1; \

apps/dgst.c

+2 −2
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ int MAIN(int argc, char **argv) 
	BIO *bmd=NULL;

	BIO *out = NULL;

	const char *name;

#define PROG_NAME_SIZE  16

	char pname[PROG_NAME_SIZE];

#define PROG_NAME_SIZE  39

	char pname[PROG_NAME_SIZE+1];

	int separator=0;

	int debug=0;

	const char *outfile = NULL, *keyfile = NULL;

apps/enc.c

+2 −2
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ int MAIN(int argc, char **argv) 
	const EVP_CIPHER *cipher=NULL,*c;

	char *inf=NULL,*outf=NULL;

	BIO *in=NULL,*out=NULL,*b64=NULL,*benc=NULL,*rbio=NULL,*wbio=NULL;

#define PROG_NAME_SIZE  16

	char pname[PROG_NAME_SIZE];

#define PROG_NAME_SIZE  39

	char pname[PROG_NAME_SIZE+1];

	char *engine = NULL;



	apps_startup();

apps/openssl.c

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ BIO *bio_err=NULL; 
int main(int Argc, char *Argv[])

	{

	ARGS arg;

#define PROG_NAME_SIZE	16

	char pname[PROG_NAME_SIZE];

#define PROG_NAME_SIZE	39

	char pname[PROG_NAME_SIZE+1];

	FUNCTION f,*fp;

	MS_STATIC char *prompt,buf[1024],config_name[256];

	int n,i,ret=0;