From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 1 Jul 2012 22:12:03 +0000 (+0000)
Subject: recognise OPENSSL_NO_SSL_TRACE
X-Git-Tag: master-post-reformat~1783
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8fdb4f1af3c696b731d7debc7ed039291eec2894;p=oweals%2Fopenssl.git

recognise OPENSSL_NO_SSL_TRACE
---

diff --git a/util/libeay.num b/util/libeay.num
index dd6d14cb22..3f81a91866 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3701,7 +3701,7 @@ int_EVP_CIPHER_init_engine_callbacks    4087	NOEXIST::FUNCTION:
 FIPS_rsa_free                           4088	EXIST:OPENSSL_FIPS:FUNCTION:
 FIPS_dsa_sig_encode                     4089	NOEXIST::FUNCTION:
 CRYPTO_dbg_remove_all_info              4090	NOEXIST::FUNCTION:
-OPENSSL_init                            4091	NOEXIST::FUNCTION:
+OPENSSL_init                            4091	EXIST::FUNCTION:
 private_Camellia_set_key                4092	NOEXIST::FUNCTION:
 CRYPTO_strdup                           4093	EXIST::FUNCTION:
 JPAKE_STEP3A_process                    4094	EXIST::FUNCTION:JPAKE
@@ -4410,3 +4410,5 @@ DH_get_2048_224                         4779	EXIST::FUNCTION:DH
 FIPS_drbg_method                        4780	EXIST:OPENSSL_FIPS:FUNCTION:
 EC_curve_nist2nid                       4781	EXIST::FUNCTION:EC
 EC_curve_nid2nist                       4782	EXIST::FUNCTION:EC
+X509_get0_signature                     4783	EXIST::FUNCTION:
+X509_get_signature_nid                  4784	EXIST::FUNCTION:
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index b566bbf610..d818c61b9f 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -1384,6 +1384,7 @@ sub read_options
 		"no-store" => 0,
 		"no-zlib" => 0,
 		"no-zlib-dynamic" => 0,
+		"no-ssl-trace" => 0,
 		"fips" => \$fips,
 		"fipscanisterbuild" => [\$fips, \$fipscanisterbuild],
 		"fipscanisteronly" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly],
diff --git a/util/mkdef.pl b/util/mkdef.pl
index 13cf2aa19c..8d74eaa9a9 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -117,7 +117,9 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
 			 # Hide SSL internals
 			 "SSL_INTERN",
 			 # SCTP
-			 "SCTP");
+			 "SCTP",
+			 # SSL TRACE
+		 	 "SSL_TRACE");
 
 my $options="";
 open(IN,"<Makefile") || die "unable to open Makefile!\n";
@@ -137,7 +139,7 @@ my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw;
 my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated;
 my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng;
 my $no_jpake; my $no_ssl2; my $no_ec2m; my $no_nextprotoneg;
-my $no_srp; my $no_nistp_gcc; my $no_sctp;
+my $no_srp; my $no_nistp_gcc; my $no_sctp; my $no_ssl_trace;
 
 my $fips;
 
@@ -232,6 +234,7 @@ foreach (@ARGV, split(/ /, $options))
  	elsif (/^no-ec-nistp224-64-gcc-128$/)	{ $no_nistp_gcc=1; }
 	elsif (/^no-nextprotoneg$/)	{ $no_nextprotoneg=1; }
 	elsif (/^no-ssl2$/)	{ $no_ssl2=1; }
+	elsif (/^no-ssl-trace$/) { $no_ssl_trace=1; }
 	elsif (/^no-capieng$/)	{ $no_capieng=1; }
 	elsif (/^no-jpake$/)	{ $no_jpake=1; }
 	elsif (/^no-srp$/)	{ $no_srp=1; }
@@ -340,7 +343,7 @@ $crypto.=" crypto/cms/cms.h";
 $crypto.=" crypto/jpake/jpake.h";
 $crypto.=" crypto/srp/srp.h";
 $crypto.=" crypto/modes/modes.h";
-$crypto.=" fips/fips.h fips/rand/fips_rand.h";
+#$crypto.=" fips/fips.h fips/rand/fips_rand.h";
 
 my $symhacks="crypto/symhacks.h";
 
@@ -1200,6 +1203,7 @@ sub is_valid
 			if ($keyword eq "EC2M" && $no_ec2m) { return 0; }
 			if ($keyword eq "NEXTPROTONEG" && $no_nextprotoneg) { return 0; }
 			if ($keyword eq "SSL2" && $no_ssl2) { return 0; }
+			if ($keyword eq "SSL_TRACE" && $no_ssl_trace) { return 0; }
 			if ($keyword eq "CAPIENG" && $no_capieng) { return 0; }
 			if ($keyword eq "JPAKE" && $no_jpake) { return 0; }
 			if ($keyword eq "SRP" && $no_srp) { return 0; }