Merge branch 'OpenSSL_1_0_2-stable' of https://github.com/openssl/openssl into OpenSSL_1_0_2-stableOpenSSL_1_0_2-stable

* 'OpenSSL_1_0_2-stable' of https://github.com/openssl/openssl: (57 commits)
  SRP_create_verifier does not check for NULL before OPENSSL_cleanse
  Improve the definition of STITCHED_CALL in e_rc4_hmac_md5.c
  Fix a few leaks in X509_REQ_to_X509. Fix a possible leak on NETSCAPE_SPKI_verify failure.
  Add basic test for Cisco DTLS1_BAD_VER and record replay handling
  Fix ubsan 'left shift of negative value -1' error in satsub64be()
  Fix SSL_export_keying_material() for DTLS1_BAD_VER
  Fix the no-tls1 option
  ec/asm/ecp_nistz256-x86_64.pl: /cmovb/cmovc/ as nasm doesn't recognize cmovb.
  ec/ecp_nistz256: harmonize is_infinity with ec_GFp_simple_is_at_infinity.
  ec/asm/ecp_nistz256-x86_64.pl: addition to perform stricter reduction.
  Always use session_ctx when removing a session
  Avoid overflow in MDC2_Update()
  SWEET32 (CVE-2016-2183): Move DES from HIGH to MEDIUM
  Fix no-ec
  Sanity check ticket length.
  mk1mf: dtlstest needs ssltestlib, include it with a hack
  Don't check for malloc failure twice.
  Fix overflow check in BN_bn2dec()
  RT2676: Reject RSA eponent if even or 1
  VMS: Use strict refdef extern model when building library object files
  ...

1 files changed, 1 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 36c3a37507..cf8877916f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@
 !/test/igetest.c
 !/test/r160test.c
 !/test/fips_algvs.c
+!/test/ssltestlib.c
 
 /test/*.ss
 /test/*.srl