openssl: Move to a module and split thirdparty lib

Same rationale as the previous commits.

(cherry picked from commit 422196759f)

Removed the winrt-specific parts.

SConstruct

@@ -136,7 +136,7 @@ opts.Add('xml','XML Save/Load support (yes/no)','yes')
 opts.Add('libpng','libpng library for image loader support (system/builtin)','builtin')
 opts.Add('libwebp','libwebp library for webp module (system/builtin)','builtin')
 opts.Add('builtin_zlib','Use built-in zlib (yes/no)','yes')
-opts.Add('openssl','Use OpenSSL (yes/no/builtin)','no')
+opts.Add('openssl','OpenSSL library for openssl module (system/builtin)','builtin')
 opts.Add('musepack','Musepack Audio (yes/no)','yes')
 opts.Add("CXX", "C++ Compiler")
 opts.Add("CC", "C Compiler")
@@ -326,11 +326,6 @@ if selected_platform in platform_list:
 	if (env['musepack']=='yes'):
 		env.Append(CPPFLAGS=['-DMUSEPACK_ENABLED']);
 
-	#if (env['openssl']!='no'):
-	#	env.Append(CPPFLAGS=['-DOPENSSL_ENABLED']);
-	#	if (env['openssl']=="builtin"):
-	#		env.Append(CPPPATH=['#drivers/builtin_openssl2'])
-
 	if (env["builtin_zlib"]=='yes'):
 		env.Append(CPPPATH=['#drivers/builtin_zlib/zlib'])
 

drivers/SCsub

@@ -14,15 +14,6 @@ SConscript('windows/SCsub');
 SConscript('gles2/SCsub');
 SConscript('gl_context/SCsub');
 
-if (env['openssl']!='no'):
-	env_drivers.Append(CPPFLAGS=['-DOPENSSL_ENABLED']);
-	if (env['openssl']=="builtin"):
-		env_drivers.Append(CPPPATH=['#drivers/builtin_openssl2'])
-		SConscript("builtin_openssl2/SCsub");
-
-	SConscript('openssl/SCsub')
-
-
 SConscript("png/SCsub");
 if (env["builtin_zlib"]=="yes"):
 	SConscript("builtin_zlib/SCsub");

drivers/openssl/SCsub

@@ -1,6 +0,0 @@
-Import('env_drivers')
-Import('env')
-
-env_drivers.add_source_files(env.drivers_sources,"*.cpp")
-env_drivers.add_source_files(env.drivers_sources,"*.c")
-

drivers/register_driver_types.cpp

@@ -67,10 +67,6 @@ static ResourceFormatLoaderVideoStreamTheora* theora_stream_loader = NULL;
 static ResourceFormatLoaderAudioStreamMPC * mpc_stream_loader=NULL;
 #endif
 
-#ifdef OPENSSL_ENABLED
-#include "openssl/register_openssl.h"
-#endif
-
 
 void register_core_driver_types() {
 
@@ -107,11 +103,6 @@ void register_driver_types() {
 
 #endif
 
-#ifdef OPENSSL_ENABLED
-
-	register_openssl();
-#endif
-
 #ifdef THEORA_ENABLED
 	theora_stream_loader = memnew( ResourceFormatLoaderVideoStreamTheora );
 	ResourceLoader::add_resource_format_loader(theora_stream_loader);
@@ -142,10 +133,5 @@ void unregister_driver_types() {
 	memdelete (mpc_stream_loader);
 #endif
 
-#ifdef OPENSSL_ENABLED
-
-	unregister_openssl();
-#endif
-
 	finalize_chibi();
 }

modules/openssl/SCsub

@@ -0,0 +1,677 @@
+Import('env')
+Import('env_modules')
+
+
+# Thirdparty source files
+if (env["openssl"] != "system"): # builtin
+	thirdparty_dir = "#thirdparty/openssl/"
+
+	thirdparty_openssl_sources = [
+		"ssl/t1_lib.c",
+		"ssl/t1_ext.c",
+		"ssl/s3_srvr.c",
+		"ssl/t1_enc.c",
+		"ssl/t1_meth.c",
+		"ssl/s23_clnt.c",
+		"ssl/ssl_asn1.c",
+		"ssl/tls_srp.c",
+		"ssl/kssl.c",
+		"ssl/d1_both.c",
+		"ssl/t1_clnt.c",
+		"ssl/bio_ssl.c",
+		"ssl/d1_srtp.c",
+		"ssl/t1_reneg.c",
+		"ssl/ssl_cert.c",
+		"ssl/s3_lib.c",
+		"ssl/d1_srvr.c",
+		"ssl/s23_meth.c",
+		"ssl/ssl_stat.c",
+		"ssl/ssl_err.c",
+		"ssl/ssl_algs.c",
+		"ssl/s3_cbc.c",
+		"ssl/d1_clnt.c",
+		"ssl/s3_pkt.c",
+		"ssl/d1_meth.c",
+		"ssl/s3_both.c",
+		"ssl/s2_enc.c",
+		"ssl/s3_meth.c",
+		"ssl/s3_enc.c",
+		"ssl/s23_pkt.c",
+		"ssl/s2_pkt.c",
+		"ssl/d1_pkt.c",
+		"ssl/ssl_rsa.c",
+		"ssl/s23_srvr.c",
+		"ssl/s2_meth.c",
+		"ssl/s3_clnt.c",
+		"ssl/s23_lib.c",
+		"ssl/t1_srvr.c",
+		"ssl/ssl_lib.c",
+		"ssl/ssl_txt.c",
+		"ssl/s2_srvr.c",
+		"ssl/ssl_sess.c",
+		"ssl/s2_clnt.c",
+		"ssl/d1_lib.c",
+		"ssl/s2_lib.c",
+		"ssl/ssl_err2.c",
+		"ssl/ssl_ciph.c",
+		"crypto/dsa/dsa_lib.c",
+		"crypto/dsa/dsa_pmeth.c",
+		"crypto/dsa/dsa_ossl.c",
+		"crypto/dsa/dsa_gen.c",
+		"crypto/dsa/dsa_asn1.c",
+		"crypto/dsa/dsa_prn.c",
+		"crypto/dsa/dsa_sign.c",
+		"crypto/dsa/dsa_key.c",
+		"crypto/dsa/dsa_vrf.c",
+		"crypto/dsa/dsa_err.c",
+		"crypto/dsa/dsa_ameth.c",
+		"crypto/dsa/dsa_depr.c",
+		"crypto/x509/x509_lu.c",
+		"crypto/x509/x509cset.c",
+		"crypto/x509/x509_set.c",
+		"crypto/x509/x509_d2.c",
+		"crypto/x509/x509_txt.c",
+		"crypto/x509/x509rset.c",
+		"crypto/x509/by_dir.c",
+		"crypto/x509/x509_vpm.c",
+		"crypto/x509/x509_vfy.c",
+		"crypto/x509/x509_trs.c",
+		"crypto/x509/by_file.c",
+		"crypto/x509/x509_obj.c",
+		"crypto/x509/x509spki.c",
+		"crypto/x509/x509_v3.c",
+		"crypto/x509/x509_req.c",
+		"crypto/x509/x509_att.c",
+		"crypto/x509/x_all.c",
+		"crypto/x509/x509_ext.c",
+		"crypto/x509/x509type.c",
+		"crypto/x509/x509_def.c",
+		"crypto/x509/x509_err.c",
+		"crypto/x509/x509name.c",
+		"crypto/x509/x509_r2x.c",
+		"crypto/x509/x509_cmp.c",
+		"crypto/asn1/x_pkey.c",
+		"crypto/asn1/a_gentm.c",
+		"crypto/asn1/x_sig.c",
+		"crypto/asn1/t_req.c",
+		"crypto/asn1/t_pkey.c",
+		"crypto/asn1/p8_pkey.c",
+		"crypto/asn1/a_i2d_fp.c",
+		"crypto/asn1/x_val.c",
+		"crypto/asn1/f_string.c",
+		"crypto/asn1/p5_pbe.c",
+		"crypto/asn1/bio_ndef.c",
+		"crypto/asn1/a_bool.c",
+		"crypto/asn1/asn1_gen.c",
+		"crypto/asn1/x_algor.c",
+		"crypto/asn1/bio_asn1.c",
+		"crypto/asn1/asn_mime.c",
+		"crypto/asn1/t_x509.c",
+		"crypto/asn1/a_strex.c",
+		"crypto/asn1/x_nx509.c",
+		"crypto/asn1/asn1_err.c",
+		"crypto/asn1/x_crl.c",
+		"crypto/asn1/a_print.c",
+		"crypto/asn1/a_type.c",
+		"crypto/asn1/tasn_new.c",
+		"crypto/asn1/n_pkey.c",
+		"crypto/asn1/x_bignum.c",
+		"crypto/asn1/asn_pack.c",
+		"crypto/asn1/evp_asn1.c",
+		"crypto/asn1/t_bitst.c",
+		"crypto/asn1/x_req.c",
+		"crypto/asn1/a_time.c",
+		"crypto/asn1/x_name.c",
+		"crypto/asn1/x_pubkey.c",
+		"crypto/asn1/tasn_typ.c",
+		"crypto/asn1/asn_moid.c",
+		"crypto/asn1/a_utctm.c",
+		"crypto/asn1/asn1_lib.c",
+		"crypto/asn1/x_x509a.c",
+		"crypto/asn1/a_set.c",
+		"crypto/asn1/t_crl.c",
+		"crypto/asn1/p5_pbev2.c",
+		"crypto/asn1/tasn_enc.c",
+		"crypto/asn1/a_mbstr.c",
+		"crypto/asn1/tasn_dec.c",
+		"crypto/asn1/x_x509.c",
+		"crypto/asn1/a_octet.c",
+		"crypto/asn1/x_long.c",
+		"crypto/asn1/a_bytes.c",
+		"crypto/asn1/t_x509a.c",
+		"crypto/asn1/a_enum.c",
+		"crypto/asn1/a_int.c",
+		"crypto/asn1/tasn_prn.c",
+		"crypto/asn1/i2d_pr.c",
+		"crypto/asn1/a_utf8.c",
+		"crypto/asn1/t_spki.c",
+		"crypto/asn1/a_digest.c",
+		"crypto/asn1/a_dup.c",
+		"crypto/asn1/i2d_pu.c",
+		"crypto/asn1/a_verify.c",
+		"crypto/asn1/f_enum.c",
+		"crypto/asn1/a_sign.c",
+		"crypto/asn1/d2i_pr.c",
+		"crypto/asn1/asn1_par.c",
+		"crypto/asn1/x_spki.c",
+		"crypto/asn1/a_d2i_fp.c",
+		"crypto/asn1/f_int.c",
+		"crypto/asn1/x_exten.c",
+		"crypto/asn1/tasn_utl.c",
+		"crypto/asn1/nsseq.c",
+		"crypto/asn1/a_bitstr.c",
+		"crypto/asn1/x_info.c",
+		"crypto/asn1/a_strnid.c",
+		"crypto/asn1/a_object.c",
+		"crypto/asn1/tasn_fre.c",
+		"crypto/asn1/d2i_pu.c",
+		"crypto/asn1/ameth_lib.c",
+		"crypto/asn1/x_attrib.c",
+		"crypto/evp/m_sha.c",
+		"crypto/evp/e_camellia.c",
+		"crypto/evp/e_aes.c",
+		"crypto/evp/bio_b64.c",
+		"crypto/evp/m_sigver.c",
+		"crypto/evp/m_wp.c",
+		"crypto/evp/m_sha1.c",
+		"crypto/evp/p_seal.c",
+		"crypto/evp/c_alld.c",
+		"crypto/evp/p5_crpt.c",
+		"crypto/evp/e_rc4.c",
+		"crypto/evp/m_ecdsa.c",
+		"crypto/evp/bio_enc.c",
+		"crypto/evp/e_des3.c",
+		"crypto/evp/m_null.c",
+		"crypto/evp/bio_ok.c",
+		"crypto/evp/pmeth_gn.c",
+		"crypto/evp/e_rc5.c",
+		"crypto/evp/e_rc2.c",
+		"crypto/evp/p_dec.c",
+		"crypto/evp/p_verify.c",
+		"crypto/evp/e_rc4_hmac_md5.c",
+		"crypto/evp/pmeth_lib.c",
+		"crypto/evp/m_ripemd.c",
+		"crypto/evp/m_md5.c",
+		"crypto/evp/e_bf.c",
+		"crypto/evp/p_enc.c",
+		"crypto/evp/m_dss.c",
+		"crypto/evp/bio_md.c",
+		"crypto/evp/evp_pbe.c",
+		"crypto/evp/e_seed.c",
+		"crypto/evp/e_cast.c",
+		"crypto/evp/p_open.c",
+		"crypto/evp/p5_crpt2.c",
+		"crypto/evp/m_dss1.c",
+		"crypto/evp/names.c",
+		"crypto/evp/evp_acnf.c",
+		"crypto/evp/e_des.c",
+		"crypto/evp/evp_cnf.c",
+		"crypto/evp/evp_lib.c",
+		"crypto/evp/digest.c",
+		"crypto/evp/evp_err.c",
+		"crypto/evp/evp_enc.c",
+		"crypto/evp/e_old.c",
+		"crypto/evp/c_all.c",
+		"crypto/evp/m_md2.c",
+		"crypto/evp/e_xcbc_d.c",
+		"crypto/evp/pmeth_fn.c",
+		"crypto/evp/p_lib.c",
+		"crypto/evp/evp_key.c",
+		"crypto/evp/encode.c",
+		"crypto/evp/e_aes_cbc_hmac_sha1.c",
+		"crypto/evp/e_aes_cbc_hmac_sha256.c",
+		"crypto/evp/m_mdc2.c",
+		"crypto/evp/e_null.c",
+		"crypto/evp/p_sign.c",
+		"crypto/evp/e_idea.c",
+		"crypto/evp/c_allc.c",
+		"crypto/evp/evp_pkey.c",
+		"crypto/evp/m_md4.c",
+		"crypto/ex_data.c",
+		"crypto/pkcs12/p12_p8e.c",
+		"crypto/pkcs12/p12_crt.c",
+		"crypto/pkcs12/p12_utl.c",
+		"crypto/pkcs12/p12_attr.c",
+		"crypto/pkcs12/p12_npas.c",
+		"crypto/pkcs12/p12_decr.c",
+		"crypto/pkcs12/p12_init.c",
+		"crypto/pkcs12/p12_kiss.c",
+		"crypto/pkcs12/p12_add.c",
+		"crypto/pkcs12/p12_p8d.c",
+		"crypto/pkcs12/p12_mutl.c",
+		"crypto/pkcs12/p12_crpt.c",
+		"crypto/pkcs12/pk12err.c",
+		"crypto/pkcs12/p12_asn.c",
+		"crypto/pkcs12/p12_key.c",
+		"crypto/ecdh/ech_key.c",
+		"crypto/ecdh/ech_ossl.c",
+		"crypto/ecdh/ech_lib.c",
+		"crypto/ecdh/ech_err.c",
+		"crypto/ecdh/ech_kdf.c",
+		"crypto/o_str.c",
+		"crypto/conf/conf_api.c",
+		"crypto/conf/conf_err.c",
+		"crypto/conf/conf_def.c",
+		"crypto/conf/conf_lib.c",
+		"crypto/conf/conf_mall.c",
+		"crypto/conf/conf_sap.c",
+		"crypto/conf/conf_mod.c",
+		"crypto/ebcdic.c",
+		"crypto/ecdsa/ecs_lib.c",
+		"crypto/ecdsa/ecs_asn1.c",
+		"crypto/ecdsa/ecs_ossl.c",
+		"crypto/ecdsa/ecs_vrf.c",
+		"crypto/ecdsa/ecs_sign.c",
+		"crypto/ecdsa/ecs_err.c",
+		"crypto/dso/dso_win32.c",
+		"crypto/dso/dso_lib.c",
+		"crypto/dso/dso_dlfcn.c",
+		"crypto/dso/dso_dl.c",
+		"crypto/dso/dso_beos.c",
+		"crypto/dso/dso_null.c",
+		"crypto/dso/dso_vms.c",
+		"crypto/dso/dso_err.c",
+		"crypto/dso/dso_openssl.c",
+		"crypto/cryptlib.c",
+		"crypto/md5/md5_one.c",
+		"crypto/md5/md5_dgst.c",
+		"crypto/pkcs7/pkcs7err.c",
+		"crypto/pkcs7/pk7_smime.c",
+		"crypto/pkcs7/bio_pk7.c",
+		"crypto/pkcs7/pk7_mime.c",
+		"crypto/pkcs7/pk7_lib.c",
+		"crypto/pkcs7/pk7_asn1.c",
+		"crypto/pkcs7/pk7_doit.c",
+		"crypto/pkcs7/pk7_attr.c",
+		"crypto/md4/md4_one.c",
+		"crypto/md4/md4_dgst.c",
+		"crypto/o_dir.c",
+		"crypto/buffer/buf_err.c",
+		"crypto/buffer/buf_str.c",
+		"crypto/buffer/buffer.c",
+		"crypto/cms/cms_lib.c",
+		"crypto/cms/cms_io.c",
+		"crypto/cms/cms_err.c",
+		"crypto/cms/cms_dd.c",
+		"crypto/cms/cms_smime.c",
+		"crypto/cms/cms_att.c",
+		"crypto/cms/cms_pwri.c",
+		"crypto/cms/cms_cd.c",
+		"crypto/cms/cms_sd.c",
+		"crypto/cms/cms_asn1.c",
+		"crypto/cms/cms_env.c",
+		"crypto/cms/cms_enc.c",
+		"crypto/cms/cms_ess.c",
+		"crypto/cms/cms_kari.c",
+		"crypto/mem_dbg.c",
+		"crypto/uid.c",
+		"crypto/stack/stack.c",
+		"crypto/ec/ec_ameth.c",
+		"crypto/ec/ec_err.c",
+		"crypto/ec/ec_lib.c",
+		"crypto/ec/ec_curve.c",
+		"crypto/ec/ec_oct.c",
+		"crypto/ec/ec_asn1.c",
+		"crypto/ec/ecp_oct.c",
+		"crypto/ec/ec_print.c",
+		"crypto/ec/ec2_smpl.c",
+		"crypto/ec/ecp_nistp224.c",
+		"crypto/ec/ec2_oct.c",
+		"crypto/ec/eck_prn.c",
+		"crypto/ec/ec_key.c",
+		"crypto/ec/ecp_nist.c",
+		"crypto/ec/ec_check.c",
+		"crypto/ec/ecp_smpl.c",
+		"crypto/ec/ec2_mult.c",
+		"crypto/ec/ecp_mont.c",
+		"crypto/ec/ecp_nistp521.c",
+		"crypto/ec/ec_mult.c",
+		"crypto/ec/ecp_nistputil.c",
+		"crypto/ec/ec_pmeth.c",
+		"crypto/ec/ec_cvt.c",
+		"crypto/ec/ecp_nistp256.c",
+		"crypto/krb5/krb5_asn.c",
+		"crypto/hmac/hmac.c",
+		"crypto/hmac/hm_ameth.c",
+		"crypto/hmac/hm_pmeth.c",
+		"crypto/comp/c_rle.c",
+		"crypto/comp/c_zlib.c",
+		"crypto/comp/comp_lib.c",
+		"crypto/comp/comp_err.c",
+		"crypto/des/fcrypt.c",
+		"crypto/des/str2key.c",
+		"crypto/des/cbc_cksm.c",
+		"crypto/des/des_enc.c",
+		"crypto/des/ofb_enc.c",
+		"crypto/des/read2pwd.c",
+		"crypto/des/ecb3_enc.c",
+		"crypto/des/rand_key.c",
+		"crypto/des/cfb64ede.c",
+		"crypto/des/rpc_enc.c",
+		"crypto/des/ofb64ede.c",
+		"crypto/des/qud_cksm.c",
+		"crypto/des/enc_writ.c",
+		"crypto/des/set_key.c",
+		"crypto/des/xcbc_enc.c",
+		"crypto/des/fcrypt_b.c",
+		"crypto/des/ede_cbcm_enc.c",
+		"crypto/des/des_old2.c",
+		"crypto/des/cfb_enc.c",
+		"crypto/des/ecb_enc.c",
+		"crypto/des/enc_read.c",
+		"crypto/des/des_old.c",
+		"crypto/des/ofb64enc.c",
+		"crypto/des/pcbc_enc.c",
+		"crypto/des/cbc_enc.c",
+		"crypto/des/cfb64enc.c",
+		"crypto/lhash/lh_stats.c",
+		"crypto/lhash/lhash.c",
+		"crypto/x509v3/v3_genn.c",
+		"crypto/x509v3/pcy_cache.c",
+		"crypto/x509v3/v3_sxnet.c",
+		"crypto/x509v3/v3_scts.c",
+		"crypto/x509v3/v3err.c",
+		"crypto/x509v3/v3_conf.c",
+		"crypto/x509v3/v3_utl.c",
+		"crypto/x509v3/v3_akeya.c",
+		"crypto/x509v3/v3_lib.c",
+		"crypto/x509v3/pcy_lib.c",
+		"crypto/x509v3/v3_cpols.c",
+		"crypto/x509v3/v3_ia5.c",
+		"crypto/x509v3/v3_bitst.c",
+		"crypto/x509v3/v3_skey.c",
+		"crypto/x509v3/v3_info.c",
+		"crypto/x509v3/v3_asid.c",
+		"crypto/x509v3/pcy_tree.c",
+		"crypto/x509v3/v3_pcons.c",
+		"crypto/x509v3/v3_bcons.c",
+		"crypto/x509v3/v3_pku.c",
+		"crypto/x509v3/v3_ocsp.c",
+		"crypto/x509v3/pcy_map.c",
+		"crypto/x509v3/v3_ncons.c",
+		"crypto/x509v3/v3_purp.c",
+		"crypto/x509v3/v3_enum.c",
+		"crypto/x509v3/v3_pmaps.c",
+		"crypto/x509v3/pcy_node.c",
+		"crypto/x509v3/v3_pcia.c",
+		"crypto/x509v3/v3_crld.c",
+		"crypto/x509v3/v3_pci.c",
+		"crypto/x509v3/v3_akey.c",
+		"crypto/x509v3/v3_addr.c",
+		"crypto/x509v3/v3_int.c",
+		"crypto/x509v3/v3_alt.c",
+		"crypto/x509v3/v3_extku.c",
+		"crypto/x509v3/v3_prn.c",
+		"crypto/x509v3/pcy_data.c",
+		"crypto/aes/aes_ofb.c",
+		"crypto/aes/aes_ctr.c",
+		"crypto/aes/aes_ecb.c",
+		"crypto/aes/aes_cfb.c",
+		"crypto/aes/aes_wrap.c",
+		"crypto/aes/aes_ige.c",
+		"crypto/aes/aes_misc.c",
+		"crypto/pqueue/pqueue.c",
+		"crypto/sha/sha_one.c",
+		"crypto/sha/sha_dgst.c",
+		"crypto/sha/sha512.c",
+		"crypto/sha/sha1_one.c",
+		"crypto/sha/sha1dgst.c",
+		"crypto/sha/sha256.c",
+		"crypto/whrlpool/wp_dgst.c",
+		"crypto/objects/obj_xref.c",
+		"crypto/objects/o_names.c",
+		"crypto/objects/obj_err.c",
+		"crypto/objects/obj_dat.c",
+		"crypto/objects/obj_lib.c",
+		"crypto/mem.c",
+		"crypto/fips_ers.c",
+		"crypto/o_fips.c",
+		"crypto/engine/eng_rdrand.c",
+		"crypto/engine/eng_err.c",
+		"crypto/engine/tb_ecdsa.c",
+		"crypto/engine/tb_rsa.c",
+		"crypto/engine/tb_cipher.c",
+		"crypto/engine/tb_dsa.c",
+		"crypto/engine/eng_lib.c",
+		"crypto/engine/tb_asnmth.c",
+		"crypto/engine/tb_ecdh.c",
+		"crypto/engine/tb_dh.c",
+		"crypto/engine/tb_store.c",
+		"crypto/engine/eng_init.c",
+		"crypto/engine/eng_cnf.c",
+		"crypto/engine/eng_all.c",
+		"crypto/engine/tb_digest.c",
+		"crypto/engine/tb_pkmeth.c",
+		"crypto/engine/eng_table.c",
+		"crypto/engine/eng_ctrl.c",
+		"crypto/engine/eng_list.c",
+		"crypto/engine/eng_cryptodev.c",
+		"crypto/engine/eng_pkey.c",
+		"crypto/engine/tb_rand.c",
+		"crypto/engine/eng_openssl.c",
+		"crypto/engine/eng_fat.c",
+		"crypto/engine/eng_dyn.c",
+		"crypto/ts/ts_rsp_verify.c",
+		"crypto/ts/ts_req_print.c",
+		"crypto/ts/ts_verify_ctx.c",
+		"crypto/ts/ts_req_utils.c",
+		"crypto/ts/ts_err.c",
+		"crypto/ts/ts_rsp_print.c",
+		"crypto/ts/ts_rsp_utils.c",
+		"crypto/ts/ts_lib.c",
+		"crypto/ts/ts_conf.c",
+		"crypto/ts/ts_asn1.c",
+		"crypto/ts/ts_rsp_sign.c",
+		"crypto/ocsp/ocsp_ext.c",
+		"crypto/ocsp/ocsp_cl.c",
+		"crypto/ocsp/ocsp_ht.c",
+		"crypto/ocsp/ocsp_lib.c",
+		"crypto/ocsp/ocsp_srv.c",
+		"crypto/ocsp/ocsp_vfy.c",
+		"crypto/ocsp/ocsp_err.c",
+		"crypto/ocsp/ocsp_prn.c",
+		"crypto/ocsp/ocsp_asn.c",
+		"crypto/bf/bf_cfb64.c",
+		"crypto/bf/bf_ecb.c",
+		"crypto/bf/bf_enc.c",
+		"crypto/bf/bf_skey.c",
+		"crypto/bf/bf_ofb64.c",
+		"crypto/idea/i_skey.c",
+		"crypto/idea/i_ofb64.c",
+		"crypto/idea/i_cbc.c",
+		"crypto/idea/i_ecb.c",
+		"crypto/idea/i_cfb64.c",
+		"crypto/cmac/cm_ameth.c",
+		"crypto/cmac/cmac.c",
+		"crypto/cmac/cm_pmeth.c",
+		"crypto/dh/dh_lib.c",
+		"crypto/dh/dh_key.c",
+		"crypto/dh/dh_asn1.c",
+		"crypto/dh/dh_depr.c",
+		"crypto/dh/dh_pmeth.c",
+		"crypto/dh/dh_prn.c",
+		"crypto/dh/dh_gen.c",
+		"crypto/dh/dh_ameth.c",
+		"crypto/dh/dh_check.c",
+		"crypto/dh/dh_err.c",
+		"crypto/dh/dh_kdf.c",
+		"crypto/dh/dh_rfc5114.c",
+		"crypto/modes/ccm128.c",
+		"crypto/modes/ofb128.c",
+		"crypto/modes/cts128.c",
+		"crypto/modes/ctr128.c",
+		"crypto/modes/gcm128.c",
+		"crypto/modes/cbc128.c",
+		"crypto/modes/cfb128.c",
+		"crypto/modes/xts128.c",
+		"crypto/modes/wrap128.c",
+		"crypto/camellia/cmll_cfb.c",
+		"crypto/camellia/cmll_ecb.c",
+		"crypto/camellia/cmll_utl.c",
+		"crypto/camellia/cmll_misc.c",
+		"crypto/camellia/cmll_ofb.c",
+		"crypto/camellia/cmll_ctr.c",
+		"crypto/seed/seed_ecb.c",
+		"crypto/seed/seed_cbc.c",
+		"crypto/seed/seed.c",
+		"crypto/seed/seed_ofb.c",
+		"crypto/seed/seed_cfb.c",
+		"crypto/txt_db/txt_db.c",
+		"crypto/cpt_err.c",
+		"crypto/pem/pem_pk8.c",
+		"crypto/pem/pem_lib.c",
+		"crypto/pem/pem_sign.c",
+		"crypto/pem/pem_all.c",
+		"crypto/pem/pem_info.c",
+		"crypto/pem/pem_pkey.c",
+		"crypto/pem/pem_seal.c",
+		"crypto/pem/pem_err.c",
+		"crypto/pem/pem_xaux.c",
+		"crypto/pem/pvkfmt.c",
+		"crypto/pem/pem_x509.c",
+		"crypto/pem/pem_oth.c",
+		"crypto/rand/rand_lib.c",
+		"crypto/rand/randfile.c",
+		"crypto/rand/rand_os2.c",
+		"crypto/rand/rand_unix.c",
+		"crypto/rand/rand_nw.c",
+		"crypto/rand/md_rand.c",
+		"crypto/rand/rand_err.c",
+		"crypto/rand/rand_win.c",
+		"crypto/rand/rand_egd.c",
+		"crypto/cversion.c",
+		"crypto/cast/c_ecb.c",
+		"crypto/cast/c_skey.c",
+		"crypto/cast/c_ofb64.c",
+		"crypto/cast/c_enc.c",
+		"crypto/cast/c_cfb64.c",
+		"crypto/o_time.c",
+		"crypto/mdc2/mdc2dgst.c",
+		"crypto/mdc2/mdc2_one.c",
+		"crypto/rc4/rc4_utl.c",
+		"crypto/ui/ui_compat.c",
+		"crypto/ui/ui_util.c",
+		"crypto/ui/ui_lib.c",
+		"crypto/ui/ui_err.c",
+		"crypto/ui/ui_openssl.c",
+		"crypto/bio/bf_buff.c",
+		"crypto/bio/bss_null.c",
+		"crypto/bio/bss_acpt.c",
+		"crypto/bio/bss_conn.c",
+		"crypto/bio/bss_fd.c",
+		"crypto/bio/bf_null.c",
+		"crypto/bio/bio_err.c",
+		"crypto/bio/bss_sock.c",
+		"crypto/bio/bss_mem.c",
+		"crypto/bio/b_dump.c",
+		"crypto/bio/b_print.c",
+		"crypto/bio/b_sock.c",
+		"crypto/bio/bss_dgram.c",
+		"crypto/bio/bf_nbio.c",
+		"crypto/bio/bio_lib.c",
+		"crypto/bio/bss_file.c",
+		"crypto/bio/bss_bio.c",
+		"crypto/bio/bss_log.c",
+		"crypto/bio/bio_cb.c",
+		"crypto/o_init.c",
+		"crypto/rc2/rc2_skey.c",
+		"crypto/rc2/rc2_cbc.c",
+		"crypto/rc2/rc2cfb64.c",
+		"crypto/rc2/rc2_ecb.c",
+		"crypto/rc2/rc2ofb64.c",
+		"crypto/bn/bn_x931p.c",
+		"crypto/bn/bn_blind.c",
+		"crypto/bn/bn_gf2m.c",
+		"crypto/bn/bn_const.c",
+		"crypto/bn/bn_sqr.c",
+		"crypto/bn/bn_nist.c",
+		"crypto/bn/bn_rand.c",
+		"crypto/bn/bn_err.c",
+		"crypto/bn/bn_div.c",
+		"crypto/bn/bn_kron.c",
+		"crypto/bn/bn_ctx.c",
+		"crypto/bn/bn_shift.c",
+		"crypto/bn/bn_mod.c",
+		"crypto/bn/bn_exp2.c",
+		"crypto/bn/bn_word.c",
+		"crypto/bn/bn_add.c",
+		"crypto/bn/bn_exp.c",
+		"crypto/bn/bn_mont.c",
+		"crypto/bn/bn_print.c",
+		"crypto/bn/bn_mul.c",
+		"crypto/bn/bn_prime.c",
+		"crypto/bn/bn_depr.c",
+		"crypto/bn/bn_gcd.c",
+		"crypto/bn/bn_mpi.c",
+		"crypto/bn/bn_sqrt.c",
+		"crypto/bn/bn_recp.c",
+		"crypto/bn/bn_lib.c",
+		"crypto/ripemd/rmd_dgst.c",
+		"crypto/ripemd/rmd_one.c",
+		"crypto/rsa/rsa_x931.c",
+		"crypto/rsa/rsa_depr.c",
+		"crypto/rsa/rsa_saos.c",
+		"crypto/rsa/rsa_crpt.c",
+		"crypto/rsa/rsa_pss.c",
+		"crypto/rsa/rsa_oaep.c",
+		"crypto/rsa/rsa_null.c",
+		"crypto/rsa/rsa_gen.c",
+		"crypto/rsa/rsa_prn.c",
+		"crypto/rsa/rsa_pmeth.c",
+		"crypto/rsa/rsa_asn1.c",
+		"crypto/rsa/rsa_ssl.c",
+		"crypto/rsa/rsa_ameth.c",
+		"crypto/rsa/rsa_pk1.c",
+		"crypto/rsa/rsa_err.c",
+		"crypto/rsa/rsa_lib.c",
+		"crypto/rsa/rsa_none.c",
+		"crypto/rsa/rsa_chk.c",
+		"crypto/rsa/rsa_eay.c",
+		"crypto/rsa/rsa_sign.c",
+		"crypto/srp/srp_lib.c",
+		"crypto/srp/srp_vfy.c",
+		"crypto/err/err.c",
+		"crypto/err/err_prn.c",
+		"crypto/err/err_all.c",
+		"crypto/mem_clr.c",
+		"crypto/rc4/rc4_skey.c",
+		"crypto/rc4/rc4_enc.c",
+		"crypto/camellia/camellia.c",
+		"crypto/camellia/cmll_cbc.c",
+		#"crypto/aes/aes_x86core.c",
+		"crypto/aes/aes_core.c",
+		"crypto/aes/aes_cbc.c",
+		"crypto/whrlpool/wp_block.c",
+		"crypto/bn/bn_asm.c",
+	]
+
+	thirdparty_openssl_sources = [thirdparty_dir + file for file in thirdparty_openssl_sources]
+
+	env_modules.add_source_files(env.modules_sources, thirdparty_openssl_sources)
+
+	# FIXME: Clone the environment to make a env_openssl and not pollute the modules env
+	thirdparty_include_paths = [
+		"",
+		"crypto",
+		"crypto/asn1",
+		"crypto/evp",
+		"crypto/modes",
+		"openssl",
+	]
+	env_modules.Append(CPPPATH = [thirdparty_dir + "/" + dir for dir in thirdparty_include_paths])
+
+	env_modules.Append(CPPFLAGS = ["-DOPENSSL_NO_ASM", "-DOPENSSL_THREADS", "-DL_ENDIAN"])
+
+	# Workaround for compilation error with GCC/Clang when -Werror is too greedy (GH-4517)
+	import os
+	import methods
+	if not (os.name=="nt" and methods.msvc_is_detected()): # not Windows and not MSVC
+		env_modules.Append(CFLAGS = ["-Wno-error=implicit-function-declaration"])
+
+
+# Module sources
+env_modules.add_source_files(env.modules_sources, "*.cpp")
+env_modules.add_source_files(env.modules_sources, "*.c")
+
+Export('env_modules')
+Export('env')

modules/openssl/config.py

@@ -0,0 +1,6 @@
+
+def can_build(platform):
+	return True
+
+def configure(env):
+	pass

modules/openssl/curl_hostcheck.c

@@ -46,8 +46,6 @@ be used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization of the copyright holder.
 */
 
-#ifdef OPENSSL_ENABLED
-
 #include "curl_hostcheck.h"
 #include <string.h>
 
@@ -217,5 +215,3 @@ int Tool_Curl_cert_hostcheck(const char *match_pattern, const char *hostname)
     return 1;
   return 0;
 }
-
-#endif

modules/openssl/curl_hostcheck.h

@@ -1,8 +1,6 @@
 #ifndef HEADER_TOOL_CURL_HOSTCHECK_H
 #define HEADER_TOOL_CURL_HOSTCHECK_H
 
-#ifdef OPENSSL_ENABLED
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -37,7 +35,5 @@ int Tool_Curl_cert_hostcheck(const char *match_pattern, const char *hostname);
 }
 #endif
 
