Commit 50cfd175 authored by Bodo Möller's avatar Bodo Möller
Browse files

"perl util/mkerr.pl -static -recurse -rebuild" because the previous 

codebase apparently was inconsistent.  And crypto/Makefile.ssl
*does* need an ERRC ..
Submitted by:
Reviewed by:
PR:
parent eaecdc71

crypto/Makefile.ssl

+3 −2
Original line number Diff line number Diff line
@@ -29,11 +29,12 @@ SDIRS= md2 md5 sha mdc2 hmac ripemd \ 
	buffer bio stack lhash rand err objects \

	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp



ERRC=cpt_err

GENERAL=Makefile README



LIB= $(TOP)/libcrypto.a

LIBSRC=	cryptlib.c mem.c cversion.c ex_data.c tmdiff.c

LIBOBJ= cryptlib.o mem.o cversion.o ex_data.o tmdiff.o

LIBSRC=	cryptlib.c mem.c cversion.c ex_data.c tmdiff.c $(ERRC).c

LIBOBJ= cryptlib.o mem.o cversion.o ex_data.o tmdiff.o $(ERRC).o



SRC= $(LIBSRC)

crypto/comp/comp_err.c

+63 −51
Original line number Diff line number Diff line 
/* crypto/comp/comp_err.c */

/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)

 * All rights reserved.

 *

 * This package is an SSL implementation written

 * by Eric Young (eay@cryptsoft.com).

 * The implementation was written so as to conform with Netscapes SSL.

 * 

 * This library is free for commercial and non-commercial use as long as

 * the following conditions are aheared to.  The following conditions

 * apply to all code found in this distribution, be it the RC4, RSA,

 * lhash, DES, etc., code; not just the SSL code.  The SSL documentation

 * included with this distribution is covered by the same copyright terms

 * except that the holder is Tim Hudson (tjh@cryptsoft.com).

 * 

 * Copyright remains Eric Young's, and as such any Copyright notices in

 * the code are not to be removed.

 * If this package is used in a product, Eric Young should be given attribution

 * as the author of the parts of the library used.

 * This can be in the form of a textual message at program startup or

 * in documentation (online or textual) provided with the package.

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

 * Copyright (c) 1999 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

 * are met:

 * 1. Redistributions of source code must retain the copyright

 *

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer. 

 *

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in the

 *    documentation and/or other materials provided with the distribution.

 * 3. All advertising materials mentioning features or use of this software

 *    must display the following acknowledgement:

 *    "This product includes cryptographic software written by

 *     Eric Young (eay@cryptsoft.com)"

 *    The word 'cryptographic' can be left out if the rouines from the library

 *    being used are not cryptographic related :-).

 * 4. If you include any Windows specific code (or a derivative thereof) from 

 *    the apps directory (application code) you must include an acknowledgement:

 *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *

 * 3. All advertising materials mentioning features or use of this

 *    software must display the following acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"

 *

 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

 *    endorse or promote products derived from this software without

 *    prior written permission. For written permission, please contact

 *    openssl-core@OpenSSL.org.

 *

 * 5. Products derived from this software may not be called "OpenSSL"

 *    nor may "OpenSSL" appear in their names without prior written

 *    permission of the OpenSSL Project.

 *

 * 6. Redistributions of any form whatsoever must retain the following

 *    acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"

 *

 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND

 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE

 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

 * SUCH DAMAGE.

 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 * ====================================================================

 *

 * The licence and distribution terms for any publically available version or

 * derivative of this code cannot be changed.  i.e. this code cannot simply be

 * copied and put under another distribution licence

 * [including the GNU Public Licence.]

 * This product includes cryptographic software written by Eric Young

 * (eay@cryptsoft.com).  This product includes software written by Tim

 * Hudson (tjh@cryptsoft.com).

 *

 */



/* NOTE: this file was auto generated by the mkerr.pl script: any changes

 * made to it will be overwritten when the script next updates this file.

 */



#include <stdio.h>

#include <openssl/err.h>

#include <openssl/comp.h>



/* BEGIN ERROR CODES */

#ifndef NO_ERR

static ERR_STRING_DATA COMP_str_functs[]=

	{

{0,NULL}

	};



static ERR_STRING_DATA COMP_str_reasons[]=

	{

{0,NULL}

	};



#endif



void ERR_load__strings(void)

