Commit 220bd849 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Updates from 1.0.0-stable

parent dec95a12

Configure

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ my %table=( 
"BC-32","bcc32::::WIN32::BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN:${no_asm}:win32",



# MinGW

"mingw", "gcc:-mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::MINGW32:-lws2_32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a",

"mingw", "gcc:-mno-cygwin -DL_ENDIAN -DOPENSSL_NO_CAPIENG -fomit-frame-pointer -O3 -march=i486 -Wall:::MINGW32:-lws2_32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a",

# As for OPENSSL_USE_APPLINK. Applink makes it possible to use .dll

# compiled with one compiler with application compiled with another

# compiler. It's possible to engage Applink support in mingw64 build,

Makefile.org

+5 −5
Original line number Diff line number Diff line
@@ -403,8 +403,8 @@ test: tests 


tests: rehash

	@(cd test && echo "testing..." && \

	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on tests );

	util/opensslwrap.sh version -a

	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests );

	OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a



report:

	@$(PERL) util/selftest.pl
@@ -579,7 +579,7 @@ install_html_docs: 
				grep -v $$filecase "^$$fn\$$" | \

				(cd $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \

				 while read n; do \

					$$here/util/point.sh $$fn.$(HTMLSUFFIX) "$$n".$(HTMLSUFFIX); \

					PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$(HTMLSUFFIX) "$$n".$(HTMLSUFFIX); \

				 done); \

		done; \

	done
@@ -610,7 +610,7 @@ install_docs: 
			(grep -v "[	]"; true) | \

			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \

			 while read n; do \

				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \

				PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \

			 done); \

	done; \

	set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \
@@ -627,7 +627,7 @@ install_docs: 
			(grep -v "[	]"; true) | \

			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \

			 while read n; do \

				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \

				PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \

			 done); \

	done

crypto/asn1/a_gentm.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s, 
		p=OPENSSL_malloc(len);

		if (p == NULL)

			{

			ASN1err(ASN1_F_ASN1_GENERALIZEDTIME_SET,

			ASN1err(ASN1_F_ASN1_GENERALIZEDTIME_ADJ,

				ERR_R_MALLOC_FAILURE);

			return(NULL);

			}

crypto/asn1/a_time.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t, 
	ts=OPENSSL_gmtime(&t,&data);

	if (ts == NULL)

		{

		ASN1err(ASN1_F_ASN1_TIME_SET, ASN1_R_ERROR_GETTING_TIME);

		ASN1err(ASN1_F_ASN1_TIME_ADJ, ASN1_R_ERROR_GETTING_TIME);

		return NULL;

		}

	if (offset_day || offset_sec)

crypto/asn1/a_utctm.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t, 
		p=OPENSSL_malloc(len);

		if (p == NULL)

			{

			ASN1err(ASN1_F_ASN1_UTCTIME_SET,ERR_R_MALLOC_FAILURE);

			ASN1err(ASN1_F_ASN1_UTCTIME_ADJ,ERR_R_MALLOC_FAILURE);

			return(NULL);

			}

		if (s->data != NULL)