Commit c0fc27f8 authored by Matt Caswell's avatar Matt Caswell
Browse files

Made it an error to define OPENSSL_USE_DEPRECATED if OpenSSL has been built 


with OPENSSL_NO_DEPRECATED defined

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent bd2bd374

Configure

+5 −2
Original line number Diff line number Diff line
@@ -1419,8 +1419,11 @@ if ($zlib) 
		}

	}



#Always build the library with OPENSSL_USE_DEPRECATED. This is overridden by OPENSSL_NO_DEPRECATED

#Build the library with OPENSSL_USE_DEPRECATED if deprecation is not disabled

if(!defined($disabled{"deprecated"}))

	{

	$cflags = "-DOPENSSL_USE_DEPRECATED $cflags";

	}



# You will find shlib_mark1 and shlib_mark2 explained in Makefile.org

my $shared_mark = "";

crypto/opensslconf.h.in

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * deprecated functions then this will not work

 */

#if defined(OPENSSL_NO_DEPRECATED) && defined(OPENSSL_USE_DEPRECATED)

#undef OPENSSL_USE_DEPRECATED

#error "OPENSSL_USE_DEPRECATED has been defined, but OpenSSL has been built without support for deprecated functions"

#endif



/* Test for support for deprecated attribute */