void ERR_load_COMP_strings(void)

	{

	static int init=1;

crypto/pkcs12/pk12err.c

+4 −36
Original line number Diff line number Diff line
@@ -72,22 +72,19 @@ static ERR_STRING_DATA PKCS12_str_functs[]= 
{ERR_PACK(0,PKCS12_F_PKCS12_ADD_LOCALKEYID,0),	"PKCS12_add_localkeyid"},

{ERR_PACK(0,PKCS12_F_PKCS12_CREATE,0),	"PKCS12_create"},

{ERR_PACK(0,PKCS12_F_PKCS12_DECRYPT_D2I,0),	"PKCS12_decrypt_d2i"},

{ERR_PACK(0,PKCS12_F_PKCS12_FRIENDLYNAME_ASC,0),	"PKCS12_FRIENDLYNAME_ASC"},

{ERR_PACK(0,PKCS12_F_PKCS12_GEN_MAC,0),	"PKCS12_gen_mac"},

{ERR_PACK(0,PKCS12_F_PKCS12_I2D_ENCRYPT,0),	"PKCS12_i2d_encrypt"},

{ERR_PACK(0,PKCS12_F_PKCS12_INIT,0),	"PKCS12_init"},

{ERR_PACK(0,PKCS12_F_PKCS12_KEY_GEN_ASC,0),	"PKCS12_key_gen_asc"},

{ERR_PACK(0,PKCS12_F_PKCS12_KEY_GEN_UNI,0),	"PKCS12_key_gen_uni"},

{ERR_PACK(0,PKCS12_F_PKCS12_MAKE_SAFEBAG,0),	"PKCS12_MAKE_SAFEBAG"},

{ERR_PACK(0,PKCS12_F_PKCS12_MAKE_KEYBAG,0),	"PKCS12_MAKE_KEYBAG"},

{ERR_PACK(0,PKCS12_F_PKCS12_MAKE_SHKEYBAG,0),	"PKCS12_MAKE_SHKEYBAG"},

{ERR_PACK(0,PKCS12_F_PKCS12_PACK_P7DATA,0),	"PKCS12_pack_p7data"},

{ERR_PACK(0,PKCS12_F_PKCS12_PACK_P7ENCDATA,0),	"PKCS12_pack_p7encdata"},

{ERR_PACK(0,PKCS12_F_PKCS12_PACK_P7_DATA,0),	"PKCS12_PACK_P7_DATA"},

{ERR_PACK(0,PKCS12_F_PKCS12_PACK_SAFEBAG,0),	"PKCS12_pack_safebag"},

{ERR_PACK(0,PKCS12_F_PKCS12_PARSE,0),	"PKCS12_parse"},

{ERR_PACK(0,PKCS12_F_PKCS12_PBE_CRYPT,0),	"PKCS12_pbe_crypt"},

{ERR_PACK(0,PKCS12_F_PKCS12_PBE_KEYIVGEN,0),	"PKCS12_PBE_keyivgen"},

{ERR_PACK(0,PKCS12_F_PKCS12_PKCS12_SET_MAC,0),	"PKCS12_PKCS12_SET_MAC"},

{ERR_PACK(0,PKCS12_F_PKCS12_SETUP_MAC,0),	"PKCS12_setup_mac"},

{ERR_PACK(0,PKCS12_F_PKCS12_SET_MAC,0),	"PKCS12_set_mac"},

{ERR_PACK(0,PKCS12_F_PKCS8_ADD_KEYUSAGE,0),	"PKCS8_add_keyusage"},
@@ -123,46 +120,17 @@ static ERR_STRING_DATA PKCS12_str_reasons[]= 


#endif



#ifdef PKCS12_LIB_NAME

static ERR_STRING_DATA PKCS12_lib_name[]=

        {

{0	,PKCS12_LIB_NAME},

{0,NULL}

	};

#endif





int PKCS12_lib_error_code=0;



void ERR_load_PKCS12_strings()

void ERR_load_PKCS12_strings(void)

	{

	static int init=1;



	if (PKCS12_lib_error_code == 0)

		PKCS12_lib_error_code=ERR_get_next_error_library();



	if (init)

		{

		init=0;

#ifndef NO_ERR

		ERR_load_strings(PKCS12_lib_error_code,PKCS12_str_functs);

		ERR_load_strings(PKCS12_lib_error_code,PKCS12_str_reasons);

		ERR_load_strings(ERR_LIB_PKCS12,PKCS12_str_functs);

		ERR_load_strings(ERR_LIB_PKCS12,PKCS12_str_reasons);

#endif



#ifdef PKCS12_LIB_NAME

		PKCS12_lib_name->error = ERR_PACK(PKCS12_lib_error_code,0,0);

		ERR_load_strings(0,PKCS12_lib_name);

#endif;

		}

		}



void ERR_PKCS12_error(function,reason,file,line)

int function;

int reason;

char *file;

int line;

	{

	if (PKCS12_lib_error_code == 0)

		PKCS12_lib_error_code=ERR_get_next_error_library();

	ERR_PUT_error(PKCS12_lib_error_code,function,reason,file,line);

	}