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

Change safestack reimplementation to match 0.9.8. 

Fix additional gcc 4.2 value not used warnings.
parent 8164032a

CHANGES

+1 −3
Changes for CHANGES: 1 added line, 3 removed lines.
Original line number Diff line number Diff line
@@ -125,9 +125,7 @@ 


  *) Initial incomplete changes to avoid need for function casts in OpenSSL

     some compilers (gcc 4.2 and later) reject their use. Safestack is

     reimplemented using inline functions: tests show that these calls are

     typically optimized away by compilers so they have no additional overhead.

     Update ASN1 to avoid use of legacy functions. 

     reimplemented.  Update ASN1 to avoid use of legacy functions. 

     [Steve Henson]



  *) Win32/64 targets are linked with Winsock2.

Makefile.org

+4 −1
Changes for Makefile.org: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -422,6 +422,9 @@ errors: 
	(cd engines; $(MAKE) PERL=$(PERL) errors)

	$(PERL) util/ck_errf.pl */*.c */*/*.c



stacks:

	$(PERL) util/mkstack.pl -write



util/libeay.num::

	$(PERL) util/mkdef.pl crypto update
@@ -446,7 +449,7 @@ TABLE: Configure 
	(echo 'Output of `Configure TABLE'"':"; \

	$(PERL) Configure TABLE) > TABLE



update: errors util/libeay.num util/ssleay.num crypto/objects/obj_dat.h crypto/objects/obj_xref.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend

update: errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h crypto/objects/obj_xref.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend



# Build distribution tar-file. As the list of files returned by "find" is

# pretty long, on several platforms a "too many arguments" error or similar

crypto/asn1/x_crl.c

+1 −1
Changes for crypto/asn1/x_crl.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int crl_inf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, 
		 * would affect the output of X509_CRL_print().

		 */

		case ASN1_OP_D2I_POST:

		sk_X509_REVOKED_set_cmp_func(a->revoked,X509_REVOKED_cmp);

		(void)sk_X509_REVOKED_set_cmp_func(a->revoked,X509_REVOKED_cmp);

		break;

	}

	return 1;

crypto/conf/conf_api.c

+1 −1
Changes for crypto/conf/conf_api.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ int _CONF_add_string(CONF *conf, CONF_VALUE *section, CONF_VALUE *value) 
	v = (CONF_VALUE *)lh_insert(conf->data, value);

	if (v != NULL)

		{

		sk_CONF_VALUE_delete_ptr(ts,v);

		(void)sk_CONF_VALUE_delete_ptr(ts,v);

		OPENSSL_free(v->name);

		OPENSSL_free(v->value);

		OPENSSL_free(v);

crypto/conf/conf_mod.c

+1 −1
Changes for crypto/conf/conf_mod.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ void CONF_modules_unload(int all) 
		if (((md->links > 0) || !md->dso) && !all)

			continue;

		/* Since we're working in reverse this is OK */

		sk_CONF_MODULE_delete(supported_modules, i);

		(void)sk_CONF_MODULE_delete(supported_modules, i);

		module_free(md);

		}

	if (sk_CONF_MODULE_num(supported_modules) == 0)