Commit 1f7103b6 authored by Rich Salz's avatar Rich Salz
Browse files

Fix various build breaks 



TABLE wasn't updated from a previous Configure change
Missed an RMD160/RIPE/RIPEMD unification in mkdef.pl
Makefile install_sw referenced file doc/openssl-shared.txt (RT3686)
Needed to run 'make update' because
        - Various old code has been removed
        - Varous old #ifdef tests were removed

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent a479d72d

Makefile.org

+0 −2
Original line number Diff line number Diff line
@@ -600,8 +600,6 @@ install_sw: 
		if [ "$(INSTALLTOP)" != "/usr" ]; then \

			echo 'OpenSSL shared libraries have been installed in:'; \

			echo '  $(INSTALLTOP)'; \

			echo ''; \

			sed -e '1,/^$$/d' doc/openssl-shared.txt; \

		fi; \

	fi

	cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig

TABLE

+1 −1
Original line number Diff line number Diff line
@@ -1668,7 +1668,7 @@ $multilib = 


*** debug-ben-debug-64-clang

$cc           = clang

$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -fsanitize=undefined -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe

$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe

$unistd       = 

$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT

$sys_id       =

util/libeay.num

+400 −399

File changed.

Preview size limit exceeded, changes collapsed.

util/mkdef.pl

