Commit e4317d20 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

OPENSSL_IMPLEMENT_GLOBAL caused more grief than it's worth (it's used twice 

in legacy code). I'd rather just remove it along with legacy interface,
but it's probably not as appropriate as I'd like. Reimplement the macro.
parent 61775daf

crypto/des/enc_read.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 


/* This has some uglies in it but it works - even over sockets. */

/*extern int errno;*/

OPENSSL_IMPLEMENT_GLOBAL(int,DES_rw_mode)=DES_PCBC_MODE;

OPENSSL_IMPLEMENT_GLOBAL(int,DES_rw_mode,DES_PCBC_MODE)





/*

crypto/des/set_key.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
 */

#include "des_locl.h"



OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key);	/* defaults to false */

OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key,0)	/* defaults to false */



static const unsigned char odd_parity[256]={

  1,  1,  2,  2,  4,  4,  7,  7,  8,  8, 11, 11, 13, 13, 14, 14,

e_os2.h

+5 −6
Original line number Diff line number Diff line
@@ -266,20 +266,19 @@ extern "C" { 
   The way it's done allows definitions like this:



	// in foobar.c

	OPENSSL_IMPLEMENT_GLOBAL(int,foobar) = 0;

	OPENSSL_IMPLEMENT_GLOBAL(int,foobar,0)

	// in foobar.h

	OPENSSL_DECLARE_GLOBAL(int,foobar);

	#define foobar OPENSSL_GLOBAL_REF(foobar)

*/

#ifdef OPENSSL_EXPORT_VAR_AS_FUNCTION

# define OPENSSL_IMPLEMENT_GLOBAL(type,name)			     \

	extern type _hide_##name;				     \

	type *_shadow_##name(void) { return &_hide_##name; }	     \

	static type _hide_##name

# define OPENSSL_IMPLEMENT_GLOBAL(type,name,value)			\

	type *_shadow_##name(void)					\

	{ static type _hide_##name=value; return &_hide_##name; }

# define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)

# define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))

#else

# define OPENSSL_IMPLEMENT_GLOBAL(type,name) OPENSSL_GLOBAL type _shadow_##name

# define OPENSSL_IMPLEMENT_GLOBAL(type,name,value) OPENSSL_GLOBAL type _shadow_##name=value;

# define OPENSSL_DECLARE_GLOBAL(type,name) OPENSSL_EXPORT type _shadow_##name

# define OPENSSL_GLOBAL_REF(name) _shadow_##name

#endif