Commit 10fdd8d5 authored by Richard Levitte's avatar Richard Levitte
Browse files

I haven't merged from 0.9.7-stable in a loooong time. It shows :-).

parent 9c2fcb78

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 


 Changes between 0.9.7c and 0.9.7d  [xx XXX XXXX]



  *) Print out GeneralizedTime and UTCTime in ASN1_STRING_print_ex().

     [Peter Sylvester <Peter.Sylvester@EdelWeb.fr>]



  *) Use the correct content when signing type "other".

     [Steve Henson]

apps/apps.c

+2 −2
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ static int ui_read(UI *ui, UI_STRING *uis) 
			{

			const char *password =

				((PW_CB_DATA *)UI_get0_user_data(ui))->password;

			if (password[0] != '\0')

			if (password && password[0] != '\0')

				{

				UI_set_result(ui, uis, password);

				return 1;
@@ -499,7 +499,7 @@ static int ui_write(UI *ui, UI_STRING *uis) 
			{

			const char *password =

				((PW_CB_DATA *)UI_get0_user_data(ui))->password;

			if (password[0] != '\0')

			if (password && password[0] != '\0')

				return 1;

			}

		default:

apps/req.c

+1 −1
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ loop: 
			if ((x509ss=X509_new()) == NULL) goto end;



			/* Set version to V3 */

			if(!X509_set_version(x509ss, 2)) goto end;

			if(extensions && !X509_set_version(x509ss, 2)) goto end;

			if (serial)

				{

				if (!X509_set_serialNumber(x509ss, serial)) goto end;

apps/speed.c

+6 −0
Original line number Diff line number Diff line
@@ -1006,6 +1006,9 @@ int MAIN(int argc, char **argv) 
	c[D_CBC_RC5][0]=count;

	c[D_CBC_BF][0]=count;

	c[D_CBC_CAST][0]=count;

	c[D_CBC_128_AES][0]=count;

	c[D_CBC_192_AES][0]=count;

	c[D_CBC_256_AES][0]=count;



	for (i=1; i<SIZE_NUM; i++)

		{
@@ -1031,6 +1034,9 @@ int MAIN(int argc, char **argv) 
		c[D_CBC_RC5][i]=c[D_CBC_RC5][i-1]*l0/l1;

		c[D_CBC_BF][i]=c[D_CBC_BF][i-1]*l0/l1;

		c[D_CBC_CAST][i]=c[D_CBC_CAST][i-1]*l0/l1;

		c[D_CBC_128_AES][i]=c[D_CBC_128_AES][i-1]*l0/l1;

		c[D_CBC_192_AES][i]=c[D_CBC_192_AES][i-1]*l0/l1;

		c[D_CBC_256_AES][i]=c[D_CBC_256_AES][i-1]*l0/l1;

		}

#ifndef OPENSSL_NO_RSA

	rsa_c[R_RSA_512][0]=count/2000;

crypto/Makefile.ssl

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ ALL= $(GENERAL) $(SRC) $(HEADER) 
top:

	@(cd ..; $(MAKE) DIRS=$(DIR) all)



all: buildinf.h lib subdirs shared

all: shared



buildinf.h: ../Makefile.ssl

	( echo "#ifndef MK1MF_BUILD"; \
@@ -96,7 +96,7 @@ lib: $(LIBOBJ) 
	$(RANLIB) $(LIB) || echo Never mind.

	@touch lib



shared:

shared: buildinf.h lib subdirs

	if [ -n "$(SHARED_LIBS)" ]; then \

		(cd ..; $(MAKE) $(SHARED_LIB)); \

	fi