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

Update from 0.9.8 stable. Eliminate duplicate error codes.

parent d9907c97

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 


 Changes between 0.9.8e and 0.9.9  [xx XXX xxxx]



  *) Load error codes if they are not already present instead of using a

     static variable. This allows them to be cleanly unloaded and reloaded.

     Improve header file function name parsing.

     [Steve Henson]



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

     when OPENSSL_NO_FCAST is set: some compilers (gcc 4.2 and later) reject

     their use. Safestack is reimplemented using inline functions: tests show

crypto/asn1/asn1_err.c

+8 −10
Original line number Diff line number Diff line 
/* crypto/asn1/asn1_err.c */

/* ====================================================================

 * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -123,7 +123,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_FUNC(ASN1_F_ASN1_TEMPLATE_EX_D2I),	"ASN1_TEMPLATE_EX_D2I"},

{ERR_FUNC(ASN1_F_ASN1_TEMPLATE_NEW),	"ASN1_TEMPLATE_NEW"},

{ERR_FUNC(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I),	"ASN1_TEMPLATE_NOEXP_D2I"},

{ERR_FUNC(ASN1_F_ASN1_TIME_SET),	"ASN1_TIME_SET"},

{ERR_FUNC(ASN1_F_ASN1_TIME_SET),	"ASN1_TIME_set"},

{ERR_FUNC(ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING),	"ASN1_TYPE_get_int_octetstring"},

{ERR_FUNC(ASN1_F_ASN1_TYPE_GET_OCTETSTRING),	"ASN1_TYPE_get_octetstring"},

{ERR_FUNC(ASN1_F_ASN1_UNPACK_STRING),	"ASN1_unpack_string"},
@@ -168,9 +168,10 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_FUNC(ASN1_F_OID_MODULE_INIT),	"OID_MODULE_INIT"},

{ERR_FUNC(ASN1_F_PARSE_TAGGING),	"PARSE_TAGGING"},

{ERR_FUNC(ASN1_F_PKCS5_PBE2_SET_IV),	"PKCS5_pbe2_set_iv"},

{ERR_FUNC(ASN1_F_PKCS5_PBE_SET),	"PKCS5_pbe_set"},

{ERR_FUNC(ASN1_F_X509_CINF_NEW),	"X509_CINF_NEW"},

{ERR_FUNC(ASN1_F_X509_CRL_ADD0_REVOKED),	"X509_CRL_ADD0_REVOKED"},

{ERR_FUNC(ASN1_F_X509_INFO_NEW),	"X509_INFO_NEW"},

{ERR_FUNC(ASN1_F_X509_CRL_ADD0_REVOKED),	"X509_CRL_add0_revoked"},

{ERR_FUNC(ASN1_F_X509_INFO_NEW),	"X509_INFO_new"},

{ERR_FUNC(ASN1_F_X509_NAME_ENCODE),	"X509_NAME_ENCODE"},

{ERR_FUNC(ASN1_F_X509_NAME_EX_D2I),	"X509_NAME_EX_D2I"},

{ERR_FUNC(ASN1_F_X509_NAME_EX_NEW),	"X509_NAME_EX_NEW"},
@@ -290,15 +291,12 @@ static ERR_STRING_DATA ASN1_str_reasons[]= 


void ERR_load_ASN1_strings(void)

	{

	static int init=1;

#ifndef OPENSSL_NO_ERR



	if (init)

	if (ERR_func_error_string(ASN1_str_functs[0].error) == NULL)

		{

		init=0;

#ifndef OPENSSL_NO_ERR

		ERR_load_strings(0,ASN1_str_functs);

		ERR_load_strings(0,ASN1_str_reasons);

#endif



		}

#endif

	}

crypto/bio/bio_err.c

+4 −7
Original line number Diff line number Diff line 
/* crypto/bio/bio_err.c */

/* ====================================================================

 * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -143,15 +143,12 @@ static ERR_STRING_DATA BIO_str_reasons[]= 


void ERR_load_BIO_strings(void)

	{

	static int init=1;

#ifndef OPENSSL_NO_ERR



	if (init)

	if (ERR_func_error_string(BIO_str_functs[0].error) == NULL)

		{

		init=0;

#ifndef OPENSSL_NO_ERR

		ERR_load_strings(0,BIO_str_functs);

		ERR_load_strings(0,BIO_str_reasons);

#endif



		}

#endif

	}

crypto/bn/bn_err.c

+4 −7
Original line number Diff line number Diff line 
/* crypto/bn/bn_err.c */

/* ====================================================================

 * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -137,15 +137,12 @@ static ERR_STRING_DATA BN_str_reasons[]= 


void ERR_load_BN_strings(void)

	{

	static int init=1;

#ifndef OPENSSL_NO_ERR



	if (init)

	if (ERR_func_error_string(BN_str_functs[0].error) == NULL)

		{

		init=0;

#ifndef OPENSSL_NO_ERR

		ERR_load_strings(0,BN_str_functs);

		ERR_load_strings(0,BN_str_reasons);

#endif



		}

#endif

	}

crypto/buffer/buf_err.c

+4 −7
Original line number Diff line number Diff line 
/* crypto/buffer/buf_err.c */

/* ====================================================================

 * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -88,15 +88,12 @@ static ERR_STRING_DATA BUF_str_reasons[]= 


void ERR_load_BUF_strings(void)

	{

	static int init=1;

#ifndef OPENSSL_NO_ERR



	if (init)

	if (ERR_func_error_string(BUF_str_functs[0].error) == NULL)

		{

		init=0;

#ifndef OPENSSL_NO_ERR

		ERR_load_strings(0,BUF_str_functs);

		ERR_load_strings(0,BUF_str_reasons);

#endif



		}

#endif

	}