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

Use error table to determine if errors should be loaded.

parent 0e5d87d7

CHANGES

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


 Changes between 0.9.7l and 0.9.7m  [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.

     [Steve Henson]



 Changes between 0.9.7k and 0.9.7l  [28 Sep 2006]



  *) Introduce limits to prevent malicious keys being able to

util/mkerr.pl

+4 −7
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ EOF 
	print OUT <<"EOF";

/* $cfile */

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

 * 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
@@ -536,17 +536,14 @@ if($static) { 


${staticloader}void ERR_load_${lib}_strings(void)

	{

	static int init=1;

#ifndef OPENSSL_NO_ERR



	if (init)

	if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL)

		{

		init=0;

#ifndef OPENSSL_NO_ERR

		ERR_load_strings($load_errcode,${lib}_str_functs);

		ERR_load_strings($load_errcode,${lib}_str_reasons);

#endif



		}

#endif

	}

EOF

} else {