+3 −3
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ my @known_platforms = ( "__FreeBSD__", "PERL5", 
my @known_ossl_platforms = ( "VMS", "WIN32", "WINNT", "OS2" );

my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",

			 "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1",

			 "SHA256", "SHA512", "RIPEMD",

			 "SHA256", "SHA512", "RMD160",

			 "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", "EC2M",

			 "HMAC", "AES", "CAMELLIA", "SEED", "GOST",

			 # EC_NISTP_64_GCC_128
@@ -972,7 +972,7 @@ sub do_defs 
			$a .= ",RC2" if($s =~ /EVP_rc2/);

			$a .= ",RC4" if($s =~ /EVP_rc4/);

			$a .= ",RC5" if($s =~ /EVP_rc5/);

			$a .= ",RIPEMD" if($s =~ /EVP_ripemd/);

			$a .= ",RMD160" if($s =~ /EVP_ripemd/);

			$a .= ",RSA" if($s =~ /EVP_(Open|Seal)(Final|Init)/);

			$a .= ",RSA" if($s =~ /PEM_Seal(Final|Init|Update)/);

			$a .= ",RSA" if($s =~ /RSAPrivateKey/);
@@ -1179,7 +1179,7 @@ sub is_valid 
			if ($keyword eq "MD4" && $no_md4) { return 0; }

			if ($keyword eq "MD5" && $no_md5) { return 0; }

			if ($keyword eq "SHA" && $no_sha) { return 0; }

			if ($keyword eq "RIPEMD" && $no_ripemd) { return 0; }

			if ($keyword eq "RMD160" && $no_ripemd) { return 0; }

			if ($keyword eq "MDC2" && $no_mdc2) { return 0; }

			if ($keyword eq "WHIRLPOOL" && $no_whirlpool) { return 0; }

			if ($keyword eq "RSA" && $no_rsa) { return 0; }

util/ssleay.num

+18 −16
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ SSL_CTX_use_certificate_ASN1 29 EXIST::FUNCTION: 
SSL_CTX_use_certificate_file            30	EXIST::FUNCTION:STDIO

SSL_SESSION_free                        31	EXIST::FUNCTION:

SSL_SESSION_new                         32	EXIST::FUNCTION:

SSL_SESSION_print                       33	EXIST::FUNCTION:BIO

SSL_SESSION_print_fp                    34	EXIST::FUNCTION:FP_API

SSL_SESSION_print                       33	EXIST::FUNCTION:

SSL_SESSION_print_fp                    34	EXIST::FUNCTION:STDIO

SSL_accept                              35	EXIST::FUNCTION:

SSL_add_client_CA                       36	EXIST::FUNCTION:

SSL_alert_desc_string                   37	EXIST::FUNCTION:
@@ -52,14 +52,14 @@ SSL_get_error 58 EXIST::FUNCTION: 
SSL_get_fd                              59	EXIST::FUNCTION:

SSL_get_peer_cert_chain                 60	EXIST::FUNCTION:

SSL_get_peer_certificate                61	EXIST::FUNCTION:

SSL_get_rbio                            63	EXIST::FUNCTION:BIO

SSL_get_rbio                            63	EXIST::FUNCTION:

SSL_get_read_ahead                      64	EXIST::FUNCTION:

SSL_get_shared_ciphers                  65	EXIST::FUNCTION:

SSL_get_ssl_method                      66	EXIST::FUNCTION:

SSL_get_verify_callback                 69	EXIST::FUNCTION:

SSL_get_verify_mode                     70	EXIST::FUNCTION:

SSL_get_version                         71	EXIST::FUNCTION:

SSL_get_wbio                            72	EXIST::FUNCTION:BIO

SSL_get_wbio                            72	EXIST::FUNCTION:

SSL_load_client_CA_file                 73	EXIST::FUNCTION:STDIO

SSL_load_error_strings                  74	EXIST::FUNCTION:

SSL_new                                 75	EXIST::FUNCTION:
@@ -70,7 +70,7 @@ SSL_renegotiate 79 EXIST::FUNCTION: 
SSL_rstate_string                       80	EXIST::FUNCTION:

SSL_rstate_string_long                  81	EXIST::FUNCTION:

SSL_set_accept_state                    82	EXIST::FUNCTION:

SSL_set_bio                             83	EXIST::FUNCTION:BIO

SSL_set_bio                             83	EXIST::FUNCTION:

SSL_set_cipher_list                     84	EXIST::FUNCTION:

SSL_set_client_CA_list                  85	EXIST::FUNCTION:

SSL_set_connect_state                   86	EXIST::FUNCTION:
@@ -106,17 +106,17 @@ SSLv3_method 117 EXIST::FUNCTION:SSL3_METHOD 
SSLv3_server_method                     118	EXIST::FUNCTION:SSL3_METHOD

d2i_SSL_SESSION                         119	EXIST::FUNCTION:

i2d_SSL_SESSION                         120	EXIST::FUNCTION:

BIO_f_ssl                               121	EXIST::FUNCTION:BIO

BIO_new_ssl                             122	EXIST::FUNCTION:BIO

BIO_f_ssl                               121	EXIST::FUNCTION:

BIO_new_ssl                             122	EXIST::FUNCTION:

BIO_proxy_ssl_copy_session_id           123	NOEXIST::FUNCTION:

BIO_ssl_copy_session_id                 124	EXIST::FUNCTION:BIO

BIO_ssl_copy_session_id                 124	EXIST::FUNCTION:

SSL_do_handshake                        125	EXIST::FUNCTION:

SSL_get_privatekey                      126	EXIST::FUNCTION:

SSL_get_current_cipher                  127	EXIST::FUNCTION:

SSL_CIPHER_get_bits                     128	EXIST::FUNCTION:

SSL_CIPHER_get_version                  129	EXIST::FUNCTION:

SSL_CIPHER_get_name                     130	EXIST::FUNCTION:

BIO_ssl_shutdown                        131	EXIST::FUNCTION:BIO

BIO_ssl_shutdown                        131	EXIST::FUNCTION:

SSL_SESSION_cmp                         132	NOEXIST::FUNCTION:

SSL_SESSION_hash                        133	NOEXIST::FUNCTION:

SSL_SESSION_get_time                    134	EXIST::FUNCTION:
@@ -152,8 +152,8 @@ SSL_get_ex_new_index 169 EXIST::FUNCTION: 
TLSv1_method                            170	EXIST::FUNCTION:

TLSv1_server_method                     171	EXIST::FUNCTION:

TLSv1_client_method                     172	EXIST::FUNCTION:

BIO_new_buffer_ssl_connect              173	EXIST::FUNCTION:BIO

BIO_new_ssl_connect                     174	EXIST::FUNCTION:BIO

BIO_new_buffer_ssl_connect              173	EXIST::FUNCTION:

BIO_new_ssl_connect                     174	EXIST::FUNCTION:

SSL_get_ex_data_X509_STORE_CTX_idx      175	EXIST:!VMS:FUNCTION:

SSL_get_ex_d_X509_STORE_CTX_idx         175	EXIST:VMS:FUNCTION:

SSL_CTX_set_tmp_dh_callback             176	EXIST::FUNCTION:DH
@@ -250,11 +250,11 @@ SSL_get_psk_identity_hint 297 EXIST::FUNCTION:PSK 
SSL_set_psk_server_callback             298	EXIST::FUNCTION:PSK

SSL_use_psk_identity_hint               299	EXIST::FUNCTION:PSK

SSL_set_psk_client_callback             300	EXIST::FUNCTION:PSK

PEM_read_SSL_SESSION                    301	EXIST:!WIN16:FUNCTION:

PEM_read_SSL_SESSION                    301	EXIST::FUNCTION:

PEM_read_bio_SSL_SESSION                302	EXIST::FUNCTION:

SSL_CTX_set_psk_server_callback         303	EXIST::FUNCTION:PSK

SSL_get_psk_identity                    304	EXIST::FUNCTION:PSK

PEM_write_SSL_SESSION                   305	EXIST:!WIN16:FUNCTION:

PEM_write_SSL_SESSION                   305	EXIST::FUNCTION:

SSL_set_session_ticket_ext              306	EXIST::FUNCTION:

SSL_set_session_secret_cb               307	EXIST::FUNCTION:

SSL_set_session_ticket_ext_cb           308	EXIST::FUNCTION:
@@ -333,7 +333,8 @@ SSL_CTX_set_srv_supp_data 371 NOEXIST::FUNCTION: 
SSL_CONF_cmd_argv                       372	EXIST::FUNCTION:

DTLSv1_2_server_method                  373	EXIST::FUNCTION:

SSL_COMP_set0_compress_methods          374	NOEXIST::FUNCTION:

SSL_COMP_set0_compression_methods       374	EXIST::FUNCTION:COMP

SSL_COMP_set0_compression_methods       374	EXIST:!VMS:FUNCTION:COMP

SSL_COMP_set0_compr_methods             374	EXIST:VMS:FUNCTION:COMP

SSL_CTX_set_cert_cb                     375	EXIST::FUNCTION:

SSL_CTX_add_client_custom_ext           376	EXIST::FUNCTION:TLSEXT

SSL_is_server                           377	EXIST::FUNCTION:
@@ -366,10 +367,11 @@ DTLSv1_2_method 404 EXIST::FUNCTION: 
DTLS_server_method                      405	EXIST::FUNCTION:

SSL_CTX_use_serverinfo_file             406	EXIST::FUNCTION:STDIO,TLSEXT

SSL_COMP_free_compress_methods          407	NOEXIST::FUNCTION:

SSL_COMP_free_compression_methods       407	EXIST::FUNCTION:COMP

SSL_COMP_free_compression_methods       407	EXIST:!VMS:FUNCTION:COMP

SSL_COMP_free_compr_methods             407	EXIST:VMS:FUNCTION:COMP

SSL_extension_supported                 409	EXIST::FUNCTION:TLSEXT

SSL_CTX_get_security_callback           410	EXIST::FUNCTION:

SSL_SESSION_print_keylog                411	EXIST::FUNCTION:BIO

SSL_SESSION_print_keylog                411	EXIST::FUNCTION:

SSL_CTX_set_not_resumable_session_callback 412	EXIST:!VMS:FUNCTION:

SSL_CTX_set_not_resumbl_sess_cb         412	EXIST:VMS:FUNCTION:

SSL_get0_security_ex_data               413	EXIST::FUNCTION: