| Index: openssl/crypto/conf/conf_err.c
 | 
| diff --git a/openssl/crypto/conf/conf_err.c b/openssl/crypto/conf/conf_err.c
 | 
| deleted file mode 100644
 | 
| index 25bb5dc9aa3639e508c6d05a81dc31ef916a0f35..0000000000000000000000000000000000000000
 | 
| --- a/openssl/crypto/conf/conf_err.c
 | 
| +++ /dev/null
 | 
| @@ -1,131 +0,0 @@
 | 
| -/* crypto/conf/conf_err.c */
 | 
| -/* ====================================================================
 | 
| - * Copyright (c) 1999-2007 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 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 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 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.
 | 
| - * ====================================================================
 | 
| - *
 | 
| - * 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,
 | 
| - * only reason strings will be preserved.
 | 
| - */
 | 
| -
 | 
| -#include <stdio.h>
 | 
| -#include <openssl/err.h>
 | 
| -#include <openssl/conf.h>
 | 
| -
 | 
| -/* BEGIN ERROR CODES */
 | 
| -#ifndef OPENSSL_NO_ERR
 | 
| -
 | 
| -#define ERR_FUNC(func) ERR_PACK(ERR_LIB_CONF,func,0)
 | 
| -#define ERR_REASON(reason) ERR_PACK(ERR_LIB_CONF,0,reason)
 | 
| -
 | 
| -static ERR_STRING_DATA CONF_str_functs[]=
 | 
| -	{
 | 
| -{ERR_FUNC(CONF_F_CONF_DUMP_FP),	"CONF_dump_fp"},
 | 
| -{ERR_FUNC(CONF_F_CONF_LOAD),	"CONF_load"},
 | 
| -{ERR_FUNC(CONF_F_CONF_LOAD_BIO),	"CONF_load_bio"},
 | 
| -{ERR_FUNC(CONF_F_CONF_LOAD_FP),	"CONF_load_fp"},
 | 
| -{ERR_FUNC(CONF_F_CONF_MODULES_LOAD),	"CONF_modules_load"},
 | 
| -{ERR_FUNC(CONF_F_CONF_PARSE_LIST),	"CONF_parse_list"},
 | 
| -{ERR_FUNC(CONF_F_DEF_LOAD),	"DEF_LOAD"},
 | 
| -{ERR_FUNC(CONF_F_DEF_LOAD_BIO),	"DEF_LOAD_BIO"},
 | 
| -{ERR_FUNC(CONF_F_MODULE_INIT),	"MODULE_INIT"},
 | 
| -{ERR_FUNC(CONF_F_MODULE_LOAD_DSO),	"MODULE_LOAD_DSO"},
 | 
| -{ERR_FUNC(CONF_F_MODULE_RUN),	"MODULE_RUN"},
 | 
| -{ERR_FUNC(CONF_F_NCONF_DUMP_BIO),	"NCONF_dump_bio"},
 | 
| -{ERR_FUNC(CONF_F_NCONF_DUMP_FP),	"NCONF_dump_fp"},
 | 
| -{ERR_FUNC(CONF_F_NCONF_GET_NUMBER),	"NCONF_get_number"},
 | 
| -{ERR_FUNC(CONF_F_NCONF_GET_NUMBER_E),	"NCONF_get_number_e"},
 | 
| -{ERR_FUNC(CONF_F_NCONF_GET_SECTION),	"NCONF_get_section"},
 | 
| -{ERR_FUNC(CONF_F_NCONF_GET_STRING),	"NCONF_get_string"},
 | 
| -{ERR_FUNC(CONF_F_NCONF_LOAD),	"NCONF_load"},
 | 
| -{ERR_FUNC(CONF_F_NCONF_LOAD_BIO),	"NCONF_load_bio"},
 | 
| -{ERR_FUNC(CONF_F_NCONF_LOAD_FP),	"NCONF_load_fp"},
 | 
| -{ERR_FUNC(CONF_F_NCONF_NEW),	"NCONF_new"},
 | 
| -{ERR_FUNC(CONF_F_STR_COPY),	"STR_COPY"},
 | 
| -{0,NULL}
 | 
| -	};
 | 
| -
 | 
| -static ERR_STRING_DATA CONF_str_reasons[]=
 | 
| -	{
 | 
| -{ERR_REASON(CONF_R_ERROR_LOADING_DSO)    ,"error loading dso"},
 | 
| -{ERR_REASON(CONF_R_LIST_CANNOT_BE_NULL)  ,"list cannot be null"},
 | 
| -{ERR_REASON(CONF_R_MISSING_CLOSE_SQUARE_BRACKET),"missing close square bracket"},
 | 
| -{ERR_REASON(CONF_R_MISSING_EQUAL_SIGN)   ,"missing equal sign"},
 | 
| -{ERR_REASON(CONF_R_MISSING_FINISH_FUNCTION),"missing finish function"},
 | 
| -{ERR_REASON(CONF_R_MISSING_INIT_FUNCTION),"missing init function"},
 | 
| -{ERR_REASON(CONF_R_MODULE_INITIALIZATION_ERROR),"module initialization error"},
 | 
| -{ERR_REASON(CONF_R_NO_CLOSE_BRACE)       ,"no close brace"},
 | 
| -{ERR_REASON(CONF_R_NO_CONF)              ,"no conf"},
 | 
| -{ERR_REASON(CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE),"no conf or environment variable"},
 | 
| -{ERR_REASON(CONF_R_NO_SECTION)           ,"no section"},
 | 
| -{ERR_REASON(CONF_R_NO_SUCH_FILE)         ,"no such file"},
 | 
| -{ERR_REASON(CONF_R_NO_VALUE)             ,"no value"},
 | 
| -{ERR_REASON(CONF_R_UNABLE_TO_CREATE_NEW_SECTION),"unable to create new section"},
 | 
| -{ERR_REASON(CONF_R_UNKNOWN_MODULE_NAME)  ,"unknown module name"},
 | 
| -{ERR_REASON(CONF_R_VARIABLE_HAS_NO_VALUE),"variable has no value"},
 | 
| -{0,NULL}
 | 
| -	};
 | 
| -
 | 
| -#endif
 | 
| -
 | 
| -void ERR_load_CONF_strings(void)
 | 
| -	{
 | 
| -#ifndef OPENSSL_NO_ERR
 | 
| -
 | 
| -	if (ERR_func_error_string(CONF_str_functs[0].error) == NULL)
 | 
| -		{
 | 
| -		ERR_load_strings(0,CONF_str_functs);
 | 
| -		ERR_load_strings(0,CONF_str_reasons);
 | 
| -		}
 | 
| -#endif
 | 
| -	}
 | 
| 
 |