-#endif
-
 #endif /* HEADER_CURL_HOSTCHECK_H */
 

modules/openssl/register_types.cpp

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  register_openssl.cpp                                                 */
+/*  register_types.cpp                                                   */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -26,22 +26,17 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#include "register_openssl.h"
+#include "register_types.h"
 
 #include "stream_peer_openssl.h"
-#ifdef OPENSSL_ENABLED
 
-void register_openssl() {
+void register_openssl_types() {
 
 	ObjectTypeDB::register_type<StreamPeerOpenSSL>();
 	StreamPeerOpenSSL::initialize_ssl();
-
 }
 
-void unregister_openssl() {
+void unregister_openssl_types() {
 
 	StreamPeerOpenSSL::finalize_ssl();
-
 }
-#endif
-

modules/openssl/register_types.h

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  register_openssl.h                                                   */
+/*  register_types.h                                                     */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -26,14 +26,5 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#ifndef REGISTER_OPENSSL_H
-#define REGISTER_OPENSSL_H
-
-#ifdef OPENSSL_ENABLED
-
-void register_openssl();
-void unregister_openssl();
-
-#endif
-
-#endif // REGISTER_OPENSSL_H
+void register_openssl_types();
+void unregister_openssl_types();

modules/openssl/stream_peer_openssl.cpp

@@ -26,7 +26,6 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#ifdef OPENSSL_ENABLED
 #include "stream_peer_openssl.h"
 //hostname matching code from curl
 
@@ -645,5 +644,3 @@ void StreamPeerOpenSSL::finalize_ssl(){
 	}
 	certs.clear();
 }
-
-#endif

modules/openssl/stream_peer_openssl.h

@@ -29,9 +29,6 @@
 #ifndef STREAM_PEER_OPEN_SSL_H
 #define STREAM_PEER_OPEN_SSL_H
 
-#ifdef OPENSSL_ENABLED
-
-
 #include <stdio.h> // If you don't know what this is for stop reading now.
 #include "io/stream_peer_ssl.h"
 #include "globals.h"
@@ -109,5 +106,4 @@ public:
 	~StreamPeerOpenSSL();
 };
 
