From 27594eeae6f40a402bc3110f06d57975168e74e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 4 Jun 2015 19:20:15 +0200 Subject: ics-openvpn as a submodule! beautiful ics-openvpn is now officially on GitHub, and they track openssl and openvpn as submodules, so it's easier to update everything. Just a git submodule update --recursive. I've also set up soft links to native modules from ics-openvpn in app, so that we don't copy files in Gradle (which was causing problems with the submodules .git* files, not being copied). That makes the repo cleaner. --- app/openssl/openssl.trusty.config | 278 -------------------------------------- 1 file changed, 278 deletions(-) delete mode 100644 app/openssl/openssl.trusty.config (limited to 'app/openssl/openssl.trusty.config') diff --git a/app/openssl/openssl.trusty.config b/app/openssl/openssl.trusty.config deleted file mode 100644 index 9710ad06..00000000 --- a/app/openssl/openssl.trusty.config +++ /dev/null @@ -1,278 +0,0 @@ -CONFIGURE_ARGS_TRUSTY="\ --DL_ENDIAN \ -linux-generic32::: \ -no-camellia \ -no-capieng \ -no-cast \ -no-cms \ -no-comp \ -no-conf \ -no-des \ -no-dso \ -no-dtls1 \ -no-err \ -no-gost \ -no-gmp \ -no-heartbeats \ -no-idea \ -no-jpake \ -no-krb5 \ -no-locking \ -no-md2 \ -no-md4 \ -no-md5 \ -no-mdc2 \ -no-ocsp \ -no-pem \ -no-pkcs12 \ -no-pqueue \ -no-rc2 \ -no-rc4 \ -no-rc5 \ -no-rc5 \ -no-rdrand \ -no-rfc3779 \ -no-ripemd \ -no-rsax \ -no-sctp \ -no-seed \ -no-sha0 \ -no-srp \ -no-ssl \ -no-static_engine \ -no-store \ -no-threads \ -no-ts \ -no-txt_db \ -no-ui \ -no-whirlpool \ -" - -# Trusty-specific compiler defines for crypto/ library. -# -OPENSSL_CRYPTO_TRUSTY_DEFINES="\ -GETPID_IS_MEANINGLESS \ -NO_WINDOWS_BRAINDEATH \ -" - -OPENSSL_CRYPTO_TRUSTY_DEFINES_arm="\ -OPENSSL_BN_ASM_GF2m \ -OPENSSL_BN_ASM_MONT \ -GHASH_ASM \ -AES_ASM \ -SHA1_ASM \ -SHA256_ASM \ -SHA512_ASM \ -" - -OPENSSL_CRYPTO_TRUSTY_DEFINES_mips="" - -OPENSSL_CRYPTO_TRUSTY_DEFINES_x86="" - -OPENSSL_CRYPTO_TRUSTY_DEFINES_x86_64="" - -OPENSSL_CRYPTO_TRUSTY_INCLUDES="\ -. \ -include \ -crypto \ -crypto/asn1 \ -crypto/evp \ -crypto/modes \ -include \ -include/openssl \ -" - -OPENSSL_CRYPTO_TRUSTY_SOURCES="\ -crypto/aes/aes_cbc.c \ -crypto/aes/aes_misc.c \ -crypto/asn1/a_bitstr.c \ -crypto/asn1/a_d2i_fp.c \ -crypto/asn1/a_int.c \ -crypto/asn1/ameth_lib.c \ -crypto/asn1/a_object.c \ -crypto/asn1/a_octet.c \ -crypto/asn1/asn1_lib.c \ -crypto/asn1/asn_pack.c \ -crypto/asn1/a_type.c \ -crypto/asn1/d2i_pr.c \ -crypto/asn1/f_int.c \ -crypto/asn1/i2d_pr.c \ -crypto/asn1/p8_pkey.c \ -crypto/asn1/tasn_dec.c \ -crypto/asn1/tasn_enc.c \ -crypto/asn1/tasn_fre.c \ -crypto/asn1/tasn_new.c \ -crypto/asn1/tasn_typ.c \ -crypto/asn1/tasn_utl.c \ -crypto/asn1/t_pkey.c \ -crypto/asn1/t_x509.c \ -crypto/asn1/x_algor.c \ -crypto/asn1/x_attrib.c \ -crypto/asn1/x_bignum.c \ -crypto/asn1/x_long.c \ -crypto/asn1/x_pubkey.c \ -crypto/asn1/x_sig.c \ -crypto/bio/bio_lib.c \ -crypto/bio/b_print.c \ -crypto/bio/bss_mem.c \ -crypto/bn/bn_add.c \ -crypto/bn/bn_asm.c \ -crypto/bn/bn_blind.c \ -crypto/bn/bn_ctx.c \ -crypto/bn/bn_div.c \ -crypto/bn/bn_exp2.c \ -crypto/bn/bn_exp.c \ -crypto/bn/bn_gcd.c \ -crypto/bn/bn_gf2m.c \ -crypto/bn/bn_kron.c \ -crypto/bn/bn_lib.c \ -crypto/bn/bn_mod.c \ -crypto/bn/bn_mont.c \ -crypto/bn/bn_mul.c \ -crypto/bn/bn_nist.c \ -crypto/bn/bn_prime.c \ -crypto/bn/bn_print.c \ -crypto/bn/bn_rand.c \ -crypto/bn/bn_recp.c \ -crypto/bn/bn_shift.c \ -crypto/bn/bn_sqr.c \ -crypto/bn/bn_sqrt.c \ -crypto/bn/bn_word.c \ -crypto/buffer/buffer.c \ -crypto/buffer/buf_str.c \ -crypto/cmac/cmac.c \ -crypto/cmac/cm_ameth.c \ -crypto/cmac/cm_pmeth.c \ -Crypto-config.mk \ -crypto/cryptlib.c \ -crypto/dh/dh_ameth.c \ -crypto/dh/dh_asn1.c \ -crypto/dh/dh_check.c \ -crypto/dh/dh_gen.c \ -crypto/dh/dh_key.c \ -crypto/dh/dh_lib.c \ -crypto/dh/dh_pmeth.c \ -crypto/dsa/dsa_ameth.c \ -crypto/dsa/dsa_asn1.c \ -crypto/dsa/dsa_gen.c \ -crypto/dsa/dsa_key.c \ -crypto/dsa/dsa_lib.c \ -crypto/dsa/dsa_ossl.c \ -crypto/dsa/dsa_pmeth.c \ -crypto/dsa/dsa_sign.c \ -crypto/dsa/dsa_vrf.c \ -crypto/ecdh/ech_key.c \ -crypto/ecdh/ech_lib.c \ -crypto/ecdh/ech_ossl.c \ -crypto/ecdsa/ecs_asn1.c \ -crypto/ecdsa/ecs_lib.c \ -crypto/ecdsa/ecs_ossl.c \ -crypto/ecdsa/ecs_sign.c \ -crypto/ecdsa/ecs_vrf.c \ -crypto/ec/ec2_mult.c \ -crypto/ec/ec2_oct.c \ -crypto/ec/ec2_smpl.c \ -crypto/ec/ec_ameth.c \ -crypto/ec/ec_asn1.c \ -crypto/ec/ec_curve.c \ -crypto/ec/ec_cvt.c \ -crypto/ec/ec_key.c \ -crypto/ec/eck_prn.c \ -crypto/ec/ec_lib.c \ -crypto/ec/ec_mult.c \ -crypto/ec/ec_oct.c \ -crypto/ec/ec_pmeth.c \ -crypto/ec/ecp_mont.c \ -crypto/ec/ecp_nist.c \ -crypto/ec/ecp_oct.c \ -crypto/ec/ec_print.c \ -crypto/ec/ecp_smpl.c \ -crypto/engine/eng_init.c \ -crypto/engine/eng_lib.c \ -crypto/engine/eng_table.c \ -crypto/engine/tb_asnmth.c \ -crypto/engine/tb_cipher.c \ -crypto/engine/tb_dh.c \ -crypto/engine/tb_digest.c \ -crypto/engine/tb_dsa.c \ -crypto/engine/tb_ecdh.c \ -crypto/engine/tb_ecdsa.c \ -crypto/engine/tb_pkmeth.c \ -crypto/engine/tb_rand.c \ -crypto/engine/tb_rsa.c \ -crypto/err/err.c \ -crypto/evp/digest.c \ -crypto/evp/e_aes.c \ -crypto/evp/evp_enc.c \ -crypto/evp/evp_lib.c \ -crypto/evp/evp_pkey.c \ -crypto/evp/m_sha1.c \ -crypto/evp/m_sigver.c \ -crypto/evp/names.c \ -crypto/evp/p_lib.c \ -crypto/evp/pmeth_fn.c \ -crypto/evp/pmeth_gn.c \ -crypto/evp/pmeth_lib.c \ -crypto/ex_data.c \ -crypto/hmac/hmac.c \ -crypto/hmac/hm_ameth.c \ -crypto/hmac/hm_pmeth.c \ -crypto/lhash/lhash.c \ -crypto/mem.c \ -crypto/mem_clr.c \ -crypto/mem_dbg.c \ -crypto/modes/cbc128.c \ -crypto/modes/ctr128.c \ -crypto/objects/obj_dat.c \ -crypto/objects/obj_xref.c \ -crypto/objects/o_names.c \ -crypto/pkcs7/pk7_lib.c \ -crypto/rand/md_rand.c \ -crypto/rand/rand_lib.c \ -crypto/rsa/rsa_ameth.c \ -crypto/rsa/rsa_asn1.c \ -crypto/rsa/rsa_chk.c \ -crypto/rsa/rsa_crpt.c \ -crypto/rsa/rsa_eay.c \ -crypto/rsa/rsa_gen.c \ -crypto/rsa/rsa_lib.c \ -crypto/rsa/rsa_none.c \ -crypto/rsa/rsa_oaep.c \ -crypto/rsa/rsa_pk1.c \ -crypto/rsa/rsa_pmeth.c \ -crypto/rsa/rsa_pss.c \ -crypto/rsa/rsa_saos.c \ -crypto/rsa/rsa_sign.c \ -crypto/rsa/rsa_ssl.c \ -crypto/rsa/rsa_x931.c \ -crypto/sha/sha1_one.c \ -crypto/sha/sha1dgst.c \ -crypto/sha/sha256.c \ -crypto/sha/sha512.c \ -crypto/stack/stack.c \ -crypto/x509v3/v3_utl.c \ -crypto/x509/x_all.c \ -" - -OPENSSL_CRYPTO_TRUSTY_SOURCES_arm="\ -crypto/aes/asm/aes-armv4.S \ -crypto/sha/asm/sha1-armv4-large.S \ -crypto/sha/asm/sha256-armv4.S \ -crypto/sha/asm/sha512-armv4.S \ -crypto/bn/asm/armv4-gf2m.S \ -crypto/bn/asm/armv4-mont.S \ -" - -OPENSSL_CRYPTO_TRUSTY_SOURCES_EXCLUDES_arm="" - -OPENSSL_CRYPTO_TRUSTY_SOURCES_mips="" - -OPENSSL_CRYPTO_TRUSTY_SOURCES_EXCLUDES_mips="" - -OPENSSL_CRYPTO_TRUSTY_SOURCES_x86="" - -OPENSSL_CRYPTO_TRUSTY_SOURCES_EXCLUDES_x86="" - -OPENSSL_CRYPTO_TRUSTY_SOURCES_x86_64="" - -OPENSSL_CRYPTO_TRUSTY_SOURCES_EXCLUDES_x86_64="" -- cgit v1.2.3