recognise no-sctp

2 files changed, 105 insertions, 98 deletions

diff --git a/util/libeay.num b/util/libeay.num
index a168a11626..62df747e35 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4304,101 +4304,107 @@ EC_GFp_nistp256_method                  4673	EXIST:!WIN32:FUNCTION:EC,EC_NISTP_6
 OPENSSL_stderr                          4674	EXIST::FUNCTION:
 OPENSSL_cpuid_setup                     4675	EXIST::FUNCTION:
 OPENSSL_showfatal                       4676	EXIST::FUNCTION:
-FIPS_selftest                           4677	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_set_error_callbacks                4678	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_drbg_set_check_interval            4679	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_drbg_set_rand_callbacks            4680	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_rsa_sign                           4681	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_rsa_verify_digest                  4682	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_selftest_x931                      4683	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_rsa_sign_digest                    4684	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_ecdsa_verify_digest                4685	EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
-FIPS_drbg_set_callbacks                 4686	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_drbg_free                          4687	EXIST:OPENSSL_FIPS:FUNCTION:
-DH_get_1024_160                         4688	EXIST::FUNCTION:DH
-FIPS_dsa_sign_digest                    4689	EXIST:OPENSSL_FIPS:FUNCTION:DSA
-FIPS_x931_seed                          4690	EXIST:OPENSSL_FIPS:FUNCTION:
-ASN1_SCTX_get_flags                     4691	EXIST::FUNCTION:
-FIPS_dsa_verify_ctx                     4692	EXIST:OPENSSL_FIPS:FUNCTION:DSA
-FIPS_drbg_get_strength                  4693	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_drbg_set_reseed_interval           4694	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_module_version                     4695	EXIST:OPENSSL_FIPS:FUNCTION:
-fips_set_selftest_fail                  4696	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_get_default_drbg                   4697	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_x931_set_dt                        4698	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_get_cipherbynid                    4699	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_dsa_sign_ctx                       4700	EXIST:OPENSSL_FIPS:FUNCTION:DSA
-X509_VERIFY_PARAM_get_count             4701	EXIST::FUNCTION:
-FIPS_ecdsa_sign                         4702	EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
-FIPS_rand_strength                      4703	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_module_mode_set                    4704	EXIST:OPENSSL_FIPS:FUNCTION:
-fips_check_rsa_prng                     4705	EXIST:OPENSSL_FIPS:FUNCTION:
-DH_compute_key_padded                   4706	EXIST::FUNCTION:DH
-FIPS_x931_stick                         4707	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_drbg_stick                         4708	EXIST:OPENSSL_FIPS:FUNCTION:
-X509_VERIFY_PARAM_get0_name             4709	EXIST::FUNCTION:
-FIPS_drbg_generate                      4710	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_rsa_verify                         4711	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_ecdsa_verify                       4712	EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
-FIPS_drbg_instantiate                   4713	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_rand_set_method                    4714	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_ecdsa_verify_ctx                   4715	EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
-FIPS_selftest_ecdh                      4716	EXIST:OPENSSL_FIPS:FUNCTION:
-ASN1_SCTX_get_template                  4717	EXIST::FUNCTION:
-FIPS_rand_set_bits                      4718	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_module_mode                        4719	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_selftest_drbg                      4720	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_set_malloc_callbacks               4721	EXIST:OPENSSL_FIPS:FUNCTION:
-ASN1_SCTX_set_app_data                  4722	EXIST::FUNCTION:
-ASN1_SCTX_free                          4723	EXIST::FUNCTION:
-FIPS_drbg_init                          4724	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_drbg_health_check                  4725	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_x931_bytes                         4726	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_dsa_sign                           4727	EXIST:OPENSSL_FIPS:FUNCTION:DSA
-FIPS_rand_get_method                    4728	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_get_timevec                        4729	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_selftest_drbg_all                  4730	EXIST:OPENSSL_FIPS:FUNCTION:
-OPENSSL_gmtime_diff                     4731	EXIST::FUNCTION:
-X509_VERIFY_PARAM_get0                  4732	EXIST::FUNCTION:
-fips_check_rsa                          4733	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_get_digestbynid                    4734	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_drbg_new                           4735	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_dsa_verify_digest                  4736	EXIST:OPENSSL_FIPS:FUNCTION:DSA
-FIPS_x931_reset                         4737	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_selftest_aes_gcm                   4738	EXIST:OPENSSL_FIPS:FUNCTION:
-ASN1_SCTX_get_item                      4739	EXIST::FUNCTION:
-ASN1_SCTX_get_app_data                  4740	EXIST::FUNCTION:
-FIPS_drbg_get_blocklength               4741	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_check_incore_fingerprint           4742	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_rsa_sign_ctx                       4743	EXIST:OPENSSL_FIPS:FUNCTION:
-DH_get_2048_256                         4744	EXIST::FUNCTION:DH
-FIPS_selftest_ecdsa                     4745	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_selftest_cmac                      4746	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_selftest_aes_xts                   4747	EXIST:OPENSSL_FIPS:FUNCTION:
-fips_check_dsa_prng                     4748	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_incore_fingerprint                 4749	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_x931_status                        4750	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_drbg_reseed                        4751	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_drbg_uninstantiate                 4752	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_selftest_aes_ccm                   4753	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_x931_test_mode                     4754	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_module_version_text                4755	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_drbg_set_app_data                  4756	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_ecdsa_sign_ctx                     4757	EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
-FIPS_ecdsa_sign_digest                  4758	EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
-FIPS_x931_set_key                       4759	EXIST:OPENSSL_FIPS:FUNCTION:
-ASN1_SCTX_new                           4760	EXIST::FUNCTION:
-fips_check_ec_prng                      4761	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_x931_method                        4762	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_post_set_callback                  4763	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_set_locking_callbacks              4764	EXIST:OPENSSL_FIPS:FUNCTION:
-BN_nist_mod_func                        4765	EXIST::FUNCTION:
-FIPS_drbg_get_app_data                  4766	EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_dsa_verify                         4767	EXIST:OPENSSL_FIPS:FUNCTION:DSA
-FIPS_rsa_verify_ctx                     4768	EXIST:OPENSSL_FIPS:FUNCTION:
-DH_get_2048_224                         4769	EXIST::FUNCTION:DH
-FIPS_drbg_method                        4770	EXIST:OPENSSL_FIPS:FUNCTION:
-i2d_DHxparams                           4771	EXIST::FUNCTION:DH
-PEM_write_DHxparams                     4772	EXIST:!WIN16:FUNCTION:DH
-d2i_DHxparams                           4773	EXIST::FUNCTION:DH
-PEM_write_bio_DHxparams                 4774	EXIST::FUNCTION:DH
+BIO_new_dgram_sctp                      4677	EXIST::FUNCTION:SCTP
+BIO_dgram_sctp_msg_waiting              4678	EXIST::FUNCTION:SCTP
+BIO_dgram_sctp_wait_for_dry             4679	EXIST::FUNCTION:SCTP
+BIO_s_datagram_sctp                     4680	EXIST::FUNCTION:DGRAM,SCTP
+BIO_dgram_is_sctp                       4681	EXIST::FUNCTION:SCTP
+BIO_dgram_sctp_notification_cb          4682	EXIST::FUNCTION:SCTP
+FIPS_selftest                           4683	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_set_error_callbacks                4684	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_drbg_set_check_interval            4685	EXIST:OPENSSL_FIPS:FUNCTION:
+i2d_DHxparams                           4686	EXIST::FUNCTION:DH
+FIPS_drbg_set_rand_callbacks            4687	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_rsa_sign                           4688	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_rsa_verify_digest                  4689	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_selftest_x931                      4690	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_rsa_sign_digest                    4691	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_ecdsa_verify_digest                4692	EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
+FIPS_drbg_set_callbacks                 4693	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_drbg_free                          4694	EXIST:OPENSSL_FIPS:FUNCTION:
+DH_get_1024_160                         4695	EXIST::FUNCTION:DH
+FIPS_dsa_sign_digest                    4696	EXIST:OPENSSL_FIPS:FUNCTION:DSA
+FIPS_x931_seed                          4697	EXIST:OPENSSL_FIPS:FUNCTION:
+ASN1_SCTX_get_flags                     4698	EXIST::FUNCTION:
+FIPS_dsa_verify_ctx                     4699	EXIST:OPENSSL_FIPS:FUNCTION:DSA
+FIPS_drbg_get_strength                  4700	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_drbg_set_reseed_interval           4701	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_module_version                     4702	EXIST:OPENSSL_FIPS:FUNCTION:
+fips_set_selftest_fail                  4703	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_get_default_drbg                   4704	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_x931_set_dt                        4705	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_get_cipherbynid                    4706	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_dsa_sign_ctx                       4707	EXIST:OPENSSL_FIPS:FUNCTION:DSA
+X509_VERIFY_PARAM_get_count             4708	EXIST::FUNCTION:
+FIPS_ecdsa_sign                         4709	EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
+PEM_write_DHxparams                     4710	EXIST:!WIN16:FUNCTION:DH
+FIPS_rand_strength                      4711	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_module_mode_set                    4712	EXIST:OPENSSL_FIPS:FUNCTION:
+fips_check_rsa_prng                     4713	EXIST:OPENSSL_FIPS:FUNCTION:
+DH_compute_key_padded                   4714	EXIST::FUNCTION:DH
+FIPS_x931_stick                         4715	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_drbg_stick                         4716	EXIST:OPENSSL_FIPS:FUNCTION:
+X509_VERIFY_PARAM_get0_name             4717	EXIST::FUNCTION:
+FIPS_drbg_generate                      4718	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_rsa_verify                         4719	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_ecdsa_verify                       4720	EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
+FIPS_drbg_instantiate                   4721	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_rand_set_method                    4722	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_ecdsa_verify_ctx                   4723	EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
+d2i_DHxparams                           4724	EXIST::FUNCTION:DH
+FIPS_selftest_ecdh                      4725	EXIST:OPENSSL_FIPS:FUNCTION:
+ASN1_SCTX_get_template                  4726	EXIST::FUNCTION:
+FIPS_rand_set_bits                      4727	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_module_mode                        4728	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_selftest_drbg                      4729	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_set_malloc_callbacks               4730	EXIST:OPENSSL_FIPS:FUNCTION:
+ASN1_SCTX_set_app_data                  4731	EXIST::FUNCTION:
+ASN1_SCTX_free                          4732	EXIST::FUNCTION:
+FIPS_drbg_init                          4733	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_drbg_health_check                  4734	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_x931_bytes                         4735	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_dsa_sign                           4736	EXIST:OPENSSL_FIPS:FUNCTION:DSA
+FIPS_rand_get_method                    4737	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_get_timevec                        4738	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_selftest_drbg_all                  4739	EXIST:OPENSSL_FIPS:FUNCTION:
+OPENSSL_gmtime_diff                     4740	EXIST::FUNCTION:
+X509_VERIFY_PARAM_get0                  4741	EXIST::FUNCTION:
+fips_check_rsa                          4742	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_get_digestbynid                    4743	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_drbg_new                           4744	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_dsa_verify_digest                  4745	EXIST:OPENSSL_FIPS:FUNCTION:DSA
+FIPS_x931_reset                         4746	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_selftest_aes_gcm                   4747	EXIST:OPENSSL_FIPS:FUNCTION:
+ASN1_SCTX_get_item                      4748	EXIST::FUNCTION:
+ASN1_SCTX_get_app_data                  4749	EXIST::FUNCTION:
+FIPS_drbg_get_blocklength               4750	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_check_incore_fingerprint           4751	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_rsa_sign_ctx                       4752	EXIST:OPENSSL_FIPS:FUNCTION:
+DH_get_2048_256                         4753	EXIST::FUNCTION:DH
+FIPS_selftest_ecdsa                     4754	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_selftest_cmac                      4755	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_selftest_aes_xts                   4756	EXIST:OPENSSL_FIPS:FUNCTION:
+fips_check_dsa_prng                     4757	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_incore_fingerprint                 4758	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_x931_status                        4759	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_drbg_reseed                        4760	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_drbg_uninstantiate                 4761	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_selftest_aes_ccm                   4762	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_x931_test_mode                     4763	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_module_version_text                4764	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_drbg_set_app_data                  4765	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_ecdsa_sign_ctx                     4766	EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
+FIPS_ecdsa_sign_digest                  4767	EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
+FIPS_x931_set_key                       4768	EXIST:OPENSSL_FIPS:FUNCTION:
+ASN1_SCTX_new                           4769	EXIST::FUNCTION:
+PEM_write_bio_DHxparams                 4770	EXIST::FUNCTION:DH
+fips_check_ec_prng                      4771	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_x931_method                        4772	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_post_set_callback                  4773	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_set_locking_callbacks              4774	EXIST:OPENSSL_FIPS:FUNCTION:
+BN_nist_mod_func                        4775	EXIST::FUNCTION:
+FIPS_drbg_get_app_data                  4776	EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_dsa_verify                         4777	EXIST:OPENSSL_FIPS:FUNCTION:DSA
+FIPS_rsa_verify_ctx                     4778	EXIST:OPENSSL_FIPS:FUNCTION:
+DH_get_2048_224                         4779	EXIST::FUNCTION:DH
+FIPS_drbg_method                        4780	EXIST:OPENSSL_FIPS:FUNCTION:
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index af039c78ac..b566bbf610 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -1376,6 +1376,7 @@ sub read_options
 		"shlib" => \$shlib,
 		"dll" => \$shlib,
 		"shared" => 0,
+		"no-sctp" => 0,
 		"no-gmp" => 0,
 		"no-rfc3779" => 0,
 		"no-montasm" => 0,