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

Fix error codes.

parent 326794e9

Makefile.org

+2 −2
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

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)

crypto/asn1/asn1.h

+3 −0
Original line number Diff line number Diff line
@@ -1172,6 +1172,7 @@ void ERR_load_ASN1_strings(void); 
#define ASN1_F_ASN1_ENUMERATED_TO_BN			 113

#define ASN1_F_ASN1_EX_C2I				 204

#define ASN1_F_ASN1_FIND_END				 190

#define ASN1_F_ASN1_GENERALIZEDTIME_ADJ			 216

#define ASN1_F_ASN1_GENERALIZEDTIME_SET			 185

#define ASN1_F_ASN1_GENERATE_V3				 178

#define ASN1_F_ASN1_GET_OBJECT				 114
@@ -1206,10 +1207,12 @@ void ERR_load_ASN1_strings(void); 
#define ASN1_F_ASN1_TEMPLATE_EX_D2I			 132

#define ASN1_F_ASN1_TEMPLATE_NEW			 133

#define ASN1_F_ASN1_TEMPLATE_NOEXP_D2I			 131

#define ASN1_F_ASN1_TIME_ADJ				 217

#define ASN1_F_ASN1_TIME_SET				 175

#define ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING		 134

#define ASN1_F_ASN1_TYPE_GET_OCTETSTRING		 135

#define ASN1_F_ASN1_UNPACK_STRING			 136

#define ASN1_F_ASN1_UTCTIME_ADJ				 218

#define ASN1_F_ASN1_UTCTIME_SET				 187

#define ASN1_F_ASN1_VERIFY				 137

#define ASN1_F_B64_READ_ASN1				 209