-#endif
 #endif // STREAM_PEER_SSL_H

platform/x11/detect.py

@@ -70,7 +70,7 @@ def get_flags():
 	return [
 	('builtin_zlib', 'no'),
 	('glew', 'yes'),
-	("openssl", "yes"),
+	("openssl", "system"),
 	('freetype','yes'), # use system freetype
 	('libpng', 'system'),
 	#("theora","no"),
@@ -140,7 +140,7 @@ def configure(env):
 	env.ParseConfig('pkg-config xcursor --cflags --libs')
 	env.ParseConfig('pkg-config xrandr --cflags --libs')
 
-	if (env["openssl"]=="yes"):
+	if (env["openssl"] == "system"):
 		env.ParseConfig('pkg-config openssl --cflags --libs')
 
 	if (env["libpng"] == "system"):

thirdparty/README.md

@@ -69,6 +69,17 @@ changes to ensure they build for Javascript/HTML5. Those
 changes are marked with `// -- GODOT --` comments.
 
 
+## openssl
+
+- Upstream: https://www.openssl.org
+- Version: 1.2.0h
+- License: OpenSSL license / BSD-like
+
+Files extracted from the upstream source:
+
+TODO.
+
+
 ## opus
 
 - Upstream: https://opus-codec.org

thirdparty/openssl/LICENSE

@@ -0,0 +1,127 @@
+
+  LICENSE ISSUES
+  ==============
+
+  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
+  the OpenSSL License and the original SSLeay license apply to the toolkit.
+  See below for the actual license texts. Actually both licenses are BSD-style
+  Open Source licenses. In case of any license issues related to OpenSSL
+  please contact openssl-core@openssl.org.
+
+  OpenSSL License
+  ---------------
+
+/* ====================================================================
+ * Copyright (c) 1998-2016 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+