summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ISSUE_TEMPLATE2
-rw-r--r--SConstruct8
-rw-r--r--core/ustring.cpp11
-rw-r--r--core/variant_call.cpp2
-rw-r--r--doc/base/classes.xml28
-rw-r--r--drivers/SCsub15
-rw-r--r--drivers/builtin_openssl2/SCsub1297
-rw-r--r--drivers/gl_context/glew.h4
-rw-r--r--drivers/openssl/SCsub6
-rw-r--r--scene/animation/animation_player.cpp3
-rw-r--r--scene/gui/text_edit.cpp3
-rw-r--r--tools/editor/plugins/animation_player_editor_plugin.cpp32
-rw-r--r--tools/editor/plugins/animation_player_editor_plugin.h4
13 files changed, 745 insertions, 670 deletions
diff --git a/ISSUE_TEMPLATE b/ISSUE_TEMPLATE
index 06fa7b316d..ee78c6c4f6 100644
--- a/ISSUE_TEMPLATE
+++ b/ISSUE_TEMPLATE
@@ -1,4 +1,4 @@
-**Operating system or device:**
+**Operating system or device - Godot version:**
**Issue description** (what happened, and what was expected):
diff --git a/SConstruct b/SConstruct
index a2c5edf5e0..3ea40489be 100644
--- a/SConstruct
+++ b/SConstruct
@@ -307,10 +307,10 @@ 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['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'])
diff --git a/core/ustring.cpp b/core/ustring.cpp
index 573c362389..730f7cfa3b 100644
--- a/core/ustring.cpp
+++ b/core/ustring.cpp
@@ -3629,13 +3629,14 @@ String String::percent_decode() const {
CharString pe;
- for(int i=0;i<length();i++) {
-
- uint8_t c=operator[](i);
+ CharString cs = utf8();
+ for(int i=0;i<cs.length();i++) {
+
+ uint8_t c = cs[i];
if (c=='%' && i<length()-2) {
- uint8_t a = LOWERCASE(operator[](i+1));
- uint8_t b = LOWERCASE(operator[](i+2));
+ uint8_t a = LOWERCASE(cs[i+1]);
+ uint8_t b = LOWERCASE(cs[i+2]);
c=0;
if (a>='0' && a<='9')
diff --git a/core/variant_call.cpp b/core/variant_call.cpp
index f3bf8f9e47..01550a1593 100644
--- a/core/variant_call.cpp
+++ b/core/variant_call.cpp
@@ -595,6 +595,7 @@ static void _call_##m_type##_##m_method(Variant& r_ret,Variant& p_self,const Var
VCALL_PTR0R(Image, get_data);
VCALL_PTR3(Image, blit_rect);
VCALL_PTR1R(Image, converted);
+ VCALL_PTR0(Image, fix_alpha_edges);
VCALL_PTR0R( AABB, get_area );
VCALL_PTR0R( AABB, has_no_area );
@@ -1411,6 +1412,7 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl
ADDFUNC0(IMAGE, RAW_ARRAY, Image, get_data, varray());
ADDFUNC3(IMAGE, NIL, Image, blit_rect, IMAGE, "src", RECT2, "src_rect", VECTOR2, "dest", varray(0));
ADDFUNC1(IMAGE, IMAGE, Image, converted, INT, "format", varray(0));
+ ADDFUNC0(IMAGE, NIL, Image, fix_alpha_edges, varray());
ADDFUNC0(_RID,INT,RID,get_id,varray());
diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index cba5425d3f..529601c741 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -17963,39 +17963,47 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
</class>
<class name="LinkButton" inherits="BaseButton" category="Core">
<brief_description>
+ Simple button used to represent a link to some resource
</brief_description>
<description>
+ This kind of buttons are primarily used when the interaction with the button causes a context change (like linking to a web page).
</description>
<methods>
<method name="set_text">
<argument index="0" name="text" type="String">
</argument>
<description>
+ Sets the text of the button.
</description>
</method>
<method name="get_text" qualifiers="const">
<return type="String">
</return>
<description>
+ Returns the text of the button.
</description>
</method>
<method name="set_underline_mode">
<argument index="0" name="underline_mode" type="int">
</argument>
<description>
+ Sets the underline mode for this button, the argument must be one of the [LinkButton] constants (see constants section).
</description>
</method>
<method name="get_underline_mode" qualifiers="const">
<return type="int">
</return>
<description>
+ Returns the underline mode for this button.
</description>
</method>
</methods>
<constants>
<constant name="UNDERLINE_MODE_ALWAYS" value="0">
+ The LinkButton will always show an underline at the bottom of its text
</constant>
<constant name="UNDERLINE_MODE_ON_HOVER" value="1">
+ The LinkButton will show an underline at the bottom of its text when the mouse cursor is over it.
</constant>
</constants>
<theme_items>
@@ -20963,12 +20971,14 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<return type="int">
</return>
<description>
+ Returns the number of displays attached to the host machine
</description>
</method>
<method name="get_current_screen" qualifiers="const">
<return type="int">
</return>
<description>
+ Returns the current screen index (0 padded).
</description>
</method>
<method name="set_current_screen">
@@ -20991,54 +21001,63 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<argument index="0" name="screen" type="int" default="0">
</argument>
<description>
+ Returns the dimensions in pixels of the specified screen.
</description>
</method>
<method name="get_window_position" qualifiers="const">
<return type="Vector2">
</return>
<description>
+ Returns the window position relative to the screen, the origin is the top left corner, +Y axis goes to the bottom and +X axis goes to the right.
</description>
</method>
<method name="set_window_position">
<argument index="0" name="position" type="Vector2">
</argument>
<description>
+ Sets the position of the window to the specified position (this function could be restricted by the window manager, meaning that there could be some unreachable areas of the screen).
</description>
</method>
<method name="get_window_size" qualifiers="const">
<return type="Vector2">
</return>
<description>
+ Returns the size of the window (without counting window manager decorations).
</description>
</method>
<method name="set_window_size">
<argument index="0" name="size" type="Vector2">
</argument>
<description>
+ Sets the window size to the specified size.
</description>
</method>
<method name="set_window_fullscreen">
<argument index="0" name="enabled" type="bool">
</argument>
<description>
+ Sets window fullscreen mode to the [i]enabled[/i] argument, [i]enabled[/i] is a toggle for the fullscreen mode, calling the function with [i]enabled[/i] true when the screen is not on fullscreen mode will cause the screen to go to fullscreen mode, calling the function with [i]enabled[/i] false when the screen is in fullscreen mode will cause the window to exit the fullscreen mode.
</description>
</method>
<method name="is_window_fullscreen" qualifiers="const">
<return type="bool">
</return>
<description>
+ Returns whether the window is in fullscreen mode or not.
</description>
</method>
<method name="set_window_resizable">
<argument index="0" name="enabled" type="bool">
</argument>
<description>
+ Set the window resizable state, if the window is not resizable it will preserve the dimensions specified in the project settings.
</description>
</method>
<method name="is_window_resizable" qualifiers="const">
<return type="bool">
</return>
<description>
+ Returns whether the window is resizable or not.
</description>
</method>
<method name="set_window_minimized">
@@ -21081,12 +21100,14 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<argument index="0" name="orientation" type="int">
</argument>
<description>
+ Sets the current screen orientation, the argument value must be one of the SCREEN_ORIENTATION constants in this class.
</description>
</method>
<method name="get_screen_orientation" qualifiers="const">
<return type="int">
</return>
<description>
+ Returns the current screen orientation, the return value will be one of the SCREEN_ORIENTATION constants in this class.
</description>
</method>
<method name="set_keep_screen_on">
@@ -21100,6 +21121,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<return type="bool">
</return>
<description>
+ Returns whether the screen is being kept on or not.
</description>
</method>
<method name="set_iterations_per_second">
@@ -21151,6 +21173,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<argument index="0" name="title" type="String">
</argument>
<description>
+ Sets the window title to the specified string.
</description>
</method>
<method name="set_low_processor_usage_mode">
@@ -21171,6 +21194,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<return type="int">
</return>
<description>
+ Returns the number of cores available in the host machine.
</description>
</method>
<method name="get_executable_path" qualifiers="const">
@@ -21201,7 +21225,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<argument index="0" name="pid" type="int">
</argument>
<description>
- Kill a process ID.
+ Kill a process ID (this method can be used to kill processes that were not spawned by the game).
</description>
</method>
<method name="shell_open">
@@ -21216,6 +21240,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<return type="int">
</return>
<description>
+ Returns the game process ID
</description>
</method>
<method name="get_environment" qualifiers="const">
@@ -21482,6 +21507,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<return type="float">
</return>
<description>
+ Returns the frames per second of the running game.
</description>
</method>
<method name="print_all_textures_by_size">
diff --git a/drivers/SCsub b/drivers/SCsub
index 701738c9f8..63f37698fb 100644
--- a/drivers/SCsub
+++ b/drivers/SCsub
@@ -11,9 +11,20 @@ SConscript('pulseaudio/SCsub');
SConscript('windows/SCsub');
SConscript('gles2/SCsub');
SConscript('gl_context/SCsub');
-SConscript('openssl/SCsub');
SConscript('pnm/SCsub');
+if (env['openssl']!='no'):
+ env_ssl = env.Clone()
+ Export('env_ssl')
+
+ env_ssl.Append(CPPFLAGS=['-DOPENSSL_ENABLED']);
+ if (env['openssl']=="builtin"):
+ env_ssl.Append(CPPPATH=['#drivers/builtin_openssl2'])
+ SConscript("builtin_openssl2/SCsub");
+
+ SConscript('openssl/SCsub')
+
+
if (env["png"]=="yes"):
SConscript("png/SCsub");
if (env["jpg"]=="yes"):
@@ -26,8 +37,6 @@ SConscript("pvr/SCsub");
SConscript("etc1/SCsub")
if (env["builtin_zlib"]=="yes"):
SConscript("builtin_zlib/SCsub");
-if (env["openssl"]=="builtin"):
- SConscript("builtin_openssl2/SCsub");
SConscript("rtaudio/SCsub");
SConscript("nedmalloc/SCsub");
diff --git a/drivers/builtin_openssl2/SCsub b/drivers/builtin_openssl2/SCsub
index 993fca15c4..38880030b1 100644
--- a/drivers/builtin_openssl2/SCsub
+++ b/drivers/builtin_openssl2/SCsub
@@ -1,651 +1,656 @@
Import('env')
+Import('env_ssl')
openssl_sources = [
-"builtin_openssl2/nocpuid.c",
-"builtin_openssl2/ssl/t1_lib.c",
-"builtin_openssl2/ssl/t1_ext.c",
-"builtin_openssl2/ssl/s3_srvr.c",
-"builtin_openssl2/ssl/t1_enc.c",
-"builtin_openssl2/ssl/t1_meth.c",
-"builtin_openssl2/ssl/s23_clnt.c",
-"builtin_openssl2/ssl/ssl_asn1.c",
-"builtin_openssl2/ssl/tls_srp.c",
-"builtin_openssl2/ssl/kssl.c",
-"builtin_openssl2/ssl/d1_both.c",
-"builtin_openssl2/ssl/t1_clnt.c",
-"builtin_openssl2/ssl/bio_ssl.c",
-"builtin_openssl2/ssl/d1_srtp.c",
-"builtin_openssl2/ssl/t1_reneg.c",
-"builtin_openssl2/ssl/ssl_cert.c",
-"builtin_openssl2/ssl/s3_lib.c",
-"builtin_openssl2/ssl/d1_srvr.c",
-"builtin_openssl2/ssl/s23_meth.c",
-"builtin_openssl2/ssl/ssl_stat.c",
-"builtin_openssl2/ssl/ssl_err.c",
-"builtin_openssl2/ssl/ssl_algs.c",
-"builtin_openssl2/ssl/s3_cbc.c",
-"builtin_openssl2/ssl/d1_clnt.c",
-"builtin_openssl2/ssl/s3_pkt.c",
-"builtin_openssl2/ssl/d1_meth.c",
-"builtin_openssl2/ssl/s3_both.c",
-"builtin_openssl2/ssl/s2_enc.c",
-"builtin_openssl2/ssl/s3_meth.c",
-"builtin_openssl2/ssl/s3_enc.c",
-"builtin_openssl2/ssl/s23_pkt.c",
-"builtin_openssl2/ssl/s2_pkt.c",
-"builtin_openssl2/ssl/d1_pkt.c",
-"builtin_openssl2/ssl/ssl_rsa.c",
-"builtin_openssl2/ssl/s23_srvr.c",
-"builtin_openssl2/ssl/s2_meth.c",
-"builtin_openssl2/ssl/s3_clnt.c",
-"builtin_openssl2/ssl/s23_lib.c",
-"builtin_openssl2/ssl/t1_srvr.c",
-"builtin_openssl2/ssl/ssl_lib.c",
-"builtin_openssl2/ssl/ssl_txt.c",
-"builtin_openssl2/ssl/s2_srvr.c",
-"builtin_openssl2/ssl/ssl_sess.c",
-"builtin_openssl2/ssl/s2_clnt.c",
-"builtin_openssl2/ssl/d1_lib.c",
-"builtin_openssl2/ssl/s2_lib.c",
-"builtin_openssl2/ssl/ssl_err2.c",
-"builtin_openssl2/ssl/ssl_ciph.c",
-"builtin_openssl2/crypto/dsa/dsa_lib.c",
-"builtin_openssl2/crypto/dsa/dsa_pmeth.c",
-"builtin_openssl2/crypto/dsa/dsa_ossl.c",
-"builtin_openssl2/crypto/dsa/dsa_gen.c",
-"builtin_openssl2/crypto/dsa/dsa_asn1.c",
-"builtin_openssl2/crypto/dsa/dsa_prn.c",
-"builtin_openssl2/crypto/dsa/dsa_sign.c",
-"builtin_openssl2/crypto/dsa/dsa_key.c",
-"builtin_openssl2/crypto/dsa/dsa_vrf.c",
-"builtin_openssl2/crypto/dsa/dsa_err.c",
-"builtin_openssl2/crypto/dsa/dsa_ameth.c",
-"builtin_openssl2/crypto/dsa/dsa_depr.c",
-"builtin_openssl2/crypto/x509/x509_lu.c",
-"builtin_openssl2/crypto/x509/x509cset.c",
-"builtin_openssl2/crypto/x509/x509_set.c",
-"builtin_openssl2/crypto/x509/x509_d2.c",
-"builtin_openssl2/crypto/x509/x509_txt.c",
-"builtin_openssl2/crypto/x509/x509rset.c",
-"builtin_openssl2/crypto/x509/by_dir.c",
-"builtin_openssl2/crypto/x509/x509_vpm.c",
-"builtin_openssl2/crypto/x509/x509_vfy.c",
-"builtin_openssl2/crypto/x509/x509_trs.c",
-"builtin_openssl2/crypto/x509/by_file.c",
-"builtin_openssl2/crypto/x509/x509_obj.c",
-"builtin_openssl2/crypto/x509/x509spki.c",
-"builtin_openssl2/crypto/x509/x509_v3.c",
-"builtin_openssl2/crypto/x509/x509_req.c",
-"builtin_openssl2/crypto/x509/x509_att.c",
-"builtin_openssl2/crypto/x509/x_all.c",
-"builtin_openssl2/crypto/x509/x509_ext.c",
-"builtin_openssl2/crypto/x509/x509type.c",
-"builtin_openssl2/crypto/x509/x509_def.c",
-"builtin_openssl2/crypto/x509/x509_err.c",
-"builtin_openssl2/crypto/x509/x509name.c",
-"builtin_openssl2/crypto/x509/x509_r2x.c",
-"builtin_openssl2/crypto/x509/x509_cmp.c",
-"builtin_openssl2/crypto/asn1/x_pkey.c",
-"builtin_openssl2/crypto/asn1/a_gentm.c",
-"builtin_openssl2/crypto/asn1/x_sig.c",
-"builtin_openssl2/crypto/asn1/t_req.c",
-"builtin_openssl2/crypto/asn1/t_pkey.c",
-"builtin_openssl2/crypto/asn1/p8_pkey.c",
-"builtin_openssl2/crypto/asn1/a_i2d_fp.c",
-"builtin_openssl2/crypto/asn1/x_val.c",
-"builtin_openssl2/crypto/asn1/f_string.c",
-"builtin_openssl2/crypto/asn1/p5_pbe.c",
-"builtin_openssl2/crypto/asn1/bio_ndef.c",
-"builtin_openssl2/crypto/asn1/a_bool.c",
-"builtin_openssl2/crypto/asn1/asn1_gen.c",
-"builtin_openssl2/crypto/asn1/x_algor.c",
-"builtin_openssl2/crypto/asn1/bio_asn1.c",
-"builtin_openssl2/crypto/asn1/asn_mime.c",
-"builtin_openssl2/crypto/asn1/t_x509.c",
-"builtin_openssl2/crypto/asn1/a_strex.c",
-"builtin_openssl2/crypto/asn1/x_nx509.c",
-"builtin_openssl2/crypto/asn1/asn1_err.c",
-"builtin_openssl2/crypto/asn1/x_crl.c",
-"builtin_openssl2/crypto/asn1/a_print.c",
-"builtin_openssl2/crypto/asn1/a_type.c",
-"builtin_openssl2/crypto/asn1/tasn_new.c",
-"builtin_openssl2/crypto/asn1/n_pkey.c",
-"builtin_openssl2/crypto/asn1/x_bignum.c",
-"builtin_openssl2/crypto/asn1/asn_pack.c",
-"builtin_openssl2/crypto/asn1/evp_asn1.c",
-"builtin_openssl2/crypto/asn1/t_bitst.c",
-"builtin_openssl2/crypto/asn1/x_req.c",
-"builtin_openssl2/crypto/asn1/a_time.c",
-"builtin_openssl2/crypto/asn1/x_name.c",
-"builtin_openssl2/crypto/asn1/x_pubkey.c",
-"builtin_openssl2/crypto/asn1/tasn_typ.c",
-"builtin_openssl2/crypto/asn1/asn_moid.c",
-"builtin_openssl2/crypto/asn1/a_utctm.c",
-"builtin_openssl2/crypto/asn1/asn1_lib.c",
-"builtin_openssl2/crypto/asn1/x_x509a.c",
-"builtin_openssl2/crypto/asn1/a_set.c",
-"builtin_openssl2/crypto/asn1/t_crl.c",
-"builtin_openssl2/crypto/asn1/p5_pbev2.c",
-"builtin_openssl2/crypto/asn1/tasn_enc.c",
-"builtin_openssl2/crypto/asn1/a_mbstr.c",
-"builtin_openssl2/crypto/asn1/tasn_dec.c",
-"builtin_openssl2/crypto/asn1/x_x509.c",
-"builtin_openssl2/crypto/asn1/a_octet.c",
-"builtin_openssl2/crypto/asn1/x_long.c",
-"builtin_openssl2/crypto/asn1/a_bytes.c",
-"builtin_openssl2/crypto/asn1/t_x509a.c",
-"builtin_openssl2/crypto/asn1/a_enum.c",
-"builtin_openssl2/crypto/asn1/a_int.c",
-"builtin_openssl2/crypto/asn1/tasn_prn.c",
-"builtin_openssl2/crypto/asn1/i2d_pr.c",
-"builtin_openssl2/crypto/asn1/a_utf8.c",
-"builtin_openssl2/crypto/asn1/t_spki.c",
-"builtin_openssl2/crypto/asn1/a_digest.c",
-"builtin_openssl2/crypto/asn1/a_dup.c",
-"builtin_openssl2/crypto/asn1/i2d_pu.c",
-"builtin_openssl2/crypto/asn1/a_verify.c",
-"builtin_openssl2/crypto/asn1/f_enum.c",
-"builtin_openssl2/crypto/asn1/a_sign.c",
-"builtin_openssl2/crypto/asn1/d2i_pr.c",
-"builtin_openssl2/crypto/asn1/asn1_par.c",
-"builtin_openssl2/crypto/asn1/x_spki.c",
-"builtin_openssl2/crypto/asn1/a_d2i_fp.c",
-"builtin_openssl2/crypto/asn1/f_int.c",
-"builtin_openssl2/crypto/asn1/x_exten.c",
-"builtin_openssl2/crypto/asn1/tasn_utl.c",
-"builtin_openssl2/crypto/asn1/nsseq.c",
-"builtin_openssl2/crypto/asn1/a_bitstr.c",
-"builtin_openssl2/crypto/asn1/x_info.c",
-"builtin_openssl2/crypto/asn1/a_strnid.c",
-"builtin_openssl2/crypto/asn1/a_object.c",
-"builtin_openssl2/crypto/asn1/tasn_fre.c",
-"builtin_openssl2/crypto/asn1/d2i_pu.c",
-"builtin_openssl2/crypto/asn1/ameth_lib.c",
-"builtin_openssl2/crypto/asn1/x_attrib.c",
-"builtin_openssl2/crypto/evp/m_sha.c",
-"builtin_openssl2/crypto/evp/e_camellia.c",
-"builtin_openssl2/crypto/evp/e_aes.c",
-"builtin_openssl2/crypto/evp/bio_b64.c",
-"builtin_openssl2/crypto/evp/m_sigver.c",
-"builtin_openssl2/crypto/evp/m_wp.c",
-"builtin_openssl2/crypto/evp/m_sha1.c",
-"builtin_openssl2/crypto/evp/p_seal.c",
-"builtin_openssl2/crypto/evp/c_alld.c",
-"builtin_openssl2/crypto/evp/p5_crpt.c",
-"builtin_openssl2/crypto/evp/e_rc4.c",
-"builtin_openssl2/crypto/evp/m_ecdsa.c",
-"builtin_openssl2/crypto/evp/bio_enc.c",
-"builtin_openssl2/crypto/evp/e_des3.c",
-"builtin_openssl2/crypto/evp/m_null.c",
-"builtin_openssl2/crypto/evp/bio_ok.c",
-"builtin_openssl2/crypto/evp/pmeth_gn.c",
-"builtin_openssl2/crypto/evp/e_rc5.c",
-"builtin_openssl2/crypto/evp/e_rc2.c",
-"builtin_openssl2/crypto/evp/p_dec.c",
-"builtin_openssl2/crypto/evp/p_verify.c",
-"builtin_openssl2/crypto/evp/e_rc4_hmac_md5.c",
-"builtin_openssl2/crypto/evp/pmeth_lib.c",
-"builtin_openssl2/crypto/evp/m_ripemd.c",
-"builtin_openssl2/crypto/evp/m_md5.c",
-"builtin_openssl2/crypto/evp/e_bf.c",
-"builtin_openssl2/crypto/evp/p_enc.c",
-"builtin_openssl2/crypto/evp/m_dss.c",
-"builtin_openssl2/crypto/evp/bio_md.c",
-"builtin_openssl2/crypto/evp/evp_pbe.c",
-"builtin_openssl2/crypto/evp/e_seed.c",
-"builtin_openssl2/crypto/evp/e_cast.c",
-"builtin_openssl2/crypto/evp/p_open.c",
-"builtin_openssl2/crypto/evp/p5_crpt2.c",
-"builtin_openssl2/crypto/evp/m_dss1.c",
-"builtin_openssl2/crypto/evp/names.c",
-"builtin_openssl2/crypto/evp/evp_acnf.c",
-"builtin_openssl2/crypto/evp/e_des.c",
-"builtin_openssl2/crypto/evp/evp_cnf.c",
-"builtin_openssl2/crypto/evp/evp_lib.c",
-"builtin_openssl2/crypto/evp/digest.c",
-"builtin_openssl2/crypto/evp/evp_err.c",
-"builtin_openssl2/crypto/evp/evp_enc.c",
-"builtin_openssl2/crypto/evp/e_old.c",
-"builtin_openssl2/crypto/evp/c_all.c",
-"builtin_openssl2/crypto/evp/m_md2.c",
-"builtin_openssl2/crypto/evp/e_xcbc_d.c",
-"builtin_openssl2/crypto/evp/pmeth_fn.c",
-"builtin_openssl2/crypto/evp/p_lib.c",
-"builtin_openssl2/crypto/evp/evp_key.c",
-"builtin_openssl2/crypto/evp/encode.c",
-"builtin_openssl2/crypto/evp/e_aes_cbc_hmac_sha1.c",
-"builtin_openssl2/crypto/evp/e_aes_cbc_hmac_sha256.c",
-"builtin_openssl2/crypto/evp/m_mdc2.c",
-"builtin_openssl2/crypto/evp/e_null.c",
-"builtin_openssl2/crypto/evp/p_sign.c",
-"builtin_openssl2/crypto/evp/e_idea.c",
-"builtin_openssl2/crypto/evp/c_allc.c",
-"builtin_openssl2/crypto/evp/evp_pkey.c",
-"builtin_openssl2/crypto/evp/m_md4.c",
-"builtin_openssl2/crypto/ex_data.c",
-"builtin_openssl2/crypto/pkcs12/p12_p8e.c",
-"builtin_openssl2/crypto/pkcs12/p12_crt.c",
-"builtin_openssl2/crypto/pkcs12/p12_utl.c",
-"builtin_openssl2/crypto/pkcs12/p12_attr.c",
-"builtin_openssl2/crypto/pkcs12/p12_npas.c",
-"builtin_openssl2/crypto/pkcs12/p12_decr.c",
-"builtin_openssl2/crypto/pkcs12/p12_init.c",
-"builtin_openssl2/crypto/pkcs12/p12_kiss.c",
-"builtin_openssl2/crypto/pkcs12/p12_add.c",
-"builtin_openssl2/crypto/pkcs12/p12_p8d.c",
-"builtin_openssl2/crypto/pkcs12/p12_mutl.c",
-"builtin_openssl2/crypto/pkcs12/p12_crpt.c",
-"builtin_openssl2/crypto/pkcs12/pk12err.c",
-"builtin_openssl2/crypto/pkcs12/p12_asn.c",
-"builtin_openssl2/crypto/pkcs12/p12_key.c",
-"builtin_openssl2/crypto/ecdh/ech_key.c",
-"builtin_openssl2/crypto/ecdh/ech_ossl.c",
-"builtin_openssl2/crypto/ecdh/ech_lib.c",
-"builtin_openssl2/crypto/ecdh/ech_err.c",
-"builtin_openssl2/crypto/ecdh/ech_kdf.c",
-"builtin_openssl2/crypto/o_str.c",
-"builtin_openssl2/crypto/conf/conf_api.c",
-"builtin_openssl2/crypto/conf/conf_err.c",
-"builtin_openssl2/crypto/conf/conf_def.c",
-"builtin_openssl2/crypto/conf/conf_lib.c",
-"builtin_openssl2/crypto/conf/conf_mall.c",
-"builtin_openssl2/crypto/conf/conf_sap.c",
-"builtin_openssl2/crypto/conf/conf_mod.c",
-"builtin_openssl2/crypto/ebcdic.c",
-"builtin_openssl2/crypto/ecdsa/ecs_lib.c",
-"builtin_openssl2/crypto/ecdsa/ecs_asn1.c",
-"builtin_openssl2/crypto/ecdsa/ecs_ossl.c",
-"builtin_openssl2/crypto/ecdsa/ecs_vrf.c",
-"builtin_openssl2/crypto/ecdsa/ecs_sign.c",
-"builtin_openssl2/crypto/ecdsa/ecs_err.c",
-"builtin_openssl2/crypto/dso/dso_win32.c",
-"builtin_openssl2/crypto/dso/dso_lib.c",
-"builtin_openssl2/crypto/dso/dso_dlfcn.c",
-"builtin_openssl2/crypto/dso/dso_dl.c",
-"builtin_openssl2/crypto/dso/dso_beos.c",
-"builtin_openssl2/crypto/dso/dso_null.c",
-"builtin_openssl2/crypto/dso/dso_vms.c",
-"builtin_openssl2/crypto/dso/dso_err.c",
-"builtin_openssl2/crypto/dso/dso_openssl.c",
-"builtin_openssl2/crypto/cryptlib.c",
-"builtin_openssl2/crypto/md5/md5_one.c",
-"builtin_openssl2/crypto/md5/md5_dgst.c",
-"builtin_openssl2/crypto/pkcs7/pkcs7err.c",
-"builtin_openssl2/crypto/pkcs7/pk7_smime.c",
-"builtin_openssl2/crypto/pkcs7/bio_pk7.c",
-"builtin_openssl2/crypto/pkcs7/pk7_mime.c",
-"builtin_openssl2/crypto/pkcs7/pk7_lib.c",
-"builtin_openssl2/crypto/pkcs7/pk7_asn1.c",
-"builtin_openssl2/crypto/pkcs7/pk7_doit.c",
-"builtin_openssl2/crypto/pkcs7/pk7_attr.c",
-"builtin_openssl2/crypto/md4/md4_one.c",
-"builtin_openssl2/crypto/md4/md4_dgst.c",
-"builtin_openssl2/crypto/o_dir.c",
-"builtin_openssl2/crypto/buffer/buf_err.c",
-"builtin_openssl2/crypto/buffer/buf_str.c",
-"builtin_openssl2/crypto/buffer/buffer.c",
-"builtin_openssl2/crypto/cms/cms_lib.c",
-"builtin_openssl2/crypto/cms/cms_io.c",
-"builtin_openssl2/crypto/cms/cms_err.c",
-"builtin_openssl2/crypto/cms/cms_dd.c",
-"builtin_openssl2/crypto/cms/cms_smime.c",
-"builtin_openssl2/crypto/cms/cms_att.c",
-"builtin_openssl2/crypto/cms/cms_pwri.c",
-"builtin_openssl2/crypto/cms/cms_cd.c",
-"builtin_openssl2/crypto/cms/cms_sd.c",
-"builtin_openssl2/crypto/cms/cms_asn1.c",
-"builtin_openssl2/crypto/cms/cms_env.c",
-"builtin_openssl2/crypto/cms/cms_enc.c",
-"builtin_openssl2/crypto/cms/cms_ess.c",
-"builtin_openssl2/crypto/cms/cms_kari.c",
-"builtin_openssl2/crypto/mem_dbg.c",
-"builtin_openssl2/crypto/uid.c",
-"builtin_openssl2/crypto/stack/stack.c",
-"builtin_openssl2/crypto/ec/ec_ameth.c",
-"builtin_openssl2/crypto/ec/ec_err.c",
-"builtin_openssl2/crypto/ec/ec_lib.c",
-"builtin_openssl2/crypto/ec/ec_curve.c",
-"builtin_openssl2/crypto/ec/ec_oct.c",
-"builtin_openssl2/crypto/ec/ec_asn1.c",
-"builtin_openssl2/crypto/ec/ecp_oct.c",
-"builtin_openssl2/crypto/ec/ec_print.c",
-"builtin_openssl2/crypto/ec/ec2_smpl.c",
-"builtin_openssl2/crypto/ec/ecp_nistp224.c",
-"builtin_openssl2/crypto/ec/ec2_oct.c",
-"builtin_openssl2/crypto/ec/eck_prn.c",
-"builtin_openssl2/crypto/ec/ec_key.c",
-"builtin_openssl2/crypto/ec/ecp_nist.c",
-"builtin_openssl2/crypto/ec/ec_check.c",
-"builtin_openssl2/crypto/ec/ecp_smpl.c",
-"builtin_openssl2/crypto/ec/ec2_mult.c",
-"builtin_openssl2/crypto/ec/ecp_mont.c",
-"builtin_openssl2/crypto/ec/ecp_nistp521.c",
-"builtin_openssl2/crypto/ec/ec_mult.c",
-"builtin_openssl2/crypto/ec/ecp_nistputil.c",
-"builtin_openssl2/crypto/ec/ec_pmeth.c",
-"builtin_openssl2/crypto/ec/ec_cvt.c",
-"builtin_openssl2/crypto/ec/ecp_nistp256.c",
-"builtin_openssl2/crypto/krb5/krb5_asn.c",
-"builtin_openssl2/crypto/hmac/hmac.c",
-"builtin_openssl2/crypto/hmac/hm_ameth.c",
-"builtin_openssl2/crypto/hmac/hm_pmeth.c",
-"builtin_openssl2/crypto/comp/c_rle.c",
-"builtin_openssl2/crypto/comp/c_zlib.c",
-"builtin_openssl2/crypto/comp/comp_lib.c",
-"builtin_openssl2/crypto/comp/comp_err.c",
-"builtin_openssl2/crypto/des/fcrypt.c",
-"builtin_openssl2/crypto/des/str2key.c",
-"builtin_openssl2/crypto/des/cbc_cksm.c",
-"builtin_openssl2/crypto/des/des_enc.c",
-"builtin_openssl2/crypto/des/ofb_enc.c",
-"builtin_openssl2/crypto/des/read2pwd.c",
-"builtin_openssl2/crypto/des/ecb3_enc.c",
-"builtin_openssl2/crypto/des/rand_key.c",
-"builtin_openssl2/crypto/des/cfb64ede.c",
-"builtin_openssl2/crypto/des/rpc_enc.c",
-"builtin_openssl2/crypto/des/ofb64ede.c",
-"builtin_openssl2/crypto/des/qud_cksm.c",
-"builtin_openssl2/crypto/des/enc_writ.c",
-"builtin_openssl2/crypto/des/set_key.c",
-"builtin_openssl2/crypto/des/xcbc_enc.c",
-"builtin_openssl2/crypto/des/fcrypt_b.c",
-"builtin_openssl2/crypto/des/ede_cbcm_enc.c",
-"builtin_openssl2/crypto/des/des_old2.c",
-"builtin_openssl2/crypto/des/cfb_enc.c",
-"builtin_openssl2/crypto/des/ecb_enc.c",
-"builtin_openssl2/crypto/des/enc_read.c",
-"builtin_openssl2/crypto/des/des_old.c",
-"builtin_openssl2/crypto/des/ofb64enc.c",
-"builtin_openssl2/crypto/des/pcbc_enc.c",
-"builtin_openssl2/crypto/des/cbc_enc.c",
-"builtin_openssl2/crypto/des/cfb64enc.c",
-"builtin_openssl2/crypto/lhash/lh_stats.c",
-"builtin_openssl2/crypto/lhash/lhash.c",
-"builtin_openssl2/crypto/x509v3/v3_genn.c",
-"builtin_openssl2/crypto/x509v3/pcy_cache.c",
-"builtin_openssl2/crypto/x509v3/v3_sxnet.c",
-"builtin_openssl2/crypto/x509v3/v3_scts.c",
-"builtin_openssl2/crypto/x509v3/v3err.c",
-"builtin_openssl2/crypto/x509v3/v3_conf.c",
-"builtin_openssl2/crypto/x509v3/v3_utl.c",
-"builtin_openssl2/crypto/x509v3/v3_akeya.c",
-"builtin_openssl2/crypto/x509v3/v3_lib.c",
-"builtin_openssl2/crypto/x509v3/pcy_lib.c",
-"builtin_openssl2/crypto/x509v3/v3_cpols.c",
-"builtin_openssl2/crypto/x509v3/v3_ia5.c",
-"builtin_openssl2/crypto/x509v3/v3_bitst.c",
-"builtin_openssl2/crypto/x509v3/v3_skey.c",
-"builtin_openssl2/crypto/x509v3/v3_info.c",
-"builtin_openssl2/crypto/x509v3/v3_asid.c",
-"builtin_openssl2/crypto/x509v3/pcy_tree.c",
-"builtin_openssl2/crypto/x509v3/v3_pcons.c",
-"builtin_openssl2/crypto/x509v3/v3_bcons.c",
-"builtin_openssl2/crypto/x509v3/v3_pku.c",
-"builtin_openssl2/crypto/x509v3/v3_ocsp.c",
-"builtin_openssl2/crypto/x509v3/pcy_map.c",
-"builtin_openssl2/crypto/x509v3/v3_ncons.c",
-"builtin_openssl2/crypto/x509v3/v3_purp.c",
-"builtin_openssl2/crypto/x509v3/v3_enum.c",
-"builtin_openssl2/crypto/x509v3/v3_pmaps.c",
-"builtin_openssl2/crypto/x509v3/pcy_node.c",
-"builtin_openssl2/crypto/x509v3/v3_pcia.c",
-"builtin_openssl2/crypto/x509v3/v3_crld.c",
-"builtin_openssl2/crypto/x509v3/v3_pci.c",
-"builtin_openssl2/crypto/x509v3/v3_akey.c",
-"builtin_openssl2/crypto/x509v3/v3_addr.c",
-"builtin_openssl2/crypto/x509v3/v3_int.c",
-"builtin_openssl2/crypto/x509v3/v3_alt.c",
-"builtin_openssl2/crypto/x509v3/v3_extku.c",
-"builtin_openssl2/crypto/x509v3/v3_prn.c",
-"builtin_openssl2/crypto/x509v3/pcy_data.c",
-"builtin_openssl2/crypto/aes/aes_ofb.c",
-"builtin_openssl2/crypto/aes/aes_ctr.c",
-"builtin_openssl2/crypto/aes/aes_ecb.c",
-"builtin_openssl2/crypto/aes/aes_cfb.c",
-"builtin_openssl2/crypto/aes/aes_wrap.c",
-"builtin_openssl2/crypto/aes/aes_ige.c",
-"builtin_openssl2/crypto/aes/aes_misc.c",
-"builtin_openssl2/crypto/pqueue/pqueue.c",
-"builtin_openssl2/crypto/sha/sha_one.c",
-"builtin_openssl2/crypto/sha/sha_dgst.c",
-"builtin_openssl2/crypto/sha/sha512.c",
-"builtin_openssl2/crypto/sha/sha1_one.c",
-"builtin_openssl2/crypto/sha/sha1dgst.c",
-"builtin_openssl2/crypto/sha/sha256.c",
-"builtin_openssl2/crypto/whrlpool/wp_dgst.c",
-"builtin_openssl2/crypto/objects/obj_xref.c",
-"builtin_openssl2/crypto/objects/o_names.c",
-"builtin_openssl2/crypto/objects/obj_err.c",
-"builtin_openssl2/crypto/objects/obj_dat.c",
-"builtin_openssl2/crypto/objects/obj_lib.c",
-"builtin_openssl2/crypto/mem.c",
-"builtin_openssl2/crypto/fips_ers.c",
-"builtin_openssl2/crypto/o_fips.c",
-"builtin_openssl2/crypto/engine/eng_rdrand.c",
-"builtin_openssl2/crypto/engine/eng_err.c",
-"builtin_openssl2/crypto/engine/tb_ecdsa.c",
-"builtin_openssl2/crypto/engine/tb_rsa.c",
-"builtin_openssl2/crypto/engine/tb_cipher.c",
-"builtin_openssl2/crypto/engine/tb_dsa.c",
-"builtin_openssl2/crypto/engine/eng_lib.c",
-"builtin_openssl2/crypto/engine/tb_asnmth.c",
-"builtin_openssl2/crypto/engine/tb_ecdh.c",
-"builtin_openssl2/crypto/engine/tb_dh.c",
-"builtin_openssl2/crypto/engine/tb_store.c",
-"builtin_openssl2/crypto/engine/eng_init.c",
-"builtin_openssl2/crypto/engine/eng_cnf.c",
-"builtin_openssl2/crypto/engine/eng_all.c",
-"builtin_openssl2/crypto/engine/tb_digest.c",
-"builtin_openssl2/crypto/engine/tb_pkmeth.c",
-"builtin_openssl2/crypto/engine/eng_table.c",
-"builtin_openssl2/crypto/engine/eng_ctrl.c",
-"builtin_openssl2/crypto/engine/eng_list.c",
-"builtin_openssl2/crypto/engine/eng_cryptodev.c",
-"builtin_openssl2/crypto/engine/eng_pkey.c",
-"builtin_openssl2/crypto/engine/tb_rand.c",
-"builtin_openssl2/crypto/engine/eng_openssl.c",
-"builtin_openssl2/crypto/engine/eng_fat.c",
-"builtin_openssl2/crypto/engine/eng_dyn.c",
-"builtin_openssl2/crypto/ts/ts_rsp_verify.c",
-"builtin_openssl2/crypto/ts/ts_req_print.c",
-"builtin_openssl2/crypto/ts/ts_verify_ctx.c",
-"builtin_openssl2/crypto/ts/ts_req_utils.c",
-"builtin_openssl2/crypto/ts/ts_err.c",
-"builtin_openssl2/crypto/ts/ts_rsp_print.c",
-"builtin_openssl2/crypto/ts/ts_rsp_utils.c",
-"builtin_openssl2/crypto/ts/ts_lib.c",
-"builtin_openssl2/crypto/ts/ts_conf.c",
-"builtin_openssl2/crypto/ts/ts_asn1.c",
-"builtin_openssl2/crypto/ts/ts_rsp_sign.c",
-"builtin_openssl2/crypto/ocsp/ocsp_ext.c",
-"builtin_openssl2/crypto/ocsp/ocsp_cl.c",
-"builtin_openssl2/crypto/ocsp/ocsp_ht.c",
-"builtin_openssl2/crypto/ocsp/ocsp_lib.c",
-"builtin_openssl2/crypto/ocsp/ocsp_srv.c",
-"builtin_openssl2/crypto/ocsp/ocsp_vfy.c",
-"builtin_openssl2/crypto/ocsp/ocsp_err.c",
-"builtin_openssl2/crypto/ocsp/ocsp_prn.c",
-"builtin_openssl2/crypto/ocsp/ocsp_asn.c",
-"builtin_openssl2/crypto/bf/bf_cfb64.c",
-"builtin_openssl2/crypto/bf/bf_ecb.c",
-"builtin_openssl2/crypto/bf/bf_enc.c",
-"builtin_openssl2/crypto/bf/bf_skey.c",
-"builtin_openssl2/crypto/bf/bf_ofb64.c",
-"builtin_openssl2/crypto/idea/i_skey.c",
-"builtin_openssl2/crypto/idea/i_ofb64.c",
-"builtin_openssl2/crypto/idea/i_cbc.c",
-"builtin_openssl2/crypto/idea/i_ecb.c",
-"builtin_openssl2/crypto/idea/i_cfb64.c",
-"builtin_openssl2/crypto/cmac/cm_ameth.c",
-"builtin_openssl2/crypto/cmac/cmac.c",
-"builtin_openssl2/crypto/cmac/cm_pmeth.c",
-"builtin_openssl2/crypto/dh/dh_lib.c",
-"builtin_openssl2/crypto/dh/dh_key.c",
-"builtin_openssl2/crypto/dh/dh_asn1.c",
-"builtin_openssl2/crypto/dh/dh_depr.c",
-"builtin_openssl2/crypto/dh/dh_pmeth.c",
-"builtin_openssl2/crypto/dh/dh_prn.c",
-"builtin_openssl2/crypto/dh/dh_gen.c",
-"builtin_openssl2/crypto/dh/dh_ameth.c",
-"builtin_openssl2/crypto/dh/dh_check.c",
-"builtin_openssl2/crypto/dh/dh_err.c",
-"builtin_openssl2/crypto/dh/dh_kdf.c",
-"builtin_openssl2/crypto/dh/dh_rfc5114.c",
-"builtin_openssl2/crypto/modes/ccm128.c",
-"builtin_openssl2/crypto/modes/ofb128.c",
-"builtin_openssl2/crypto/modes/cts128.c",
-"builtin_openssl2/crypto/modes/ctr128.c",
-"builtin_openssl2/crypto/modes/gcm128.c",
-"builtin_openssl2/crypto/modes/cbc128.c",
-"builtin_openssl2/crypto/modes/cfb128.c",
-"builtin_openssl2/crypto/modes/xts128.c",
-"builtin_openssl2/crypto/modes/wrap128.c",
-"builtin_openssl2/crypto/camellia/cmll_cfb.c",
-"builtin_openssl2/crypto/camellia/cmll_ecb.c",
-"builtin_openssl2/crypto/camellia/cmll_utl.c",
-"builtin_openssl2/crypto/camellia/cmll_misc.c",
-"builtin_openssl2/crypto/camellia/cmll_ofb.c",
-"builtin_openssl2/crypto/camellia/cmll_ctr.c",
-"builtin_openssl2/crypto/seed/seed_ecb.c",
-"builtin_openssl2/crypto/seed/seed_cbc.c",
-"builtin_openssl2/crypto/seed/seed.c",
-"builtin_openssl2/crypto/seed/seed_ofb.c",
-"builtin_openssl2/crypto/seed/seed_cfb.c",
-"builtin_openssl2/crypto/txt_db/txt_db.c",
-"builtin_openssl2/crypto/cpt_err.c",
-"builtin_openssl2/crypto/pem/pem_pk8.c",
-"builtin_openssl2/crypto/pem/pem_lib.c",
-"builtin_openssl2/crypto/pem/pem_sign.c",
-"builtin_openssl2/crypto/pem/pem_all.c",
-"builtin_openssl2/crypto/pem/pem_info.c",
-"builtin_openssl2/crypto/pem/pem_pkey.c",
-"builtin_openssl2/crypto/pem/pem_seal.c",
-"builtin_openssl2/crypto/pem/pem_err.c",
-"builtin_openssl2/crypto/pem/pem_xaux.c",
-"builtin_openssl2/crypto/pem/pvkfmt.c",
-"builtin_openssl2/crypto/pem/pem_x509.c",
-"builtin_openssl2/crypto/pem/pem_oth.c",
-"builtin_openssl2/crypto/rand/rand_lib.c",
-"builtin_openssl2/crypto/rand/randfile.c",
-"builtin_openssl2/crypto/rand/rand_os2.c",
-"builtin_openssl2/crypto/rand/rand_unix.c",
-"builtin_openssl2/crypto/rand/rand_nw.c",
-"builtin_openssl2/crypto/rand/md_rand.c",
-"builtin_openssl2/crypto/rand/rand_err.c",
-"builtin_openssl2/crypto/rand/rand_win.c",
-"builtin_openssl2/crypto/rand/rand_egd.c",
-"builtin_openssl2/crypto/cversion.c",
-"builtin_openssl2/crypto/cast/c_ecb.c",
-"builtin_openssl2/crypto/cast/c_skey.c",
-"builtin_openssl2/crypto/cast/c_ofb64.c",
-"builtin_openssl2/crypto/cast/c_enc.c",
-"builtin_openssl2/crypto/cast/c_cfb64.c",
-"builtin_openssl2/crypto/o_time.c",
-"builtin_openssl2/crypto/mdc2/mdc2dgst.c",
-"builtin_openssl2/crypto/mdc2/mdc2_one.c",
-"builtin_openssl2/crypto/rc4/rc4_utl.c",
-"builtin_openssl2/crypto/ui/ui_compat.c",
-"builtin_openssl2/crypto/ui/ui_util.c",
-"builtin_openssl2/crypto/ui/ui_lib.c",
-"builtin_openssl2/crypto/ui/ui_err.c",
-"builtin_openssl2/crypto/ui/ui_openssl.c",
-"builtin_openssl2/crypto/bio/bf_buff.c",
-"builtin_openssl2/crypto/bio/bss_null.c",
-"builtin_openssl2/crypto/bio/bss_acpt.c",
-"builtin_openssl2/crypto/bio/bss_conn.c",
-"builtin_openssl2/crypto/bio/bss_fd.c",
-"builtin_openssl2/crypto/bio/bf_null.c",
-"builtin_openssl2/crypto/bio/bio_err.c",
-"builtin_openssl2/crypto/bio/bss_sock.c",
-"builtin_openssl2/crypto/bio/bss_mem.c",
-"builtin_openssl2/crypto/bio/b_dump.c",
-"builtin_openssl2/crypto/bio/b_print.c",
-"builtin_openssl2/crypto/bio/b_sock.c",
-"builtin_openssl2/crypto/bio/bss_dgram.c",
-"builtin_openssl2/crypto/bio/bf_nbio.c",
-"builtin_openssl2/crypto/bio/bio_lib.c",
-"builtin_openssl2/crypto/bio/bss_file.c",
-"builtin_openssl2/crypto/bio/bss_bio.c",
-"builtin_openssl2/crypto/bio/bss_log.c",
-"builtin_openssl2/crypto/bio/bio_cb.c",
-"builtin_openssl2/crypto/o_init.c",
-"builtin_openssl2/crypto/rc2/rc2_skey.c",
-"builtin_openssl2/crypto/rc2/rc2_cbc.c",
-"builtin_openssl2/crypto/rc2/rc2cfb64.c",
-"builtin_openssl2/crypto/rc2/rc2_ecb.c",
-"builtin_openssl2/crypto/rc2/rc2ofb64.c",
-"builtin_openssl2/crypto/bn/bn_x931p.c",
-"builtin_openssl2/crypto/bn/bn_blind.c",
-"builtin_openssl2/crypto/bn/bn_gf2m.c",
-"builtin_openssl2/crypto/bn/bn_const.c",
-"builtin_openssl2/crypto/bn/bn_sqr.c",
-"builtin_openssl2/crypto/bn/bn_nist.c",
-"builtin_openssl2/crypto/bn/bn_rand.c",
-"builtin_openssl2/crypto/bn/bn_err.c",
-"builtin_openssl2/crypto/bn/bn_div.c",
-"builtin_openssl2/crypto/bn/bn_kron.c",
-"builtin_openssl2/crypto/bn/bn_ctx.c",
-"builtin_openssl2/crypto/bn/bn_shift.c",
-"builtin_openssl2/crypto/bn/bn_mod.c",
-"builtin_openssl2/crypto/bn/bn_exp2.c",
-"builtin_openssl2/crypto/bn/bn_word.c",
-"builtin_openssl2/crypto/bn/bn_add.c",
-"builtin_openssl2/crypto/bn/bn_exp.c",
-"builtin_openssl2/crypto/bn/bn_mont.c",
-"builtin_openssl2/crypto/bn/bn_print.c",
-"builtin_openssl2/crypto/bn/bn_mul.c",
-"builtin_openssl2/crypto/bn/bn_prime.c",
-"builtin_openssl2/crypto/bn/bn_depr.c",
-"builtin_openssl2/crypto/bn/bn_gcd.c",
-"builtin_openssl2/crypto/bn/bn_mpi.c",
-"builtin_openssl2/crypto/bn/bn_sqrt.c",
-"builtin_openssl2/crypto/bn/bn_recp.c",
-"builtin_openssl2/crypto/bn/bn_lib.c",
-"builtin_openssl2/crypto/ripemd/rmd_dgst.c",
-"builtin_openssl2/crypto/ripemd/rmd_one.c",
-"builtin_openssl2/crypto/rsa/rsa_x931.c",
-"builtin_openssl2/crypto/rsa/rsa_depr.c",
-"builtin_openssl2/crypto/rsa/rsa_saos.c",
-"builtin_openssl2/crypto/rsa/rsa_crpt.c",
-"builtin_openssl2/crypto/rsa/rsa_pss.c",
-"builtin_openssl2/crypto/rsa/rsa_oaep.c",
-"builtin_openssl2/crypto/rsa/rsa_null.c",
-"builtin_openssl2/crypto/rsa/rsa_gen.c",
-"builtin_openssl2/crypto/rsa/rsa_prn.c",
-"builtin_openssl2/crypto/rsa/rsa_pmeth.c",
-"builtin_openssl2/crypto/rsa/rsa_asn1.c",
-"builtin_openssl2/crypto/rsa/rsa_ssl.c",
-"builtin_openssl2/crypto/rsa/rsa_ameth.c",
-"builtin_openssl2/crypto/rsa/rsa_pk1.c",
-"builtin_openssl2/crypto/rsa/rsa_err.c",
-"builtin_openssl2/crypto/rsa/rsa_lib.c",
-"builtin_openssl2/crypto/rsa/rsa_none.c",
-"builtin_openssl2/crypto/rsa/rsa_chk.c",
-"builtin_openssl2/crypto/rsa/rsa_eay.c",
-"builtin_openssl2/crypto/rsa/rsa_sign.c",
-"builtin_openssl2/crypto/srp/srp_lib.c",
-"builtin_openssl2/crypto/srp/srp_vfy.c",
-"builtin_openssl2/crypto/err/err.c",
-"builtin_openssl2/crypto/err/err_prn.c",
-"builtin_openssl2/crypto/err/err_all.c",
-"builtin_openssl2/crypto/mem_clr.c",
-"builtin_openssl2/crypto/rc4/rc4_skey.c",
-"builtin_openssl2/crypto/rc4/rc4_enc.c",
-"builtin_openssl2/crypto/camellia/camellia.c",
-"builtin_openssl2/crypto/camellia/cmll_cbc.c",
-#"builtin_openssl2/crypto/aes/aes_x86core.c",
-"builtin_openssl2/crypto/aes/aes_core.c",
-"builtin_openssl2/crypto/aes/aes_cbc.c",
-"builtin_openssl2/crypto/whrlpool/wp_block.c",
-"builtin_openssl2/crypto/bn/bn_asm.c",
+"nocpuid.c",
+"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",
]
-env.drivers_sources+=openssl_sources
-env.Append(CPPPATH=["#drivers/builtin_openssl2/crypto"])
-env.Append(CPPPATH=["#drivers/builtin_openssl2/openssl"])
-env.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/evp"])
-env.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/asn1"])
-env.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/modes"])
-#env.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/store"])
-env.Append(CPPFLAGS=["-DOPENSSL_NO_ASM","-DOPENSSL_THREADS","-DL_ENDIAN"])
-Export('env')
+#env.drivers_sources+=openssl_sources
+
+env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto"])
+env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/openssl"])
+env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/evp"])
+env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/asn1"])
+env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/modes"])
+#env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/store"])
+env_ssl.Append(CPPFLAGS=["-DOPENSSL_NO_ASM","-DOPENSSL_THREADS","-DL_ENDIAN"])
+
+env_ssl.add_source_files(env.drivers_sources,openssl_sources)
+
+
diff --git a/drivers/gl_context/glew.h b/drivers/gl_context/glew.h
index 7b66ea97ed..39c8162dea 100644
--- a/drivers/gl_context/glew.h
+++ b/drivers/gl_context/glew.h
@@ -153,7 +153,11 @@ typedef unsigned short wchar_t;
#endif
#if !defined(_PTRDIFF_T_DEFINED) && !defined(_PTRDIFF_T_)
# ifdef _WIN64
+# ifdef _MSC_VER // Using MSVC
typedef __int64 ptrdiff_t;
+# else // Using GCC
+typedef long int ptrdiff_t;
+# endif
# else
typedef _W64 int ptrdiff_t;
# endif
diff --git a/drivers/openssl/SCsub b/drivers/openssl/SCsub
index 6d3e7e6732..b7a84cd122 100644
--- a/drivers/openssl/SCsub
+++ b/drivers/openssl/SCsub
@@ -1,6 +1,6 @@
+Import('env_ssl')
Import('env')
-env.add_source_files(env.drivers_sources,"*.cpp")
-env.add_source_files(env.drivers_sources,"*.c")
+env_ssl.add_source_files(env.drivers_sources,"*.cpp")
+env_ssl.add_source_files(env.drivers_sources,"*.c")
-Export('env')
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp
index 25f49a8a8b..cecdd2bc40 100644
--- a/scene/animation/animation_player.cpp
+++ b/scene/animation/animation_player.cpp
@@ -1299,6 +1299,9 @@ void AnimationPlayer::_bind_methods() {
ObjectTypeDB::bind_method(_MD("get_animation:Animation","name"),&AnimationPlayer::get_animation);
ObjectTypeDB::bind_method(_MD("get_animation_list"),&AnimationPlayer::_get_animation_list);
+ ObjectTypeDB::bind_method(_MD("animation_set_next", "anim_from", "anim_to"), &AnimationPlayer::animation_set_next);
+ ObjectTypeDB::bind_method(_MD("animation_get_next", "anim_from"), &AnimationPlayer::animation_get_next);
+
ObjectTypeDB::bind_method(_MD("set_blend_time","anim_from","anim_to","sec"),&AnimationPlayer::set_blend_time);
ObjectTypeDB::bind_method(_MD("get_blend_time","anim_from","anim_to"),&AnimationPlayer::get_blend_time);
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index a8c9a2372b..a8a3cb5537 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -3903,6 +3903,9 @@ void TextEdit::_update_completion_candidates() {
}
}
+ if (l[cursor.column - 1] == '(' && !pre_keyword) {
+ cancel = true;
+ }
update();
diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp
index 745266e19a..77bd5d0fef 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.cpp
+++ b/tools/editor/plugins/animation_player_editor_plugin.cpp
@@ -116,7 +116,7 @@ void AnimationPlayerEditor::_notification(int p_what) {
tool_anim->set_icon(get_icon("Tools","EditorIcons"));
tool_anim->get_popup()->connect("item_pressed",this,"_animation_tool_menu");
- blend_editor.next->connect("text_changed",this,"_blend_editor_next_changed");
+ blend_editor.next->connect("item_selected", this, "_blend_editor_next_changed");
nodename->set_icon(get_icon("AnimationPlayer","EditorIcons"));
@@ -536,14 +536,19 @@ void AnimationPlayerEditor::_animation_name_edited() {
}
-void AnimationPlayerEditor::_blend_editor_next_changed(const String& p_string) {
+void AnimationPlayerEditor::_blend_editor_next_changed(const int p_idx) {
if (animation->get_item_count()==0)
return;
String current = animation->get_item_text(animation->get_selected());
- player->animation_set_next(current,p_string);
+ undo_redo->create_action(TTR("Blend Next Changed"));
+ undo_redo->add_do_method(player,"animation_set_next",current,blend_editor.next->get_item_text(p_idx));
+ undo_redo->add_undo_method(player,"animation_set_next",current,player->animation_get_next(current));
+ undo_redo->add_do_method(this,"_animation_player_changed",player);
+ undo_redo->add_undo_method(this,"_animation_player_changed",player);
+ undo_redo->commit_action();
}
void AnimationPlayerEditor::_animation_blend() {
@@ -569,6 +574,11 @@ void AnimationPlayerEditor::_animation_blend() {
TreeItem *root = blend_editor.tree->create_item();
updating_blends=true;
+ int i = 0;
+ bool anim_found = false;
+ blend_editor.next->clear();
+ blend_editor.next->add_item("", i);
+
for(List<StringName>::Element *E=anims.front();E;E=E->next()) {
String to=E->get();
@@ -579,9 +589,20 @@ void AnimationPlayerEditor::_animation_blend() {
blend->set_cell_mode(1,TreeItem::CELL_MODE_RANGE);
blend->set_range_config(1,0,3600,0.001);
blend->set_range(1,player->get_blend_time(current,to));
+
+ i++;
+ blend_editor.next->add_item(to, i);
+ if (to == player->animation_get_next(current)) {
+ blend_editor.next->select(i);
+ anim_found = true;
+ }
}
- blend_editor.next->set_text( player->animation_get_next(current) );
+ // make sure we reset it else it becomes out of sync and could contain a deleted animation
+ if (!anim_found) {
+ blend_editor.next->select(0);
+ player->animation_set_next(current, blend_editor.next->get_item_text(0));
+ }
updating_blends=false;
}
@@ -913,6 +934,7 @@ void AnimationPlayerEditor::_animation_duplicate() {
undo_redo->create_action(TTR("Duplicate Animation"));
undo_redo->add_do_method(player,"add_animation",new_name,new_anim);
undo_redo->add_undo_method(player,"remove_animation",new_name);
+ undo_redo->add_do_method(player,"animation_set_next",new_name,player->animation_get_next(current));
undo_redo->add_do_method(this,"_animation_player_changed",player);
undo_redo->add_undo_method(this,"_animation_player_changed",player);
undo_redo->commit_action();
@@ -1438,7 +1460,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) {
blend_editor.tree = memnew( Tree );
blend_editor.tree->set_columns(2);
blend_vb->add_margin_child(TTR("Blend Times: "),blend_editor.tree,true);
- blend_editor.next = memnew( LineEdit );
+ blend_editor.next = memnew( OptionButton );
blend_vb->add_margin_child(TTR("Next (Auto Queue):"),blend_editor.next);
blend_editor.dialog->set_title(TTR("Cross-Animation Blend Times"));
updating_blends=false;
diff --git a/tools/editor/plugins/animation_player_editor_plugin.h b/tools/editor/plugins/animation_player_editor_plugin.h
index 5f3c8ec49b..9583f3e663 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.h
+++ b/tools/editor/plugins/animation_player_editor_plugin.h
@@ -103,7 +103,7 @@ class AnimationPlayerEditor : public VBoxContainer {
AcceptDialog * dialog;
Tree *tree;
- LineEdit *next;
+ OptionButton *next;
} blend_editor;
@@ -146,7 +146,7 @@ class AnimationPlayerEditor : public VBoxContainer {
void _dialog_action(String p_file);
void _seek_frame_changed(const String& p_frame);
void _seek_value_changed(float p_value);
- void _blend_editor_next_changed(const String& p_string);
+ void _blend_editor_next_changed(const int p_idx);
void _list_changed();
void _update_animation();